From bf017647ea3a68e354e88634ca5967b758001d67 Mon Sep 17 00:00:00 2001 From: Darya Umrikhina Date: Tue, 13 Aug 2024 12:41:22 +0400 Subject: [PATCH] Login:App:Confirm: add new actions --- .../app/(root)/confirm/Activation/page.tsx | 12 +++++++--- .../(root)/confirm/PasswordChange/page.tsx | 12 +++++++--- .../app/(root)/confirm/TfaActivation/page.tsx | 8 ++++--- .../src/app/(root)/confirm/TfaAuth/page.tsx | 6 +++-- .../src/app/(root)/confirm/[Invite]/page.tsx | 23 +++++++++++++++---- 5 files changed, 45 insertions(+), 16 deletions(-) diff --git a/packages/login/src/app/(root)/confirm/Activation/page.tsx b/packages/login/src/app/(root)/confirm/Activation/page.tsx index 912c73e2ad..4e6759d016 100644 --- a/packages/login/src/app/(root)/confirm/Activation/page.tsx +++ b/packages/login/src/app/(root)/confirm/Activation/page.tsx @@ -26,7 +26,7 @@ import { FormWrapper } from "@docspace/shared/components/form-wrapper"; -import { getSettings } from "@/utils/actions"; +import { getPortalPasswordSettings, getSettings } from "@/utils/actions"; import ActivateUserForm from "@/components/ActivateUserForm"; import { GreetingCreateUserContainer } from "@/components/GreetingContainer"; @@ -37,7 +37,10 @@ type ActivationProps = { async function Page({ searchParams }: ActivationProps) { const type = searchParams.type; - const settings = await getSettings(); + const [settings, passwordSettings] = await Promise.all([ + getSettings(), + getPortalPasswordSettings(), + ]); return (
@@ -45,7 +48,10 @@ async function Page({ searchParams }: ActivationProps) { <> - + )} diff --git a/packages/login/src/app/(root)/confirm/PasswordChange/page.tsx b/packages/login/src/app/(root)/confirm/PasswordChange/page.tsx index b658b2f9af..914b1bcc64 100644 --- a/packages/login/src/app/(root)/confirm/PasswordChange/page.tsx +++ b/packages/login/src/app/(root)/confirm/PasswordChange/page.tsx @@ -28,10 +28,13 @@ import { FormWrapper } from "@docspace/shared/components/form-wrapper"; import { GreetingContainer } from "@/components/GreetingContainer"; import PasswordChangeForm from "@/components/PasswordChangeForm"; -import { getSettings } from "@/utils/actions"; +import { getPortalPasswordSettings, getSettings } from "@/utils/actions"; async function Page() { - const settings = await getSettings(); + const [settings, passwordSettings] = await Promise.all([ + getSettings(), + getPortalPasswordSettings(), + ]); return (
@@ -39,7 +42,10 @@ async function Page() { <> - + )} diff --git a/packages/login/src/app/(root)/confirm/TfaActivation/page.tsx b/packages/login/src/app/(root)/confirm/TfaActivation/page.tsx index a0c5c2089f..b944c7c51b 100644 --- a/packages/login/src/app/(root)/confirm/TfaActivation/page.tsx +++ b/packages/login/src/app/(root)/confirm/TfaActivation/page.tsx @@ -48,9 +48,11 @@ async function Page({ searchParams }: TfaActivationProps) { const confirmKey = getStringFromSearchParams(searchParams); const uid = searchParams.uid; - const res = await getTfaSecretKeyAndQR(confirmKey); - const settings = await getSettings(); - const user = await getUserFromConfirm(uid, confirmKey); + const [res, settings, user] = await Promise.all([ + getTfaSecretKeyAndQR(confirmKey), + getSettings(), + getUserFromConfirm(uid, confirmKey), + ]); return (
diff --git a/packages/login/src/app/(root)/confirm/TfaAuth/page.tsx b/packages/login/src/app/(root)/confirm/TfaAuth/page.tsx index 1005ebd156..b79a62526d 100644 --- a/packages/login/src/app/(root)/confirm/TfaAuth/page.tsx +++ b/packages/login/src/app/(root)/confirm/TfaAuth/page.tsx @@ -39,8 +39,10 @@ async function Page({ searchParams }: TfaAuthProps) { const confirmKey = getStringFromSearchParams(searchParams); const uid = searchParams.uid; - const settings = await getSettings(); - const user = await getUserFromConfirm(uid, confirmKey); + const [settings, user] = await Promise.all([ + getSettings(), + getUserFromConfirm(uid, confirmKey), + ]); return (
diff --git a/packages/login/src/app/(root)/confirm/[Invite]/page.tsx b/packages/login/src/app/(root)/confirm/[Invite]/page.tsx index fa1a339c4d..0fa68b435f 100644 --- a/packages/login/src/app/(root)/confirm/[Invite]/page.tsx +++ b/packages/login/src/app/(root)/confirm/[Invite]/page.tsx @@ -31,7 +31,13 @@ import { FormWrapper } from "@docspace/shared/components/form-wrapper"; import CreateUserForm from "@/components/CreateUserForm"; import { GreetingCreateUserContainer } from "@/components/GreetingContainer"; import { getStringFromSearchParams } from "@/utils"; -import { getSettings, getUserFromConfirm } from "@/utils/actions"; +import { + getCapabilities, + getPortalPasswordSettings, + getSettings, + getThirdPartyProviders, + getUserFromConfirm, +} from "@/utils/actions"; import LanguageComboboxWrapper from "@/components/LanguageCombobox"; type LinkInviteProps = { @@ -47,10 +53,14 @@ async function Page({ searchParams, params }: LinkInviteProps) { const uid = searchParams.uid; const confirmKey = getStringFromSearchParams(searchParams); - const [settings, user] = await Promise.all([ - getSettings(), - getUserFromConfirm(uid, confirmKey), - ]); + const [settings, user, thirdParty, capabilities, passwordSettings] = + await Promise.all([ + getSettings(), + getUserFromConfirm(uid, confirmKey), + getThirdPartyProviders(), + getCapabilities(), + getPortalPasswordSettings(), + ]); return ( <> @@ -69,6 +79,9 @@ async function Page({ searchParams, params }: LinkInviteProps) { passwordHash={settings.passwordHash} firstName={user?.firstName} lastName={user?.lastName} + passwordSettings={passwordSettings} + capabilities={capabilities} + thirdPartyProviders={thirdParty} />