From 82c8d083606994579b15557d78f76acc057f2faf Mon Sep 17 00:00:00 2001 From: peintnermax Date: Thu, 5 Sep 2024 14:02:08 +0200 Subject: [PATCH] loadMostRecentSession --- apps/login/src/app/(login)/otp/[method]/page.tsx | 4 ++-- apps/login/src/app/(login)/otp/[method]/set/page.tsx | 3 +-- apps/login/src/app/(login)/passkey/add/page.tsx | 4 ++-- apps/login/src/app/(login)/passkey/login/page.tsx | 4 ++-- apps/login/src/app/(login)/password/page.tsx | 8 ++------ apps/login/src/app/(login)/u2f/page.tsx | 4 ++-- apps/login/src/app/(login)/u2f/set/page.tsx | 4 ++-- apps/login/src/lib/server-actions.ts | 4 ++-- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/apps/login/src/app/(login)/otp/[method]/page.tsx b/apps/login/src/app/(login)/otp/[method]/page.tsx index e737a031b47..55af60f66bb 100644 --- a/apps/login/src/app/(login)/otp/[method]/page.tsx +++ b/apps/login/src/app/(login)/otp/[method]/page.tsx @@ -1,5 +1,5 @@ import { loadMostRecentSession } from "@/lib/session"; -import { getBrandingSettings, sessionService } from "@/lib/zitadel"; +import { getBrandingSettings } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import LoginOTP from "@/ui/LoginOTP"; @@ -17,7 +17,7 @@ export default async function Page({ const { method } = params; - const session = await loadMostRecentSession(sessionService, { + const session = await loadMostRecentSession({ loginName, organization, }); diff --git a/apps/login/src/app/(login)/otp/[method]/set/page.tsx b/apps/login/src/app/(login)/otp/[method]/set/page.tsx index c488b1cf459..22b22461846 100644 --- a/apps/login/src/app/(login)/otp/[method]/set/page.tsx +++ b/apps/login/src/app/(login)/otp/[method]/set/page.tsx @@ -4,7 +4,6 @@ import { addOTPSMS, getBrandingSettings, registerTOTP, - sessionService, } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import BackButton from "@/ui/BackButton"; @@ -27,7 +26,7 @@ export default async function Page({ const { method } = params; const branding = await getBrandingSettings(organization); - const session = await loadMostRecentSession(sessionService, { + const session = await loadMostRecentSession({ loginName, organization, }); diff --git a/apps/login/src/app/(login)/passkey/add/page.tsx b/apps/login/src/app/(login)/passkey/add/page.tsx index b3332839b3a..beec6902c68 100644 --- a/apps/login/src/app/(login)/passkey/add/page.tsx +++ b/apps/login/src/app/(login)/passkey/add/page.tsx @@ -1,5 +1,5 @@ import { loadMostRecentSession } from "@/lib/session"; -import { getBrandingSettings, sessionService } from "@/lib/zitadel"; +import { getBrandingSettings } from "@/lib/zitadel"; import Alert, { AlertType } from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import RegisterPasskey from "@/ui/RegisterPasskey"; @@ -13,7 +13,7 @@ export default async function Page({ const { loginName, promptPasswordless, organization, authRequestId } = searchParams; - const session = await loadMostRecentSession(sessionService, { + const session = await loadMostRecentSession({ loginName, organization, }); diff --git a/apps/login/src/app/(login)/passkey/login/page.tsx b/apps/login/src/app/(login)/passkey/login/page.tsx index 5b3e2e97270..d681b4ef91d 100644 --- a/apps/login/src/app/(login)/passkey/login/page.tsx +++ b/apps/login/src/app/(login)/passkey/login/page.tsx @@ -1,6 +1,6 @@ import { getSessionCookieById } from "@/lib/cookies"; import { loadMostRecentSession } from "@/lib/session"; -import { getBrandingSettings, getSession, sessionService } from "@/lib/zitadel"; +import { getBrandingSettings, getSession } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import LoginPasskey from "@/ui/LoginPasskey"; @@ -20,7 +20,7 @@ export default async function Page({ const sessionFactors = sessionId ? await loadSessionById(sessionId, organization) - : await loadMostRecentSession(sessionService, { loginName, organization }); + : await loadMostRecentSession({ loginName, organization }); async function loadSessionById(sessionId: string, organization?: string) { const recent = await getSessionCookieById({ sessionId, organization }); diff --git a/apps/login/src/app/(login)/password/page.tsx b/apps/login/src/app/(login)/password/page.tsx index a486697db0c..7476eb39677 100644 --- a/apps/login/src/app/(login)/password/page.tsx +++ b/apps/login/src/app/(login)/password/page.tsx @@ -1,9 +1,5 @@ import { loadMostRecentSession } from "@/lib/session"; -import { - getBrandingSettings, - getLoginSettings, - sessionService, -} from "@/lib/zitadel"; +import { getBrandingSettings, getLoginSettings } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import PasswordForm from "@/ui/PasswordForm"; @@ -17,7 +13,7 @@ export default async function Page({ const { loginName, organization, promptPasswordless, authRequestId, alt } = searchParams; - const sessionFactors = await loadMostRecentSession(sessionService, { + const sessionFactors = await loadMostRecentSession({ loginName, organization, }); diff --git a/apps/login/src/app/(login)/u2f/page.tsx b/apps/login/src/app/(login)/u2f/page.tsx index 27216e0c80c..55e99db4d98 100644 --- a/apps/login/src/app/(login)/u2f/page.tsx +++ b/apps/login/src/app/(login)/u2f/page.tsx @@ -1,6 +1,6 @@ import { getSessionCookieById } from "@/lib/cookies"; import { loadMostRecentSession } from "@/lib/session"; -import { getBrandingSettings, getSession, sessionService } from "@/lib/zitadel"; +import { getBrandingSettings, getSession } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import LoginPasskey from "@/ui/LoginPasskey"; @@ -17,7 +17,7 @@ export default async function Page({ const sessionFactors = sessionId ? await loadSessionById(sessionId, organization) - : await loadMostRecentSession(sessionService, { loginName, organization }); + : await loadMostRecentSession({ loginName, organization }); async function loadSessionById(sessionId: string, organization?: string) { const recent = await getSessionCookieById({ sessionId, organization }); diff --git a/apps/login/src/app/(login)/u2f/set/page.tsx b/apps/login/src/app/(login)/u2f/set/page.tsx index 9530bf206fb..ac3d24653bb 100644 --- a/apps/login/src/app/(login)/u2f/set/page.tsx +++ b/apps/login/src/app/(login)/u2f/set/page.tsx @@ -1,5 +1,5 @@ import { loadMostRecentSession } from "@/lib/session"; -import { getBrandingSettings, sessionService } from "@/lib/zitadel"; +import { getBrandingSettings } from "@/lib/zitadel"; import Alert from "@/ui/Alert"; import DynamicTheme from "@/ui/DynamicTheme"; import RegisterU2F from "@/ui/RegisterU2F"; @@ -12,7 +12,7 @@ export default async function Page({ }) { const { loginName, organization, authRequestId } = searchParams; - const sessionFactors = await loadMostRecentSession(sessionService, { + const sessionFactors = await loadMostRecentSession({ loginName, organization, }); diff --git a/apps/login/src/lib/server-actions.ts b/apps/login/src/lib/server-actions.ts index 39f61c30b76..ce0726075fc 100644 --- a/apps/login/src/lib/server-actions.ts +++ b/apps/login/src/lib/server-actions.ts @@ -1,14 +1,14 @@ "use server"; import { loadMostRecentSession } from "./session"; -import { sessionService, verifyTOTPRegistration } from "./zitadel"; +import { verifyTOTPRegistration } from "./zitadel"; export async function verifyTOTP( code: string, loginName?: string, organization?: string, ) { - return loadMostRecentSession(sessionService, { + return loadMostRecentSession({ loginName, organization, }).then((session) => {