Let user pick rp id instead of automatically selecting the first rp id.

dfinity · Feb 20, 2025 · d217b9e · d217b9e
1 parent d8e558b
commit d217b9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/src/frontend/src/components/authenticateBox/index.ts b/src/frontend/src/components/authenticateBox/index.ts
@@ -369,7 +369,6 @@ export const handleLoginFlowResult = async <E>(
     | PossiblyWrongWebAuthnFlow
     | PinUserOtherDomain
     | FlowError
-    | LoginCancel
 ): Promise<
   ({ userNumber: bigint; connection: AuthenticatedConnection } & E) | undefined
 > => {
@@ -405,10 +404,6 @@ export const handleLoginFlowResult = async <E>(
     return undefined;
   }
 
-  if (result.kind === "loginCancel") {
-    return undefined;
-  }
-
   result satisfies FlowError;
 
   toast.error(flowErrorToastTemplate(result));

diff --git a/src/frontend/src/utils/iiConnection.ts b/src/frontend/src/utils/iiConnection.ts
@@ -389,7 +389,6 @@ export class Connection {
     | PinUserOtherDomain
     | UnknownUser
     | ApiError
-    | LoginCancel
   > => {
     let devices: Omit<DeviceData, "alias">[];
     try {
@@ -440,11 +439,7 @@ export class Connection {
       rpIds: Array<string | undefined>
     ) => Promise<RpIdPickSuccess | RpIdPickCancelled>
   ): Promise<
-    | LoginSuccess
-    | WebAuthnFailed
-    | PossiblyWrongWebAuthnFlow
-    | AuthFail
-    | LoginCancel
+    LoginSuccess | WebAuthnFailed | PossiblyWrongWebAuthnFlow | AuthFail
   > => {
     if (DOMAIN_COMPATIBILITY.isEnabled()) {
       // Create flows if not initialized yet
@@ -473,7 +468,7 @@ export class Connection {
       ) {
         const result = await pickRpId(uniqueRpIds);
         if (result.kind === "rpIdPickCancelled") {
-          return { kind: "loginCancel" };
+          return { kind: "webAuthnFailed" };
         }
         void (result satisfies RpIdPickSuccess);