granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix userAdapter instantiation in auth endpoints

Browse source
This commit is contained in:
Justin Edmund 2025-12-02 08:11:16 -08:00
parent 579691aeef
commit 7471901fee
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hooks.server.ts
View file

@ -9,12 +9,18 @@ export const handleSession: Handle = async ({ event, resolve }) => {
const user = getUserFromCookies(event.cookies)
// Debug logging for auth issues
const allCookies = event.cookies.getAll()
console.log('[hooks.server] Request to:', event.url.pathname)
console.log('[hooks.server] All cookies:', allCookies.map(c => c.name))
if (account) {
console.log('[hooks.server] Account cookie found:', {
hasToken: !!account.token,
hasExpiresAt: !!account.expires_at,
username: account.username
})
} else {
console.log('[hooks.server] No account cookie found')
}
event.locals.session = {

16
src/routes/auth/login/+server.ts
View file

@ -3,7 +3,7 @@ import { json } from '@sveltejs/kit'
import { dev } from '$app/environment'
import { z } from 'zod'
import { passwordGrantLogin } from '$lib/auth/oauth'
import { UserAdapter } from '$lib/api/adapters/user.adapter'
import { userAdapter } from '$lib/api/adapters/user.adapter'
import { buildCookies } from '$lib/auth/map'
import { setAccountCookie, setUserCookie, setRefreshCookie } from '$lib/auth/cookies'
@ -22,23 +22,29 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
}
try {
console.log('[Login] Starting login for:', parsed.data.email)
const oauth = await passwordGrantLogin(fetch, parsed.data)
console.log('[Login] OAuth successful, got token for user:', oauth.user.username)
// Create a UserAdapter instance and pass the auth token
const userAdapter = new UserAdapter()
// Get user info using the pre-configured adapter
const info = await userAdapter.getInfo(oauth.user.username, {
headers: {
Authorization: `Bearer ${oauth.access_token}`
}
})
console.log('[Login] Got user info:', info.username)
const { account, user, accessTokenExpiresAt, refresh } = buildCookies(oauth, info)
// Use secure cookies in production (dev flag handles this correctly behind proxies)
const secure = !dev
console.log('[Login] Setting cookies - secure:', secure, 'dev:', dev)
console.log('[Login] Account cookie data:', { userId: account.userId, username: account.username, hasToken: !!account.token })
setAccountCookie(cookies, account, { secure, expires: accessTokenExpiresAt })
setUserCookie(cookies, user, { secure, expires: accessTokenExpiresAt })
setRefreshCookie(cookies, refresh, { secure, expires: accessTokenExpiresAt })
console.log('[Login] Cookies set, returning response')
// Return access token for client-side storage
return json({
@ -49,6 +55,10 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
expires_at: accessTokenExpiresAt.toISOString()
})
} catch (e: any) {
console.error('[Login] Error:', e)
console.error('[Login] Error message:', e?.message)
console.error('[Login] Error stack:', e?.stack)
if (String(e?.message) === 'unauthorized') {
return json({ error: 'Invalid email or password' }, { status: 401 })
}

3
src/routes/auth/signup/+server.ts
View file

@ -4,7 +4,7 @@ import { dev } from '$app/environment'
import { z } from 'zod'
import { PUBLIC_SIERO_API_URL } from '$env/static/public'
import { passwordGrantLogin } from '$lib/auth/oauth'
import { UserAdapter } from '$lib/api/adapters/user.adapter'
import { userAdapter } from '$lib/api/adapters/user.adapter'
import { buildCookies } from '$lib/auth/map'
import { setAccountCookie, setUserCookie, setRefreshCookie } from '$lib/auth/cookies'
@ -75,7 +75,6 @@ export const POST: RequestHandler = async ({ request, cookies, fetch }) => {
})
// 3. Get additional user info
const userAdapter = new UserAdapter()
const info = await userAdapter.getInfo(oauth.user.username, {
headers: {
Authorization: `Bearer ${oauth.access_token}`