Skip to content

Commit 4cca1b8

Browse files
Fix disabled auth session extraction
Co-authored-by: Vikhyath Mondreti <icecrasher321@users.noreply.github.com>
1 parent 489f2d3 commit 4cca1b8

2 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎apps/sim/lib/auth/session-response.test.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ describe('extractSessionDataFromAuthClientResult', () => {
1919
expect(extractSessionDataFromAuthClientResult({ data: session })).toEqual(session)
2020
})
2121

22+
it('unwraps disabled-auth get-session responses wrapped by the auth client', () => {
23+
const session = { user: { id: 'u1' }, session: { id: 's1' } }
24+
expect(extractSessionDataFromAuthClientResult({ data: { data: session } })).toEqual(session)
25+
})
26+
2227
it('falls back to raw session payload shape', () => {
2328
const raw = { user: { id: 'u1' }, session: { id: 's1' } }
2429
expect(extractSessionDataFromAuthClientResult(raw)).toEqual(raw)

‎apps/sim/lib/auth/session-response.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,23 @@ export function extractSessionDataFromAuthClientResult(result: unknown): unknown
77

88
// Expected shape from better-auth client: { data: <session> }
99
if ('data' in record) {
10-
return (record as { data?: unknown }).data ?? null
10+
const data = (record as { data?: unknown }).data
11+
12+
if (!data || typeof data !== 'object') {
13+
return null
14+
}
15+
16+
const dataRecord = data as Record<string, unknown>
17+
18+
if ('user' in dataRecord) {
19+
return data
20+
}
21+
22+
if ('data' in dataRecord) {
23+
return dataRecord.data ?? null
24+
}
25+
26+
return data
1127
}
1228

1329
// Fallback for raw session payloads: { user, session }

0 commit comments

Comments
 (0)