user avatar fallback

This commit is contained in:
Max Peintner
2023-06-21 14:11:04 +02:00
parent ad7f9d2ab4
commit 3379779c04
4 changed files with 6 additions and 9 deletions

View File

@@ -34,7 +34,7 @@ export default async function Page({
{sessionFactors && ( {sessionFactors && (
<UserAvatar <UserAvatar
loginName={loginName ?? sessionFactors.factors?.user?.loginName ?? ""} loginName={loginName ?? sessionFactors.factors?.user?.loginName}
displayName={sessionFactors.factors?.user?.displayName} displayName={sessionFactors.factors?.user?.displayName}
showDropdown showDropdown
></UserAvatar> ></UserAvatar>

View File

@@ -2,15 +2,12 @@ import { getSession, server } from "#/lib/zitadel";
import Alert from "#/ui/Alert"; import Alert from "#/ui/Alert";
import UserAvatar from "#/ui/UserAvatar"; import UserAvatar from "#/ui/UserAvatar";
import { getMostRecentCookieWithLoginname } from "#/utils/cookies"; import { getMostRecentCookieWithLoginname } from "#/utils/cookies";
import { useRouter } from "next/navigation";
export default async function Page({ export default async function Page({
searchParams, searchParams,
}: { }: {
searchParams: Record<string | number | symbol, string | undefined>; searchParams: Record<string | number | symbol, string | undefined>;
}) { }) {
const router = useRouter();
const { loginName } = searchParams; const { loginName } = searchParams;
const sessionFactors = await loadSession(loginName); const sessionFactors = await loadSession(loginName);
@@ -39,7 +36,7 @@ export default async function Page({
{sessionFactors && ( {sessionFactors && (
<UserAvatar <UserAvatar
loginName={loginName ?? sessionFactors.factors?.user?.loginName ?? ""} loginName={loginName ?? sessionFactors.factors?.user?.loginName}
displayName={sessionFactors.factors?.user?.displayName} displayName={sessionFactors.factors?.user?.displayName}
showDropdown showDropdown
></UserAvatar> ></UserAvatar>

View File

@@ -38,7 +38,7 @@ export default async function Page({
{sessionFactors && ( {sessionFactors && (
<UserAvatar <UserAvatar
loginName={loginName ?? sessionFactors.factors?.user?.loginName ?? ""} loginName={loginName ?? sessionFactors.factors?.user?.loginName}
displayName={sessionFactors.factors?.user?.displayName} displayName={sessionFactors.factors?.user?.displayName}
showDropdown showDropdown
></UserAvatar> ></UserAvatar>

View File

@@ -3,7 +3,7 @@ import { ChevronDownIcon } from "@heroicons/react/24/outline";
import Link from "next/link"; import Link from "next/link";
type Props = { type Props = {
loginName: string; loginName?: string;
displayName?: string; displayName?: string;
showDropdown: boolean; showDropdown: boolean;
}; };
@@ -18,8 +18,8 @@ export default function UserAvatar({
<div> <div>
<Avatar <Avatar
size="small" size="small"
name={displayName ?? loginName} name={displayName ?? loginName ?? "A"}
loginName={loginName} loginName={loginName ?? "A"}
/> />
</div> </div>
<span className="ml-4 text-14px">{loginName}</span> <span className="ml-4 text-14px">{loginName}</span>