add origin
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import type { Route } from './+types'
|
import type { Route } from './+types/login'
|
||||||
|
|
||||||
import { redirect } from 'react-router'
|
import { redirect } from 'react-router'
|
||||||
|
|
||||||
@@ -7,18 +7,24 @@ import { requestIdContext } from '@repo/auth/context'
|
|||||||
import { createSessionStorage } from '@repo/auth/session'
|
import { createSessionStorage } from '@repo/auth/session'
|
||||||
|
|
||||||
export async function loader({ request, context }: Route.ActionArgs) {
|
export async function loader({ request, context }: Route.ActionArgs) {
|
||||||
|
const url = new URL(request.url)
|
||||||
const sessionStorage = createSessionStorage(context.cloudflare.env)
|
const sessionStorage = createSessionStorage(context.cloudflare.env)
|
||||||
const session = await sessionStorage.getSession(request.headers.get('cookie'))
|
const session = await sessionStorage.getSession(request.headers.get('cookie'))
|
||||||
const returnTo = session.has('returnTo') ? session.get('returnTo') : '/'
|
|
||||||
const requestId = context.get(requestIdContext)
|
const requestId = context.get(requestIdContext)
|
||||||
const user = session.get('user') as User | null
|
const user = session.get('user') as User | null
|
||||||
|
const returnTo = (
|
||||||
|
session.has('returnTo') ? session.get('returnTo') : '/'
|
||||||
|
) as string
|
||||||
|
|
||||||
if (user) {
|
if (user) {
|
||||||
return redirect(returnTo)
|
return redirect(returnTo)
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const authenticator = createAuth(context.cloudflare.env)
|
const authenticator = createAuth(
|
||||||
|
context.cloudflare.env,
|
||||||
|
`${url?.origin}/login`
|
||||||
|
)
|
||||||
const user = await authenticator.authenticate('oidc', request)
|
const user = await authenticator.authenticate('oidc', request)
|
||||||
session.set('user', user)
|
session.set('user', user)
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { Route } from './+types'
|
import type { Route } from './+types/logout'
|
||||||
|
|
||||||
import { redirect } from 'react-router'
|
import { redirect } from 'react-router'
|
||||||
import type { OAuth2Strategy } from 'remix-auth-oauth2'
|
import type { OAuth2Strategy } from 'remix-auth-oauth2'
|
||||||
|
|||||||
Reference in New Issue
Block a user