show avatar, edit selection

zitadel · Jan 17, 2025 · bfd57db · bfd57db
1 parent 669f089
commit bfd57db
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 29 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
@@ -1,10 +1,14 @@
+import { Alert, AlertType } from "@/components/alert";
 import { ChooseAuthenticatorToLogin } from "@/components/choose-authenticator-to-login";
 import { DynamicTheme } from "@/components/dynamic-theme";
+import { UserAvatar } from "@/components/user-avatar";
 import {
   getBrandingSettings,
   getLoginSettings,
+  getUserByID,
   listAuthenticationMethodTypes,
 } from "@/lib/zitadel";
+import { HumanUser, User } from "@zitadel/proto/zitadel/user/v2/user_pb";
 import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 import { getLocale, getTranslations } from "next-intl/server";
 
@@ -23,7 +27,18 @@ export default async function Page(props: {
   const loginSettings = await getLoginSettings(organization);
 
   let authMethods: AuthenticationMethodType[] = [];
+  let user: User | undefined = undefined;
+  let human: HumanUser | undefined = undefined;
+
   if (userId) {
+    const userResponse = await getUserByID(userId);
+    if (userResponse) {
+      user = userResponse.user;
+      if (user?.type.case === "human") {
+        human = user.type.value as HumanUser;
+      }
+    }
+
     const authMethodsResponse = await listAuthenticationMethodTypes(userId);
     if (authMethodsResponse.authMethodTypes) {
       authMethods = authMethodsResponse.authMethodTypes;
@@ -42,14 +57,24 @@ export default async function Page(props: {
     <DynamicTheme branding={branding}>
       <div className="flex flex-col items-center space-y-4">
         <h1>{t("loginError.title")}</h1>
-        <p className="ztdl-p">{t("loginError.description")}</p>
+        <Alert type={AlertType.ALERT}>{t("loginError.description")}</Alert>
 
         {userId && authMethods.length && (
-          <ChooseAuthenticatorToLogin
-            authMethods={sessionWithData.authMethods}
-            loginSettings={loginSettings}
-            params={params}
-          ></ChooseAuthenticatorToLogin>
+          <>
+            {user && human && (
+              <UserAvatar
+                loginName={user.preferredLoginName}
+                displayName={human?.profile?.displayName}
+                showDropdown={false}
+              />
+            )}
+
+            <ChooseAuthenticatorToLogin
+              authMethods={authMethods}
+              loginSettings={loginSettings}
+              params={params}
+            ></ChooseAuthenticatorToLogin>
+          </>
         )}
       </div>
     </DynamicTheme>

diff --git a/apps/login/src/components/choose-authenticator-to-login.tsx b/apps/login/src/components/choose-authenticator-to-login.tsx
@@ -4,7 +4,6 @@ import {
 } from "@zitadel/proto/zitadel/settings/v2/login_settings_pb";
 import { AuthenticationMethodType } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
 import { useTranslations } from "next-intl";
-import { Alert, AlertType } from "./alert";
 import { PASSKEYS, PASSWORD } from "./auth-methods";
 
 type Props = {
@@ -18,27 +17,22 @@ export function ChooseAuthenticatorToLogin({
   params,
   loginSettings,
 }: Props) {
-  const t = useTranslations("authenticator");
+  const t = useTranslations("idp");
 
-  if (authMethods.length !== 0) {
-    return <Alert type={AlertType.ALERT}>{t("allSetup")}</Alert>;
-  } else {
-    return (
-      <>
-        {loginSettings?.passkeysType == PasskeysType.NOT_ALLOWED &&
-          !loginSettings.allowUsernamePassword && (
-            <Alert type={AlertType.ALERT}>{t("noMethodsAvailable")}</Alert>
-          )}
-
-        <div className="grid grid-cols-1 gap-5 w-full pt-4">
-          {!authMethods.includes(AuthenticationMethodType.PASSWORD) &&
-            loginSettings?.allowUsernamePassword &&
-            PASSWORD(false, "/password/set?" + params)}
-          {!authMethods.includes(AuthenticationMethodType.PASSKEY) &&
-            loginSettings?.passkeysType == PasskeysType.ALLOWED &&
-            PASSKEYS(false, "/passkey/set?" + params)}
-        </div>
-      </>
-    );
-  }
+  return (
+    <>
+      {authMethods.includes(AuthenticationMethodType.PASSWORD) &&
+        loginSettings?.allowUsernamePassword && (
+          <div className="ztdl-p">Choose an alternative method to login </div>
+        )}
+      <div className="grid grid-cols-1 gap-5 w-full pt-4">
+        {authMethods.includes(AuthenticationMethodType.PASSWORD) &&
+          loginSettings?.allowUsernamePassword &&
+          PASSWORD(false, "/password?" + params)}
+        {authMethods.includes(AuthenticationMethodType.PASSKEY) &&
+          loginSettings?.passkeysType == PasskeysType.ALLOWED &&
+          PASSKEYS(false, "/passkey?" + params)}
+      </div>
+    </>
+  );
 }