update auth packages

This commit is contained in:
2026-01-27 14:39:38 -03:00
parent f539d78f14
commit 10138112fe
3 changed files with 16 additions and 17 deletions

View File

@@ -2,9 +2,9 @@ import { decodeJwt } from 'jose'
import { redirect, type LoaderFunctionArgs } from 'react-router'
import type { OAuth2Strategy } from 'remix-auth-oauth2'
import { requestIdContext, userContext, cloudflareContext } from '../context'
import { createSessionStorage } from '../session'
import { createAuth, type User } from '../auth'
import { cloudflareContext, requestIdContext, userContext } from '../context'
import { createSessionStorage } from '../session'
export const authMiddleware = async (
{ request, context }: LoaderFunctionArgs,
@@ -16,12 +16,14 @@ export const authMiddleware = async (
const strategy = authenticator.get<OAuth2Strategy<User>>('oidc')
const session = await sessionStorage.getSession(request.headers.get('cookie'))
const requestId = context.get(requestIdContext)
const now = new Date().toISOString()
let user = session.get('user')
if (!user) {
console.log(`[${requestId}] There is no user logged in`)
session.set('returnTo', new URL(request.url).toString())
session.set('returnTo', new URL(request.url).toString())
if (!user) {
console.log(`[${now}][${requestId}] There is no user logged in`)
return redirect('/login', {
headers: new Headers({
@@ -44,16 +46,13 @@ export const authMiddleware = async (
refreshToken: tokens.refreshToken()
}
console.debug(
`[${new Date().toISOString()}] [${requestId}] Refresh token retrieved`,
user
)
console.debug(`[${now}] [${requestId}] Refresh token retrieved`, user)
// Should replace the user in the session
session.set('user', user)
}
} catch (error) {
// @ts-ignore
console.error(`[${requestId}]`, error?.stack)
console.error(`[${now}] [${requestId}]`, error?.stack)
// If refreshing the token fails, remove the user from the current session
// so the user is forced to sign in again