Skip to content

Commit 8bcc015

Browse files
committed
feat(edgedb): small improvements
1 parent c635109 commit 8bcc015

2 files changed

Lines changed: 26 additions & 9 deletions

File tree

src/runtime/api/auth/identity.ts

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
11
import { defineEventHandler, deleteCookie, getCookie } from 'h3'
22
import { useEdgeDb, useEdgeDbEnv } from '../../server'
33

4-
export default defineEventHandler(async (req) => {
4+
export default defineEventHandler(async (event) => {
55
const { identityModel } = useEdgeDbEnv()
66

7-
const token = getCookie(req, 'edgedb-auth-token')
7+
const token = getCookie(event, 'edgedb-auth-token')
88

99
if (!token) {
10-
deleteCookie(req, 'edgedb-auth-token')
10+
deleteCookie(event, 'edgedb-auth-token')
1111
return
1212
}
1313

14-
const client = useEdgeDb(req)
14+
const client = useEdgeDb(event)
1515

16-
let identityTarget = await client.querySingle(`select global current_user;`)
16+
try {
17+
let identityTarget = await client.querySingle(`select global current_user;`)
1718

18-
if (!identityTarget && token) {
19-
identityTarget = await client.query(`
19+
if (!identityTarget && token) {
20+
identityTarget = await client.query(`
2021
insert ${identityModel} {
2122
name := '',
2223
identity := global ext::auth::ClientTokenIdentity
2324
}
2425
`)
25-
}
26+
}
2627

27-
return identityTarget
28+
return identityTarget
29+
}
30+
catch (err) {
31+
setCookie(
32+
event,
33+
'edgedb-auth-token',
34+
'',
35+
{
36+
httpOnly: true,
37+
path: '/',
38+
secure: true,
39+
sameSite: true,
40+
expires: new Date(0),
41+
},
42+
)
43+
}
2844
})

src/runtime/api/auth/logout.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { H3Error, defineEventHandler, getCookie, setCookie } from 'h3'
22

33
export default defineEventHandler(async (event) => {
44
const authToken = getCookie(event, 'edgedb-auth-token')
5+
56
if (!authToken) {
67
const err = new H3Error('Not logged in')
78
err.statusCode = 401

0 commit comments

Comments
 (0)