From d5c3bf2d4de5db25bf71e1fad708a482898a0ebc Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Thu, 30 Jan 2025 09:47:25 +0100 Subject: [PATCH] fix build --- .../(login)/idp/[provider]/failure/page.tsx | 6 +++- apps/login/src/lib/server/loginname.ts | 24 ++++++++++----- apps/login/src/lib/server/passkeys.ts | 6 +++- apps/login/src/lib/server/password.ts | 29 +++++++++++-------- apps/login/src/lib/server/session.ts | 6 +++- apps/login/src/lib/server/u2f.ts | 4 +-- 6 files changed, 51 insertions(+), 24 deletions(-) diff --git a/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx b/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx index 6a62e2515ea..c1e4de1b269 100644 --- a/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx +++ b/apps/login/src/app/(login)/idp/[provider]/failure/page.tsx @@ -27,7 +27,11 @@ export default async function Page(props: { const _headers = await headers(); const { serviceUrl, serviceRegion } = getServiceUrlFromHeaders(_headers); - const branding = await getBrandingSettings({ serviceUrl, organization }); + const branding = await getBrandingSettings({ + serviceUrl, + serviceRegion, + organization, + }); return ( diff --git a/apps/login/src/lib/server/loginname.ts b/apps/login/src/lib/server/loginname.ts index d296ff1cc1d..18070ab76cd 100644 --- a/apps/login/src/lib/server/loginname.ts +++ b/apps/login/src/lib/server/loginname.ts @@ -125,11 +125,13 @@ export async function sendLoginname(command: SendLoginnameCommand) { }; const redirectUserToIDP = async (userId: string) => { - const identityProviders = await listIDPLinks({ serviceUrl, userId }).then( - (resp) => { - return resp.result; - }, - ); + const identityProviders = await listIDPLinks({ + serviceUrl, + serviceRegion, + userId, + }).then((resp) => { + return resp.result; + }); if (identityProviders.length === 1) { const _headers = await headers(); @@ -142,7 +144,11 @@ export async function sendLoginname(command: SendLoginnameCommand) { const identityProviderId = identityProviders[0].idpId; - const idp = await getIDPByID({ serviceUrl, id: identityProviderId }); + const idp = await getIDPByID({ + serviceUrl, + serviceRegion, + id: identityProviderId, + }); const idpType = idp?.type; @@ -407,7 +413,11 @@ export async function sendLoginname(command: SendLoginnameCommand) { const suffix = matched?.[1] ?? ""; // this just returns orgs where the suffix is set as primary domain - const orgs = await getOrgsByDomain({ serviceUrl, domain: suffix }); + const orgs = await getOrgsByDomain({ + serviceUrl, + serviceRegion, + domain: suffix, + }); const orgToCheckForDiscovery = orgs.result && orgs.result.length === 1 ? orgs.result[0].id : undefined; diff --git a/apps/login/src/lib/server/passkeys.ts b/apps/login/src/lib/server/passkeys.ts index 05a1812f358..819f319bd47 100644 --- a/apps/login/src/lib/server/passkeys.ts +++ b/apps/login/src/lib/server/passkeys.ts @@ -160,7 +160,11 @@ export async function sendPasskey(command: SendPasskeyCommand) { const _headers = await headers(); const { serviceUrl, serviceRegion } = getServiceUrlFromHeaders(_headers); - const loginSettings = await getLoginSettings({ serviceUrl, organization }); + const loginSettings = await getLoginSettings({ + serviceUrl, + serviceRegion, + organization, + }); const lifetime = checks?.webAuthN ? loginSettings?.multiFactorCheckLifetime // TODO different lifetime for webauthn u2f/passkey diff --git a/apps/login/src/lib/server/password.ts b/apps/login/src/lib/server/password.ts index df69c7a29e3..15459fa734b 100644 --- a/apps/login/src/lib/server/password.ts +++ b/apps/login/src/lib/server/password.ts @@ -265,7 +265,11 @@ export async function changePassword(command: { const { serviceUrl, serviceRegion } = getServiceUrlFromHeaders(_headers); // check for init state - const { user } = await getUserByID({ serviceUrl, userId: command.userId }); + const { user } = await getUserByID({ + serviceUrl, + serviceRegion, + userId: command.userId, + }); if (!user || user.userId !== command.userId) { return { error: "Could not send Password Reset Link" }; @@ -348,29 +352,30 @@ export async function checkSessionAndSetPassword({ // if the user has no MFA but MFA is enforced, we can set a password otherwise we use the token of the user if (forceMfa && hasNoMFAMethods) { - return setPassword({ serviceUrl, payload }).catch((error) => { - // throw error if failed precondition (ex. User is not yet initialized) - if (error.code === 9 && error.message) { - return { error: "Failed precondition" }; - } else { - throw error; - } - }); + return setPassword({ serviceUrl, serviceRegion, payload }).catch( + (error) => { + // throw error if failed precondition (ex. User is not yet initialized) + if (error.code === 9 && error.message) { + return { error: "Failed precondition" }; + } else { + throw error; + } + }, + ); } else { - const transport = async (host: string, token: string) => { + const transport = async (serviceUrl: string, token: string) => { return createServerTransport(token, { baseUrl: serviceUrl, }); }; - const myUserService = async (host: string, sessionToken: string) => { + const myUserService = async (serviceUrl: string, sessionToken: string) => { const transportPromise = await transport(serviceUrl, sessionToken); return createUserServiceClient(transportPromise); }; const selfService = await myUserService( serviceUrl, - serviceRegion, `${sessionCookie.token}`, ); diff --git a/apps/login/src/lib/server/session.ts b/apps/login/src/lib/server/session.ts index e088062f08e..7f71ec8f14d 100644 --- a/apps/login/src/lib/server/session.ts +++ b/apps/login/src/lib/server/session.ts @@ -107,7 +107,11 @@ export async function updateSession(options: UpdateSessionCommand) { challenges.webAuthN.domain = hostname; } - const loginSettings = await getLoginSettings({ serviceUrl, organization }); + const loginSettings = await getLoginSettings({ + serviceUrl, + serviceRegion, + organization, + }); const lifetime = checks?.webAuthN ? loginSettings?.multiFactorCheckLifetime // TODO different lifetime for webauthn u2f/passkey diff --git a/apps/login/src/lib/server/u2f.ts b/apps/login/src/lib/server/u2f.ts index 0b5e188bd96..60f1c12b66a 100644 --- a/apps/login/src/lib/server/u2f.ts +++ b/apps/login/src/lib/server/u2f.ts @@ -55,7 +55,7 @@ export async function addU2F(command: RegisterU2FCommand) { return { error: "Could not get session" }; } - return registerU2F({ serviceUrl, userId, domain: hostname }); + return registerU2F({ serviceUrl, serviceRegion, userId, domain: hostname }); } export async function verifyU2F(command: VerifyU2FCommand) { @@ -101,5 +101,5 @@ export async function verifyU2F(command: VerifyU2FCommand) { userId, }); - return verifyU2FRegistration({ serviceUrl, request }); + return verifyU2FRegistration({ serviceUrl, serviceRegion, request }); }