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

org primary domain scope

Browse Source
This commit is contained in:
peintnermax
2024-04-03 15:16:06 +02:00
parent 0a1219b07b
commit 9153b5c474
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,12 @@
import {
createCallback,
getAuthRequest,
getOrgByDomain,
listSessions,
server,
} from "#/lib/zitadel";
import { SessionCookie, getAllSessions } from "#/utils/cookies";
import { Session, AuthRequest, Prompt, login } from "@zitadel/server";
import { Session, AuthRequest, Prompt } from "@zitadel/server";
import { NextRequest, NextResponse } from "next/server";
async function loadSessions(ids: string[]): Promise<Session[]> {
@@ -18,6 +19,7 @@ async function loadSessions(ids: string[]): Promise<Session[]> {
}
const ORG_SCOPE_REGEX = /urn:zitadel:iam:org:id:([0-9]+)/;
const ORG_DOMAIN_SCOPE_REGEX = /urn:zitadel:iam:org:domain:primary:(.+)/; // TODO: check regex for all domain character options
function findSession(
sessions: Session[],
@@ -91,13 +93,26 @@ export async function GET(request: NextRequest) {
authRequest?.scope &&
authRequest.scope.find((s: string) => ORG_SCOPE_REGEX.test(s))
) {
const orgId = authRequest.scope.find((s: string) =>
const orgScope = authRequest.scope.find((s: string) =>
ORG_SCOPE_REGEX.test(s)
);
if (orgId) {
const matched = ORG_SCOPE_REGEX.exec(orgId);
if (orgScope) {
const matched = ORG_SCOPE_REGEX.exec(orgScope);
organization = matched?.[1] ?? "";
} else {
const orgDomainScope = authRequest.scope.find((s: string) =>
ORG_DOMAIN_SCOPE_REGEX.test(s)
);
if (orgDomainScope) {
const matched = ORG_DOMAIN_SCOPE_REGEX.exec(orgDomainScope);
const orgDomain = matched?.[1] ?? "";
if (orgDomain) {
const org = await getOrgByDomain(orgDomain);
organization = org?.org?.id ?? "";
}
}
}
}