update cf context to studio

apps/studio.saladeaula.digital/app/routes/auth/login.ts

@@ -1,26 +1,34 @@
-import type { Route } from './+types'
+import type { Route } from './+types/login'
 
 import { redirect } from 'react-router'
 
 import { createAuth, type User } from '@repo/auth/auth'
+import { requestIdContext, cloudflareContext } from '@repo/auth/context'
 import { createSessionStorage } from '@repo/auth/session'
 
-export async function loader({ request, context }: Route.ActionArgs) {
-  const sessionStorage = createSessionStorage(context.cloudflare.env)
+export async function loader({ request, context }: Route.LoaderArgs) {
+  const url = new URL(request.url)
+  const cloudflare = context.get(cloudflareContext)
+  const sessionStorage = createSessionStorage(cloudflare.env)
   const session = await sessionStorage.getSession(request.headers.get('cookie'))
-  const returnTo = session.has('returnTo') ? session.get('returnTo') : '/'
-  const user = session.get('user') as User | null
+  const requestId = context.get(requestIdContext)
+  const user = session.get('user')
+  const returnTo = (session.get('returnTo') as string | undefined) ?? '/'
 
   if (user) {
     return redirect(returnTo)
   }
 
   try {
-    const authenticator = createAuth(context.cloudflare.env)
-    const user = await authenticator.authenticate('oidc', request)
-    session.set('user', user)
+    const authenticator = createAuth(cloudflare.env, `${url.origin}/login`)
+    const authenticatedUser = (await authenticator.authenticate(
+      'oidc',
+      request
+    )) as User
+    session.set('user', authenticatedUser)
+
+    console.log(`[${requestId}] Redirecting the user to ${returnTo}`)
 
-    console.log(`Redirecting the user to ${returnTo}`)
     // Redirect to the home page after successful login
     return redirect(returnTo, {
       headers: {
@@ -28,7 +36,7 @@ export async function loader({ request, context }: Route.ActionArgs) {
       }
     })
   } catch (error) {
-    console.error(error)
+    console.error(`[${requestId}]`, error)
 
     if (error instanceof Error) {
       return Response.json(

apps/studio.saladeaula.digital/app/routes/auth/logout.ts

@@ -1,23 +1,24 @@
-import type { Route } from './+types'
+import type { Route } from './+types/logout'
 
-import { createAuth, type User } from '@repo/auth/auth'
-import { createSessionStorage } from '@repo/auth/session'
 import { redirect } from 'react-router'
 import type { OAuth2Strategy } from 'remix-auth-oauth2'
 
+import { createAuth, type User } from '@repo/auth/auth'
+import { createSessionStorage } from '@repo/auth/session'
+import { cloudflareContext } from '@repo/auth/context'
+
 export async function loader({ request, context }: Route.LoaderArgs) {
-  const authenticator = createAuth(context.cloudflare.env)
-  const sessionStorage = createSessionStorage(context.cloudflare.env)
+  const cloudflare = context.get(cloudflareContext)
+  const authenticator = createAuth(cloudflare.env)
+  const sessionStorage = createSessionStorage(cloudflare.env)
   const session = await sessionStorage.getSession(request.headers.get('cookie'))
-  const user = session.get('user') as User
+  const user = session.get('user')
   const strategy = authenticator.get<OAuth2Strategy<User>>('oidc')
 
   if (user?.accessToken && strategy) {
     await strategy.revokeToken(user.accessToken)
   }
 
-  console.log(await sessionStorage.destroySession(session))
-
   return redirect('/login', {
     headers: { 'Set-Cookie': await sessionStorage.destroySession(session) }
   })