update auth packages
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import { createContext, redirect, type LoaderFunctionArgs } from 'react-router'
|
||||
|
||||
import { userContext } from '@repo/auth/context'
|
||||
import { requestIdContext, userContext } from '@repo/auth/context'
|
||||
import { request as req } from '@repo/util/request'
|
||||
|
||||
import { CACHE_NAME, CACHE_TTL_SECONDS } from '@/conf'
|
||||
@@ -42,18 +42,18 @@ export const workspaceMiddleware = async (
|
||||
next: () => Promise<Response>
|
||||
): Promise<Response> => {
|
||||
const orgId = params.orgid
|
||||
const requestId = context.get(requestIdContext)
|
||||
const user = context.get(userContext)!
|
||||
|
||||
const cacheKey = buildWorkspaceCacheKey(request, user.sub, orgId)
|
||||
const cached = await getWorkspaceFromCache(cacheKey)
|
||||
|
||||
if (cached) {
|
||||
console.log('Warm start')
|
||||
context.set(workspaceContext, cached)
|
||||
return next()
|
||||
}
|
||||
|
||||
console.log('Cache miss')
|
||||
console.log(`[${new Date().toISOString()}] [${requestId}] Cache miss`)
|
||||
|
||||
const r = await req({
|
||||
url: `/users/${user.sub}/orgs?limit=25`,
|
||||
@@ -139,7 +139,7 @@ async function saveToCache(
|
||||
): Promise<void> {
|
||||
const cache: Cache = await caches.open(CACHE_NAME)
|
||||
|
||||
const response: Response = new Response(JSON.stringify(workspace), {
|
||||
const response = new Response(JSON.stringify(workspace), {
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Cache-Control': `public, max-age=${CACHE_TTL_SECONDS}`
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { Route } from './+types/route'
|
||||
import { redirect } from 'react-router'
|
||||
|
||||
import { createAuth, type User } from '@repo/auth/auth'
|
||||
import { requestIdContext, cloudflareContext } from '@repo/auth/context'
|
||||
import { cloudflareContext, requestIdContext } from '@repo/auth/context'
|
||||
import { createSessionStorage } from '@repo/auth/session'
|
||||
|
||||
export async function loader({ request, context }: Route.LoaderArgs) {
|
||||
@@ -13,6 +13,7 @@ export async function loader({ request, context }: Route.LoaderArgs) {
|
||||
const sessionStorage = createSessionStorage(cloudflare.env)
|
||||
const session = await sessionStorage.getSession(request.headers.get('cookie'))
|
||||
const user = session.get('user')
|
||||
const now = new Date().toISOString()
|
||||
const returnTo = (session.get('returnTo') as string | undefined) ?? '/'
|
||||
|
||||
if (user) {
|
||||
@@ -26,9 +27,8 @@ export async function loader({ request, context }: Route.LoaderArgs) {
|
||||
request
|
||||
)) as User
|
||||
session.set('user', authenticatedUser)
|
||||
session.unset('returnTo')
|
||||
|
||||
console.log(`[${requestId}] Redirecting the user to ${returnTo}`)
|
||||
console.log(`[${now}] [${requestId}] Redirecting the user to ${returnTo}`)
|
||||
|
||||
// Redirect to the home page after successful login
|
||||
return redirect(returnTo, {
|
||||
|
||||
Reference in New Issue
Block a user