Cleanup

Author: sea-snake

src/frontend/src/lib/components/ui/IdentitySwitcher.svelte

@@ -49,7 +49,7 @@
   const selectedIdentity = $derived(
     initialIdentities.find(
       (identity) => identity.identityNumber === initialSelected,
-    ),
+    )!,
   );
   const selectedLogo = $derived(
     selectedIdentity !== undefined &&
@@ -66,6 +66,19 @@
       (identity) => identity.identityNumber !== initialSelected,
     ),
   );
+  const passkeyNameCounts = $derived.by(() => {
+    const counts = new Map<string | undefined, number>();
+
+    for (const identity of otherIdentities) {
+      if (!("passkey" in identity.authMethod)) {
+        continue;
+      }
+
+      counts.set(identity.name, (counts.get(identity.name) ?? 0) + 1);
+    }
+
+    return counts;
+  });
 
   const handleSwitchIdentity = async (identityNumber: bigint) => {
     try {
@@ -137,15 +150,15 @@
     <p
       class="text-text-primary max-w-full overflow-hidden text-sm font-semibold text-ellipsis whitespace-nowrap"
     >
-      {selectedIdentity!.name ?? selectedIdentity!.identityNumber}
+      {selectedIdentity.name ?? selectedIdentity.identityNumber}
     </p>
     <p
       class="text-text-tertiary mb-6 max-w-full overflow-hidden text-sm text-ellipsis whitespace-nowrap"
     >
-      {#if "openid" in selectedIdentity!.authMethod}
+      {#if "openid" in selectedIdentity.authMethod && selectedIdentity.authMethod.openid.metadata !== undefined}
         <span
           >{getMetadataString(
-            selectedIdentity!.authMethod.openid.metadata!,
+            selectedIdentity.authMethod.openid.metadata,
             "email",
           ) ?? $t`Hidden email`}</span
         >
@@ -188,12 +201,8 @@
         )
       : undefined}
   {@const notUnique =
-    otherIdentities.filter(
-      (otherIdentity) =>
-        "passkey" in identity.authMethod &&
-        "passkey" in otherIdentity.authMethod &&
-        identity.name === otherIdentity.name,
-    ).length > 1}
+    "passkey" in identity.authMethod &&
+    (passkeyNameCounts.get(identity.name) ?? 0) > 1}
   <li class="mx-4">
     <button
       onclick={() => handleSwitchIdentity(identity.identityNumber)}
@@ -217,10 +226,10 @@
         <span
           class="text-text-tertiary overflow-hidden text-sm text-ellipsis whitespace-nowrap"
         >
-          {#if "openid" in identity.authMethod}
+          {#if "openid" in identity.authMethod && identity.authMethod.openid.metadata !== undefined}
             <span
               >{getMetadataString(
-                identity.authMethod.openid.metadata!,
+                identity.authMethod.openid.metadata,
                 "email",
               ) ?? $t`Hidden email`}</span
             >

src/frontend/src/routes/(new-styling)/manage/(authenticated)/+layout.svelte

@@ -26,20 +26,12 @@
   import Dialog from "$lib/components/ui/Dialog.svelte";
   import AuthWizard from "$lib/components/wizards/auth/AuthWizard.svelte";
   import { sessionStore } from "$lib/stores/session.store";
-  import {
-    formatDate,
-    locales,
-    localeStore,
-    t,
-  } from "$lib/stores/locale.store";
+  import { locales, localeStore, t } from "$lib/stores/locale.store";
   import Logo from "$lib/components/ui/Logo.svelte";
   import NavItem from "$lib/components/ui/NavItem.svelte";
   import { SOURCE_CODE_URL, SUPPORT_URL } from "$lib/config";
   import type { LayoutProps } from "./$types";
   import ChooseLanguage from "$lib/components/views/ChooseLanguage.svelte";
-  import { nanosToMillis } from "$lib/utils/time";
-  import { lastUsedIdentityTypeName } from "$lib/utils/lastUsedIdentity";
-  import ButtonCard from "$lib/components/ui/ButtonCard.svelte";
   import Avatar from "$lib/components/ui/Avatar.svelte";
   import { Trans } from "$lib/components/locale";
   import { getMetadataString, openIdLogo } from "$lib/utils/openID";
@@ -279,12 +271,12 @@
           <div
             class="text-text-tertiary overflow-hidden text-sm overflow-ellipsis whitespace-nowrap"
           >
-            {#if "openid" in $lastUsedIdentitiesStore.selected.authMethod}
+            {#if "openid" in $lastUsedIdentitiesStore.selected.authMethod && $lastUsedIdentitiesStore.selected.authMethod.openid.metadata !== undefined}
               <span
                 >{getMetadataString(
-                  $lastUsedIdentitiesStore.selected.authMethod.openid.metadata!,
+                  $lastUsedIdentitiesStore.selected.authMethod.openid.metadata,
                   "email",
-                ) ?? $t`Hidden email`}dhjbsdhfsvjfvshgfvshvfhsgvdfgh</span
+                ) ?? $t`Hidden email`}</span
               >
             {:else}
               <span>