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

escape proxy for multitenant scenario, rename fcn

Browse Source
This commit is contained in:
Max Peintner
2025-01-29 10:44:26 +01:00
parent 04f9b47960
commit 68515bda7e
38 changed files with 101 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/login/src/app/(login)/accounts/page.tsx
View File

@@ -1,7 +1,7 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SessionsList } from "@/components/sessions-list"; import { SessionsList } from "@/components/sessions-list";
import { getAllSessionCookieIds } from "@/lib/cookies"; import { getAllSessionCookieIds } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
getBrandingSettings, getBrandingSettings,
getDefaultOrg, getDefaultOrg,
@@ -39,7 +39,7 @@ export default async function Page(props: {
const organization = searchParams?.organization; const organization = searchParams?.organization;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
let defaultOrganization; let defaultOrganization;
if (!organization) { if (!organization) {

4
apps/login/src/app/(login)/authenticator/set/page.tsx
View File

@@ -5,7 +5,7 @@ import { DynamicTheme } from "@/components/dynamic-theme";
import { SignInWithIdp } from "@/components/sign-in-with-idp"; import { SignInWithIdp } from "@/components/sign-in-with-idp";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getActiveIdentityProviders, getActiveIdentityProviders,
@@ -30,7 +30,7 @@ export default async function Page(props: {
const { loginName, authRequestId, organization, sessionId } = searchParams; const { loginName, authRequestId, organization, sessionId } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionWithData = sessionId const sessionWithData = sessionId
? await loadSessionById(serviceUrl, sessionId, organization) ? await loadSessionById(serviceUrl, sessionId, organization)

4
apps/login/src/app/(login)/idp/[provider]/failure/page.tsx
View File

@@ -1,5 +1,5 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { getBrandingSettings } from "@/lib/zitadel"; import { getBrandingSettings } from "@/lib/zitadel";
import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; import { IdentityProviderType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
@@ -25,7 +25,7 @@ export default async function Page(props: {
const { organization } = searchParams; const { organization } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const branding = await getBrandingSettings({ serviceUrl, organization }); const branding = await getBrandingSettings({ serviceUrl, organization });

4
apps/login/src/app/(login)/idp/[provider]/success/page.tsx
View File

@@ -5,7 +5,7 @@ import { linkingSuccess } from "@/components/idps/pages/linking-success";
import { loginFailed } from "@/components/idps/pages/login-failed"; import { loginFailed } from "@/components/idps/pages/login-failed";
import { loginSuccess } from "@/components/idps/pages/login-success"; import { loginSuccess } from "@/components/idps/pages/login-success";
import { idpTypeToIdentityProviderType, PROVIDER_MAPPING } from "@/lib/idp"; import { idpTypeToIdentityProviderType, PROVIDER_MAPPING } from "@/lib/idp";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
addHuman, addHuman,
addIDPLink, addIDPLink,
@@ -40,7 +40,7 @@ export default async function Page(props: {
const { provider } = params; const { provider } = params;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const branding = await getBrandingSettings({ serviceUrl, organization }); const branding = await getBrandingSettings({ serviceUrl, organization });

4
apps/login/src/app/(login)/idp/page.tsx
View File

@@ -1,6 +1,6 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SignInWithIdp } from "@/components/sign-in-with-idp"; import { SignInWithIdp } from "@/components/sign-in-with-idp";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { getActiveIdentityProviders, getBrandingSettings } from "@/lib/zitadel"; import { getActiveIdentityProviders, getBrandingSettings } from "@/lib/zitadel";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
import { headers } from "next/headers"; import { headers } from "next/headers";
@@ -16,7 +16,7 @@ export default async function Page(props: {
const organization = searchParams?.organization; const organization = searchParams?.organization;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const identityProviders = await getActiveIdentityProviders({ const identityProviders = await getActiveIdentityProviders({
serviceUrl, serviceUrl,

4
apps/login/src/app/(login)/invite/page.tsx
View File

@@ -1,7 +1,7 @@
import { Alert, AlertType } from "@/components/alert"; import { Alert, AlertType } from "@/components/alert";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { InviteForm } from "@/components/invite-form"; import { InviteForm } from "@/components/invite-form";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
getBrandingSettings, getBrandingSettings,
getDefaultOrg, getDefaultOrg,
@@ -21,7 +21,7 @@ export default async function Page(props: {
let { firstname, lastname, email, organization } = searchParams; let { firstname, lastname, email, organization } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
if (!organization) { if (!organization) {
const org = await getDefaultOrg({ serviceUrl }); const org = await getDefaultOrg({ serviceUrl });

4
apps/login/src/app/(login)/invite/success/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert, AlertType } from "@/components/alert";
import { Button, ButtonVariants } from "@/components/button"; import { Button, ButtonVariants } from "@/components/button";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { getBrandingSettings, getDefaultOrg, getUserByID } from "@/lib/zitadel"; import { getBrandingSettings, getDefaultOrg, getUserByID } from "@/lib/zitadel";
import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb"; import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
@@ -19,7 +19,7 @@ export default async function Page(props: {
let { userId, organization } = searchParams; let { userId, organization } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
if (!organization) { if (!organization) {
const org = await getDefaultOrg({ serviceUrl }); const org = await getDefaultOrg({ serviceUrl });

4
apps/login/src/app/(login)/loginname/page.tsx
View File

@@ -1,7 +1,7 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SignInWithIdp } from "@/components/sign-in-with-idp"; import { SignInWithIdp } from "@/components/sign-in-with-idp";
import { UsernameForm } from "@/components/username-form"; import { UsernameForm } from "@/components/username-form";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
getActiveIdentityProviders, getActiveIdentityProviders,
getBrandingSettings, getBrandingSettings,
@@ -26,7 +26,7 @@ export default async function Page(props: {
const submit: boolean = searchParams?.submit === "true"; const submit: boolean = searchParams?.submit === "true";
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
let defaultOrganization; let defaultOrganization;
if (!organization) { if (!organization) {

4
apps/login/src/app/(login)/mfa/page.tsx
View File

@@ -4,7 +4,7 @@ import { ChooseSecondFactor } from "@/components/choose-second-factor";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -25,7 +25,7 @@ export default async function Page(props: {
const { loginName, authRequestId, organization, sessionId } = searchParams; const { loginName, authRequestId, organization, sessionId } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionFactors = sessionId const sessionFactors = sessionId
? await loadSessionById(serviceUrl, sessionId, organization) ? await loadSessionById(serviceUrl, sessionId, organization)

4
apps/login/src/app/(login)/mfa/set/page.tsx
View File

@@ -4,7 +4,7 @@ import { ChooseSecondFactorToSetup } from "@/components/choose-second-factor-to-
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -52,7 +52,7 @@ export default async function Page(props: {
} = searchParams; } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionWithData = sessionId const sessionWithData = sessionId
? await loadSessionById(serviceUrl, sessionId, organization) ? await loadSessionById(serviceUrl, sessionId, organization)

4
apps/login/src/app/(login)/otp/[method]/page.tsx
View File

@@ -3,7 +3,7 @@ import { DynamicTheme } from "@/components/dynamic-theme";
import { LoginOTP } from "@/components/login-otp"; import { LoginOTP } from "@/components/login-otp";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -24,7 +24,7 @@ export default async function Page(props: {
const tError = await getTranslations({ locale, namespace: "error" }); const tError = await getTranslations({ locale, namespace: "error" });
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {

4
apps/login/src/app/(login)/otp/[method]/set/page.tsx
View File

@@ -4,7 +4,7 @@ import { Button, ButtonVariants } from "@/components/button";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { TotpRegister } from "@/components/totp-register"; import { TotpRegister } from "@/components/totp-register";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
addOTPEmail, addOTPEmail,
@@ -34,7 +34,7 @@ export default async function Page(props: {
const { method } = params; const { method } = params;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const branding = await getBrandingSettings({ serviceUrl, organization }); const branding = await getBrandingSettings({ serviceUrl, organization });
const loginSettings = await getLoginSettings({ serviceUrl, organization }); const loginSettings = await getLoginSettings({ serviceUrl, organization });

4
apps/login/src/app/(login)/passkey/page.tsx
View File

@@ -3,7 +3,7 @@ import { DynamicTheme } from "@/components/dynamic-theme";
import { LoginPasskey } from "@/components/login-passkey"; import { LoginPasskey } from "@/components/login-passkey";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -25,7 +25,7 @@ export default async function Page(props: {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionFactors = sessionId const sessionFactors = sessionId
? await loadSessionById(serviceUrl, sessionId, organization) ? await loadSessionById(serviceUrl, sessionId, organization)

4
apps/login/src/app/(login)/passkey/set/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert, AlertType } from "@/components/alert";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { RegisterPasskey } from "@/components/register-passkey"; import { RegisterPasskey } from "@/components/register-passkey";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { getBrandingSettings } from "@/lib/zitadel"; import { getBrandingSettings } from "@/lib/zitadel";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
@@ -20,7 +20,7 @@ export default async function Page(props: {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const session = await loadMostRecentSession({ const session = await loadMostRecentSession({
serviceUrl, serviceUrl,

4
apps/login/src/app/(login)/password/change/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert } from "@/components/alert";
import { ChangePasswordForm } from "@/components/change-password-form"; import { ChangePasswordForm } from "@/components/change-password-form";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -16,7 +16,7 @@ export default async function Page(props: {
searchParams: Promise<Record<string | number | symbol, string | undefined>>; searchParams: Promise<Record<string | number | symbol, string | undefined>>;
}) { }) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const searchParams = await props.searchParams; const searchParams = await props.searchParams;
const locale = getLocale(); const locale = getLocale();

4
apps/login/src/app/(login)/password/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert } from "@/components/alert";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { PasswordForm } from "@/components/password-form"; import { PasswordForm } from "@/components/password-form";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -25,7 +25,7 @@ export default async function Page(props: {
let { loginName, organization, authRequestId, alt } = searchParams; let { loginName, organization, authRequestId, alt } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
let defaultOrganization; let defaultOrganization;
if (!organization) { if (!organization) {

4
apps/login/src/app/(login)/password/set/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert, AlertType } from "@/components/alert";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SetPasswordForm } from "@/components/set-password-form"; import { SetPasswordForm } from "@/components/set-password-form";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -27,7 +27,7 @@ export default async function Page(props: {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
// also allow no session to be found (ignoreUnkownUsername) // also allow no session to be found (ignoreUnkownUsername)
let session: Session | undefined; let session: Session | undefined;

4
apps/login/src/app/(login)/register/page.tsx
View File

@@ -1,6 +1,6 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { RegisterForm } from "@/components/register-form"; import { RegisterForm } from "@/components/register-form";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
getBrandingSettings, getBrandingSettings,
getDefaultOrg, getDefaultOrg,
@@ -23,7 +23,7 @@ export default async function Page(props: {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
if (!organization) { if (!organization) {
const org: Organization | null = await getDefaultOrg({ serviceUrl }); const org: Organization | null = await getDefaultOrg({ serviceUrl });

4
apps/login/src/app/(login)/register/password/page.tsx
View File

@@ -1,6 +1,6 @@
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SetRegisterPasswordForm } from "@/components/set-register-password-form"; import { SetRegisterPasswordForm } from "@/components/set-register-password-form";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
getBrandingSettings, getBrandingSettings,
getDefaultOrg, getDefaultOrg,
@@ -23,7 +23,7 @@ export default async function Page(props: {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
if (!organization) { if (!organization) {
const org: Organization | null = await getDefaultOrg({ serviceUrl }); const org: Organization | null = await getDefaultOrg({ serviceUrl });

4
apps/login/src/app/(login)/signedin/page.tsx
View File

@@ -3,7 +3,7 @@ import { DynamicTheme } from "@/components/dynamic-theme";
import { SelfServiceMenu } from "@/components/self-service-menu"; import { SelfServiceMenu } from "@/components/self-service-menu";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getMostRecentCookieWithLoginname } from "@/lib/cookies"; import { getMostRecentCookieWithLoginname } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
createCallback, createCallback,
getBrandingSettings, getBrandingSettings,
@@ -61,7 +61,7 @@ export default async function Page(props: { searchParams: Promise<any> }) {
const t = await getTranslations({ locale, namespace: "signedin" }); const t = await getTranslations({ locale, namespace: "signedin" });
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const { loginName, authRequestId, organization } = searchParams; const { loginName, authRequestId, organization } = searchParams;
const sessionFactors = await loadSession( const sessionFactors = await loadSession(

4
apps/login/src/app/(login)/u2f/page.tsx
View File

@@ -3,7 +3,7 @@ import { DynamicTheme } from "@/components/dynamic-theme";
import { LoginPasskey } from "@/components/login-passkey"; import { LoginPasskey } from "@/components/login-passkey";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getSessionCookieById } from "@/lib/cookies"; import { getSessionCookieById } from "@/lib/cookies";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { getBrandingSettings, getSession } from "@/lib/zitadel"; import { getBrandingSettings, getSession } from "@/lib/zitadel";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
@@ -20,7 +20,7 @@ export default async function Page(props: {
const { loginName, authRequestId, sessionId, organization } = searchParams; const { loginName, authRequestId, sessionId, organization } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {

4
apps/login/src/app/(login)/u2f/set/page.tsx
View File

@@ -2,7 +2,7 @@ import { Alert } from "@/components/alert";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { RegisterU2f } from "@/components/register-u2f"; import { RegisterU2f } from "@/components/register-u2f";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { getBrandingSettings } from "@/lib/zitadel"; import { getBrandingSettings } from "@/lib/zitadel";
import { getLocale, getTranslations } from "next-intl/server"; import { getLocale, getTranslations } from "next-intl/server";
@@ -19,7 +19,7 @@ export default async function Page(props: {
const { loginName, organization, authRequestId, checkAfter } = searchParams; const { loginName, organization, authRequestId, checkAfter } = searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionFactors = await loadMostRecentSession({ const sessionFactors = await loadMostRecentSession({
serviceUrl, serviceUrl,

4
apps/login/src/app/(login)/verify/page.tsx
View File

@@ -4,7 +4,7 @@ import { UserAvatar } from "@/components/user-avatar";
import { VerifyForm } from "@/components/verify-form"; import { VerifyForm } from "@/components/verify-form";
import { VerifyRedirectButton } from "@/components/verify-redirect-button"; import { VerifyRedirectButton } from "@/components/verify-redirect-button";
import { sendEmailCode } from "@/lib/server/verify"; import { sendEmailCode } from "@/lib/server/verify";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { loadMostRecentSession } from "@/lib/session"; import { loadMostRecentSession } from "@/lib/session";
import { import {
getBrandingSettings, getBrandingSettings,
@@ -26,7 +26,7 @@ export default async function Page(props: { searchParams: Promise<any> }) {
searchParams; searchParams;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {

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

@@ -1,7 +1,7 @@
import { getAllSessions } from "@/lib/cookies"; import { getAllSessions } from "@/lib/cookies";
import { idpTypeToSlug } from "@/lib/idp"; import { idpTypeToSlug } from "@/lib/idp";
import { sendLoginname, SendLoginnameCommand } from "@/lib/server/loginname"; import { sendLoginname, SendLoginnameCommand } from "@/lib/server/loginname";
import { getApiUrlOfHeaders } from "@/lib/service"; import { getServiceUrlFromHeaders } from "@/lib/service";
import { import {
createCallback, createCallback,
getActiveIdentityProviders, getActiveIdentityProviders,
@@ -199,7 +199,7 @@ export async function GET(request: NextRequest) {
const sessionId = searchParams.get("sessionId"); const sessionId = searchParams.get("sessionId");
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
// TODO: find a better way to handle _rsc (react server components) requests and block them to avoid conflicts when creating oidc callback // TODO: find a better way to handle _rsc (react server components) requests and block them to avoid conflicts when creating oidc callback
const _rsc = searchParams.get("_rsc"); const _rsc = searchParams.get("_rsc");

4
apps/login/src/lib/self.ts
View File

@@ -4,7 +4,7 @@ import { createServerTransport } from "@zitadel/client/node";
import { createUserServiceClient } from "@zitadel/client/v2"; import { createUserServiceClient } from "@zitadel/client/v2";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getSessionCookieById } from "./cookies"; import { getSessionCookieById } from "./cookies";
import { getApiUrlOfHeaders } from "./service"; import { getServiceUrlFromHeaders } from "./service";
import { getSession } from "./zitadel"; import { getSession } from "./zitadel";
const transport = async (serviceUrl: string, token: string) => { const transport = async (serviceUrl: string, token: string) => {
@@ -26,7 +26,7 @@ export async function setMyPassword({
password: string; password: string;
}) { }) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionCookie = await getSessionCookieById({ sessionId }); const sessionCookie = await getSessionCookieById({ sessionId });

8
apps/login/src/lib/server/cookie.ts
View File

@@ -15,7 +15,7 @@ import {
import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb";
import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb"; import { Checks } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
type CustomCookieData = { type CustomCookieData = {
id: string; id: string;
@@ -35,7 +35,7 @@ export async function createSessionAndUpdateCookie(
lifetime?: Duration, lifetime?: Duration,
): Promise<Session> { ): Promise<Session> {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const createdSession = await createSessionFromChecks({ const createdSession = await createSessionFromChecks({
serviceUrl, serviceUrl,
@@ -97,7 +97,7 @@ export async function createSessionForIdpAndUpdateCookie(
lifetime?: Duration, lifetime?: Duration,
): Promise<Session> { ): Promise<Session> {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const createdSession = await createSessionForUserIdAndIdpIntent({ const createdSession = await createSessionForUserIdAndIdpIntent({
serviceUrl, serviceUrl,
@@ -159,7 +159,7 @@ export async function setSessionAndUpdateCookie(
lifetime?: Duration, lifetime?: Duration,
) { ) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
return setSession({ return setSession({
serviceUrl, serviceUrl,

6
apps/login/src/lib/server/idp.ts
View File

@@ -7,7 +7,7 @@ import {
} from "@/lib/zitadel"; } from "@/lib/zitadel";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getNextUrl } from "../client"; import { getNextUrl } from "../client";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { checkEmailVerification } from "../verify-helper"; import { checkEmailVerification } from "../verify-helper";
import { createSessionForIdpAndUpdateCookie } from "./cookie"; import { createSessionForIdpAndUpdateCookie } from "./cookie";
@@ -19,7 +19,7 @@ export type StartIDPFlowCommand = {
export async function startIDPFlow(command: StartIDPFlowCommand) { export async function startIDPFlow(command: StartIDPFlowCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -60,7 +60,7 @@ export async function createNewSessionFromIdpIntent(
command: CreateNewSessionCommand, command: CreateNewSessionCommand,
) { ) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {

4
apps/login/src/lib/server/invite.ts
View File

@@ -3,7 +3,7 @@
import { addHumanUser, createInviteCode } from "@/lib/zitadel"; import { addHumanUser, createInviteCode } from "@/lib/zitadel";
import { Factors } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { Factors } from "@zitadel/proto/zitadel/session/v2/session_pb";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
type InviteUserCommand = { type InviteUserCommand = {
email: string; email: string;
@@ -22,7 +22,7 @@ export type RegisterUserResponse = {
export async function inviteUser(command: InviteUserCommand) { export async function inviteUser(command: InviteUserCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {

8
apps/login/src/lib/server/loginname.ts
View File

@@ -8,7 +8,7 @@ import { idpTypeToIdentityProviderType, idpTypeToSlug } from "../idp";
import { PasskeysType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb"; import { PasskeysType } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
import { UserState } from "@zitadel/proto/zitadel/user/v2/user_pb"; import { UserState } from "@zitadel/proto/zitadel/user/v2/user_pb";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { checkInvite } from "../verify-helper"; import { checkInvite } from "../verify-helper";
import { import {
getActiveIdentityProviders, getActiveIdentityProviders,
@@ -34,7 +34,7 @@ const ORG_SUFFIX_REGEX = /(?<=@)(.+)/;
export async function sendLoginname(command: SendLoginnameCommand) { export async function sendLoginname(command: SendLoginnameCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -80,7 +80,7 @@ export async function sendLoginname(command: SendLoginnameCommand) {
if (identityProviders.length === 1) { if (identityProviders.length === 1) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -129,7 +129,7 @@ export async function sendLoginname(command: SendLoginnameCommand) {
if (identityProviders.length === 1) { if (identityProviders.length === 1) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {

4
apps/login/src/lib/server/otp.ts
View File

@@ -13,7 +13,7 @@ import {
getSessionCookieById, getSessionCookieById,
getSessionCookieByLoginName, getSessionCookieByLoginName,
} from "../cookies"; } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { getLoginSettings } from "../zitadel"; import { getLoginSettings } from "../zitadel";
export type SetOTPCommand = { export type SetOTPCommand = {
@@ -27,7 +27,7 @@ export type SetOTPCommand = {
export async function setOTP(command: SetOTPCommand) { export async function setOTP(command: SetOTPCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const recentSession = command.sessionId const recentSession = command.sessionId
? await getSessionCookieById({ sessionId: command.sessionId }).catch( ? await getSessionCookieById({ sessionId: command.sessionId }).catch(

8
apps/login/src/lib/server/passkeys.ts
View File

@@ -22,7 +22,7 @@ import {
getSessionCookieById, getSessionCookieById,
getSessionCookieByLoginName, getSessionCookieByLoginName,
} from "../cookies"; } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { checkEmailVerification } from "../verify-helper"; import { checkEmailVerification } from "../verify-helper";
import { setSessionAndUpdateCookie } from "./cookie"; import { setSessionAndUpdateCookie } from "./cookie";
@@ -43,7 +43,7 @@ export async function registerPasskeyLink(
const { sessionId } = command; const { sessionId } = command;
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -90,7 +90,7 @@ export async function registerPasskeyLink(
export async function verifyPasskeyRegistration(command: VerifyPasskeyCommand) { export async function verifyPasskeyRegistration(command: VerifyPasskeyCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
// if no name is provided, try to generate one from the user agent // if no name is provided, try to generate one from the user agent
let passkeyName = command.passkeyName; let passkeyName = command.passkeyName;
@@ -153,7 +153,7 @@ export async function sendPasskey(command: SendPasskeyCommand) {
} }
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const loginSettings = await getLoginSettings({ serviceUrl, organization }); const loginSettings = await getLoginSettings({ serviceUrl, organization });

10
apps/login/src/lib/server/password.ts
View File

@@ -30,7 +30,7 @@ import {
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getNextUrl } from "../client"; import { getNextUrl } from "../client";
import { getSessionCookieById, getSessionCookieByLoginName } from "../cookies"; import { getSessionCookieById, getSessionCookieByLoginName } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { import {
checkEmailVerification, checkEmailVerification,
checkMFAFactors, checkMFAFactors,
@@ -45,7 +45,7 @@ type ResetPasswordCommand = {
export async function resetPassword(command: ResetPasswordCommand) { export async function resetPassword(command: ResetPasswordCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {
@@ -85,7 +85,7 @@ export type UpdateSessionCommand = {
export async function sendPassword(command: UpdateSessionCommand) { export async function sendPassword(command: UpdateSessionCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
let sessionCookie = await getSessionCookieByLoginName({ let sessionCookie = await getSessionCookieByLoginName({
loginName: command.loginName, loginName: command.loginName,
@@ -255,7 +255,7 @@ export async function changePassword(command: {
password: string; password: string;
}) { }) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
// check for init state // check for init state
const { user } = await getUserByID({ serviceUrl, userId: command.userId }); const { user } = await getUserByID({ serviceUrl, userId: command.userId });
@@ -284,7 +284,7 @@ export async function checkSessionAndSetPassword({
password, password,
}: CheckSessionAndSetPasswordCommand) { }: CheckSessionAndSetPasswordCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionCookie = await getSessionCookieById({ sessionId }); const sessionCookie = await getSessionCookieById({ sessionId });

4
apps/login/src/lib/server/register.ts
View File

@@ -10,7 +10,7 @@ import {
} from "@zitadel/proto/zitadel/session/v2/session_service_pb"; } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getNextUrl } from "../client"; import { getNextUrl } from "../client";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { checkEmailVerification } from "../verify-helper"; import { checkEmailVerification } from "../verify-helper";
type RegisterUserCommand = { type RegisterUserCommand = {
@@ -29,7 +29,7 @@ export type RegisterUserResponse = {
}; };
export async function registerUser(command: RegisterUserCommand) { export async function registerUser(command: RegisterUserCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {

10
apps/login/src/lib/server/session.ts
View File

@@ -18,14 +18,14 @@ import {
getSessionCookieByLoginName, getSessionCookieByLoginName,
removeSessionFromCookie, removeSessionFromCookie,
} from "../cookies"; } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
export async function continueWithSession({ export async function continueWithSession({
authRequestId, authRequestId,
...session ...session
}: Session & { authRequestId?: string }) { }: Session & { authRequestId?: string }) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const loginSettings = await getLoginSettings({ const loginSettings = await getLoginSettings({
serviceUrl, serviceUrl,
@@ -88,7 +88,7 @@ export async function updateSession(options: UpdateSessionCommand) {
} }
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -152,7 +152,7 @@ type ClearSessionOptions = {
export async function clearSession(options: ClearSessionOptions) { export async function clearSession(options: ClearSessionOptions) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const { sessionId } = options; const { sessionId } = options;
@@ -175,7 +175,7 @@ type CleanupSessionCommand = {
export async function cleanupSession({ sessionId }: CleanupSessionCommand) { export async function cleanupSession({ sessionId }: CleanupSessionCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const sessionCookie = await getSessionCookieById({ sessionId }); const sessionCookie = await getSessionCookieById({ sessionId });

6
apps/login/src/lib/server/u2f.ts
View File

@@ -6,7 +6,7 @@ import { VerifyU2FRegistrationRequestSchema } from "@zitadel/proto/zitadel/user/
import { headers } from "next/headers"; import { headers } from "next/headers";
import { userAgent } from "next/server"; import { userAgent } from "next/server";
import { getSessionCookieById } from "../cookies"; import { getSessionCookieById } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
type RegisterU2FCommand = { type RegisterU2FCommand = {
sessionId: string; sessionId: string;
@@ -21,7 +21,7 @@ type VerifyU2FCommand = {
export async function addU2F(command: RegisterU2FCommand) { export async function addU2F(command: RegisterU2FCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {
@@ -59,7 +59,7 @@ export async function addU2F(command: RegisterU2FCommand) {
export async function verifyU2F(command: VerifyU2FCommand) { export async function verifyU2F(command: VerifyU2FCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host || typeof host !== "string") { if (!host || typeof host !== "string") {

10
apps/login/src/lib/server/verify.ts
View File

@@ -19,7 +19,7 @@ import { User } from "@zitadel/proto/zitadel/user/v2/user_pb";
import { headers } from "next/headers"; import { headers } from "next/headers";
import { getNextUrl } from "../client"; import { getNextUrl } from "../client";
import { getSessionCookieByLoginName } from "../cookies"; import { getSessionCookieByLoginName } from "../cookies";
import { getApiUrlOfHeaders } from "../service"; import { getServiceUrlFromHeaders } from "../service";
import { loadMostRecentSession } from "../session"; import { loadMostRecentSession } from "../session";
import { checkMFAFactors } from "../verify-helper"; import { checkMFAFactors } from "../verify-helper";
import { createSessionAndUpdateCookie } from "./cookie"; import { createSessionAndUpdateCookie } from "./cookie";
@@ -30,7 +30,7 @@ export async function verifyTOTP(
organization?: string, organization?: string,
) { ) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
return loadMostRecentSession({ return loadMostRecentSession({
serviceUrl, serviceUrl,
@@ -62,7 +62,7 @@ type VerifyUserByEmailCommand = {
export async function sendVerification(command: VerifyUserByEmailCommand) { export async function sendVerification(command: VerifyUserByEmailCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const verifyResponse = command.isInvite const verifyResponse = command.isInvite
? await verifyInviteCode({ ? await verifyInviteCode({
@@ -244,7 +244,7 @@ type resendVerifyEmailCommand = {
export async function resendVerification(command: resendVerifyEmailCommand) { export async function resendVerification(command: resendVerifyEmailCommand) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const host = _headers.get("host"); const host = _headers.get("host");
if (!host) { if (!host) {
@@ -290,7 +290,7 @@ export async function sendVerificationRedirectWithoutCheck(
command: SendVerificationRedirectWithoutCheckCommand, command: SendVerificationRedirectWithoutCheckCommand,
) { ) {
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
if (!("loginName" in command || "userId" in command)) { if (!("loginName" in command || "userId" in command)) {
return { error: "No userId, nor loginname provided" }; return { error: "No userId, nor loginname provided" };

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

@@ -34,9 +34,10 @@ export async function createServiceForHost<T extends ServiceClass>(
return createClientFor<T>(service)(transport); return createClientFor<T>(service)(transport);
} }
export function getApiUrlOfHeaders(headers: ReadonlyHeaders): string { export function getServiceUrlFromHeaders(headers: ReadonlyHeaders): string {
let instanceUrl: string = process.env.ZITADEL_API_URL; let instanceUrl: string = process.env.ZITADEL_API_URL;
// use the forwarded host if available (multitenant), otherwise fall back to the host of the deployment itself
if (headers.get("x-zitadel-forward-host")) { if (headers.get("x-zitadel-forward-host")) {
instanceUrl = headers.get("x-zitadel-forward-host") as string; instanceUrl = headers.get("x-zitadel-forward-host") as string;
instanceUrl = instanceUrl.startsWith("https://") instanceUrl = instanceUrl.startsWith("https://")

19
apps/login/src/middleware.ts
View File

@@ -1,6 +1,6 @@
import { headers } from "next/headers"; import { headers } from "next/headers";
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import { getApiUrlOfHeaders } from "./lib/service"; import { getServiceUrlFromHeaders } from "./lib/service";
export const config = { export const config = {
matcher: [ matcher: [
@@ -13,16 +13,17 @@ export const config = {
export async function middleware(request: NextRequest) { export async function middleware(request: NextRequest) {
// escape proxy if the environment is setup for multitenancy // escape proxy if the environment is setup for multitenancy
// if ( if (
// !process.env.ZITADEL_API_URL || !process.env.ZITADEL_API_URL ||
// !process.env.ZITADEL_USER_ID || !process.env.ZITADEL_USER_ID ||
// !process.env.ZITADEL_USER_TOKEN !process.env.ZITADEL_USER_TOKEN
// ) { ) {
// return NextResponse.next(); return NextResponse.next();
// } }
const _headers = await headers(); const _headers = await headers();
const serviceUrl = getApiUrlOfHeaders(_headers); const serviceUrl = getServiceUrlFromHeaders(_headers);
const instanceHost = `${serviceUrl}`.replace("https://", ""); const instanceHost = `${serviceUrl}`.replace("https://", "");