TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-12 08:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

return redirect

Browse Source
This commit is contained in:
peintnermax
2024-04-25 09:02:05 +02:00
parent a4f5991ba0
commit 0d954f0b58
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/login/app/login/route.ts
View File

@@ -113,7 +113,7 @@ export async function GET(request: NextRequest) {
} }
} }
const gotoAccounts = () => { const gotoAccounts = (): NextResponse<unknown> => {
const accountsUrl = new URL("/accounts", request.url); const accountsUrl = new URL("/accounts", request.url);
if (authRequest?.id) { if (authRequest?.id) {
accountsUrl.searchParams.set("authRequestId", authRequest?.id); accountsUrl.searchParams.set("authRequestId", authRequest?.id);
@@ -141,7 +141,7 @@ export async function GET(request: NextRequest) {
if (authRequest && sessions.length) { if (authRequest && sessions.length) {
// if some accounts are available for selection and select_account is set // if some accounts are available for selection and select_account is set
if (authRequest.prompt.includes(Prompt.PROMPT_SELECT_ACCOUNT)) { if (authRequest.prompt.includes(Prompt.PROMPT_SELECT_ACCOUNT)) {
gotoAccounts(); return gotoAccounts();
} else if (authRequest.prompt.includes(Prompt.PROMPT_LOGIN)) { } else if (authRequest.prompt.includes(Prompt.PROMPT_LOGIN)) {
// if prompt is login // if prompt is login
const loginNameUrl = new URL("/loginname", request.url); const loginNameUrl = new URL("/loginname", request.url);
@@ -170,25 +170,11 @@ export async function GET(request: NextRequest) {
sessionId: cookie?.id, sessionId: cookie?.id,
sessionToken: cookie?.token, sessionToken: cookie?.token,
}; };
// const { callbackUrl } = await createCallback(server, {
// authRequestId,
// session,
// });
// return NextResponse.redirect(callbackUrl);
try {
const { callbackUrl } = await createCallback(server, { const { callbackUrl } = await createCallback(server, {
authRequestId, authRequestId,
session, session,
}); });
if (callbackUrl) {
return NextResponse.redirect(callbackUrl); return NextResponse.redirect(callbackUrl);
} else {
gotoAccounts();
}
} catch (error) {
console.error(error);
gotoAccounts();
}
} else { } else {
return NextResponse.json( return NextResponse.json(
{ error: "No active session found" }, { error: "No active session found" },
@@ -223,17 +209,17 @@ export async function GET(request: NextRequest) {
if (callbackUrl) { if (callbackUrl) {
return NextResponse.redirect(callbackUrl); return NextResponse.redirect(callbackUrl);
} else { } else {
gotoAccounts(); return gotoAccounts();
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
gotoAccounts(); return gotoAccounts();
} }
} else { } else {
gotoAccounts(); return gotoAccounts();
} }
} else { } else {
gotoAccounts(); return gotoAccounts();
} }
} }
} else { } else {