fix: auth routing
This commit is contained in:
parent
6a5c1a74f1
commit
f256a65b59
3 changed files with 4 additions and 5 deletions
|
|
@ -2,7 +2,7 @@ import { redirect } from "@solidjs/router"
|
|||
import type { APIEvent } from "@solidjs/start/server"
|
||||
import { AuthClient } from "~/context/auth"
|
||||
import { useAuthSession } from "~/context/auth"
|
||||
import { fromPathname, localeFromRequest, route } from "~/lib/language"
|
||||
import { localeFromRequest, route } from "~/lib/language"
|
||||
|
||||
export async function GET(input: APIEvent) {
|
||||
const url = new URL(input.request.url)
|
||||
|
|
@ -31,7 +31,6 @@ export async function GET(input: APIEvent) {
|
|||
}
|
||||
})
|
||||
const next = url.pathname === "/auth/callback" ? "/auth" : url.pathname.replace("/auth/callback", "")
|
||||
if (fromPathname(next)) return redirect(next)
|
||||
return redirect(route(locale, next))
|
||||
} catch (e: any) {
|
||||
return new Response(
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ export async function GET(input: APIEvent) {
|
|||
const workspaceID = await getLastSeenWorkspaceID()
|
||||
return redirect(route(locale, `/workspace/${workspaceID}`))
|
||||
} catch {
|
||||
const cont = route(locale, "/auth")
|
||||
if (cont === "/auth") return redirect("/auth/authorize")
|
||||
return redirect(`/auth/authorize?continue=${encodeURIComponent(cont)}`)
|
||||
return redirect("/auth/authorize")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue