From d683feb85fa37f21a6ed272df6833e66ceabe679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Wed, 17 Dec 2025 16:51:29 -0300 Subject: [PATCH] add origin --- apps/saladeaula.digital/app/routes/auth/login.ts | 12 +++++++++--- apps/saladeaula.digital/app/routes/auth/logout.ts | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/saladeaula.digital/app/routes/auth/login.ts b/apps/saladeaula.digital/app/routes/auth/login.ts index 9724d00..e9e21ef 100644 --- a/apps/saladeaula.digital/app/routes/auth/login.ts +++ b/apps/saladeaula.digital/app/routes/auth/login.ts @@ -1,4 +1,4 @@ -import type { Route } from './+types' +import type { Route } from './+types/login' import { redirect } from 'react-router' @@ -7,18 +7,24 @@ import { requestIdContext } from '@repo/auth/context' import { createSessionStorage } from '@repo/auth/session' export async function loader({ request, context }: Route.ActionArgs) { + const url = new URL(request.url) const sessionStorage = createSessionStorage(context.cloudflare.env) const session = await sessionStorage.getSession(request.headers.get('cookie')) - const returnTo = session.has('returnTo') ? session.get('returnTo') : '/' const requestId = context.get(requestIdContext) const user = session.get('user') as User | null + const returnTo = ( + session.has('returnTo') ? session.get('returnTo') : '/' + ) as string if (user) { return redirect(returnTo) } try { - const authenticator = createAuth(context.cloudflare.env) + const authenticator = createAuth( + context.cloudflare.env, + `${url?.origin}/login` + ) const user = await authenticator.authenticate('oidc', request) session.set('user', user) diff --git a/apps/saladeaula.digital/app/routes/auth/logout.ts b/apps/saladeaula.digital/app/routes/auth/logout.ts index 201a130..7aaba94 100644 --- a/apps/saladeaula.digital/app/routes/auth/logout.ts +++ b/apps/saladeaula.digital/app/routes/auth/logout.ts @@ -1,4 +1,4 @@ -import type { Route } from './+types' +import type { Route } from './+types/logout' import { redirect } from 'react-router' import type { OAuth2Strategy } from 'remix-auth-oauth2'