ReviewOS

also looking at this

loghqorg/loghq

Deploy: uniform auth session model (main → production)

#7
Merged glennmichael123 wants to merge main into production
282 files +3028 -64856
app/Middleware/Auth.tsmodified+20-1
Changes to app/Middleware/Auth.ts
@@ -17,6 +17,18 @@ export default new Middleware({
1717 if (!isValid)
1818 throw new HttpError(401, 'Unauthorized. Invalid token.')
1919
20 // Stamp the resolved user like the cookie branch below and the
21 // framework-default middleware do — `request.user()` returns
22 // `_authenticatedUser` with no fallback, so without this a route behind
23 // `.middleware('auth')` that reads `await request.user()` (e.g.
24 // CreateCheckoutAction) saw undefined even after a valid bearer passed
25 // here. Do NOT overwrite `request.user` itself — it is the accessor.
26 const user = await Auth.getUserFromToken(bearerToken)
27 if (user) {
28 Auth.setUser(user)
29 ;(request as { _authenticatedUser?: unknown })._authenticatedUser = user
30 }
31
2032 log.debug(`[middleware:auth] Bearer token valid`)
2133 return
2234 }
@@ -51,11 +63,18 @@ export default new Middleware({
5163
5264 if (sessionId) {
5365 log.debug(`[middleware:auth] Validating session`)
54 const { sessionCheck } = await import('@stacksjs/auth')
66 const { sessionCheck, sessionUser } = await import('@stacksjs/auth')
5567 const isValid = await sessionCheck(sessionId)
5668 if (!isValid)
5769 throw new HttpError(401, 'Unauthorized. Session expired.')
5870
71 // Same stamping for the session branch.
72 const user = await sessionUser(sessionId)
73 if (user) {
74 Auth.setUser(user)
75 ;(request as { _authenticatedUser?: unknown })._authenticatedUser = user
76 }
77
5978 log.debug(`[middleware:auth] Session valid`)
6079 return
6180 }