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

Merge branch 'dev' of github.com:zitadel/typescript into dev

Browse Source
This commit is contained in:
Elio Bischof
2025-02-10 15:56:01 +01:00
parent 7915c87d89 4eec1ecee8
commit b002708b69
3 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/login/src/app/login/route.ts
View File

@@ -201,7 +201,7 @@ async function findValidSession(
} }
function constructUrl(request: NextRequest, path: string) { function constructUrl(request: NextRequest, path: string) {
const forwardedHost = request.headers.get("x-zitadel-forward-host"); const forwardedHost = request.headers.get("host");
const basePath = process.env.NEXT_PUBLIC_BASE_PATH || ""; const basePath = process.env.NEXT_PUBLIC_BASE_PATH || "";
return new URL( return new URL(
`${basePath}${path}`, `${basePath}${path}`,

35
apps/login/src/lib/api.ts
View File

@@ -1,37 +1,14 @@
import { newSystemToken } from "@zitadel/client/node"; import { newSystemToken } from "@zitadel/client/node";
export async function systemAPIToken({ export async function systemAPIToken() {
serviceRegion,
}: {
serviceRegion: string;
}) {
const prefix = serviceRegion.toUpperCase();
const token = { const token = {
audience: process.env[prefix + "_AUDIENCE"], audience: process.env.AUDIENCE,
userID: process.env[prefix + "_SYSTEM_USER_ID"], userID: process.env.SYSTEM_USER_ID,
token: Buffer.from( token: Buffer.from(process.env.SYSTEM_USER_PRIVATE_KEY, "base64").toString(
process.env[prefix.toUpperCase() + "_SYSTEM_USER_PRIVATE_KEY"] as string, "utf-8",
"base64", ),
).toString("utf-8"),
}; };
if (!token.audience || !token.userID || !token.token) {
const fallbackToken = {
audience: process.env.AUDIENCE,
userID: process.env.SYSTEM_USER_ID,
token: Buffer.from(
process.env.SYSTEM_USER_PRIVATE_KEY,
"base64",
).toString("utf-8"),
};
return newSystemToken({
audience: fallbackToken.audience,
subject: fallbackToken.userID,
key: fallbackToken.token,
});
}
return newSystemToken({ return newSystemToken({
audience: token.audience, audience: token.audience,
subject: token.userID, subject: token.userID,

14
apps/login/src/lib/service.ts
View File

@@ -20,17 +20,17 @@ type ServiceClass =
export async function createServiceForHost<T extends ServiceClass>( export async function createServiceForHost<T extends ServiceClass>(
service: T, service: T,
serviceUrl: string, serviceUrl: string,
serviceRegion: string, serviceRegion?: string,
) { ) {
let token; let token;
// if we are running in a multitenancy context, use the system user token // if we are running in a multitenancy context, use the system user token
if ( if (
process.env[serviceRegion + "_AUDIENCE"] && process.env.AUDIENCE &&
process.env[serviceRegion + "_SYSTEM_USER_ID"] && process.env.SYSTEM_USER_ID &&
process.env[serviceRegion + "_SYSTEM_USER_PRIVATE_KEY"] process.env.SYSTEM_USER_PRIVATE_KEY
) { ) {
token = await systemAPIToken({ serviceRegion }); token = await systemAPIToken();
} else if (process.env.ZITADEL_SERVICE_USER_TOKEN) { } else if (process.env.ZITADEL_SERVICE_USER_TOKEN) {
token = process.env.ZITADEL_SERVICE_USER_TOKEN; token = process.env.ZITADEL_SERVICE_USER_TOKEN;
} }
@@ -51,7 +51,7 @@ export async function createServiceForHost<T extends ServiceClass>(
} }
/** /**
* Extracts the service url and region from the headers if used in a multitenant context (x-zitadel-forward-host, x-zitade-region header) * Extracts the service url and region from the headers if used in a multitenant context (host, x-zitade-region header)
* or falls back to the ZITADEL_API_URL for a self hosting deployment * or falls back to the ZITADEL_API_URL for a self hosting deployment
* or falls back to the host header for a self hosting deployment using custom domains * or falls back to the host header for a self hosting deployment using custom domains
* @param headers * @param headers
@@ -65,7 +65,7 @@ export function getServiceUrlFromHeaders(headers: ReadonlyHeaders): {
} { } {
let instanceUrl; let instanceUrl;
const forwardedHost = headers.get("x-zitadel-forward-host"); const forwardedHost = headers.get("host");
// use the forwarded host if available (multitenant), otherwise fall back to the host of the deployment itself // use the forwarded host if available (multitenant), otherwise fall back to the host of the deployment itself
if (forwardedHost) { if (forwardedHost) {
instanceUrl = forwardedHost; instanceUrl = forwardedHost;