Append https:// in front of RP ID when excluding devices (#2755)

* Convert cancelled rp id to full urls * Fix issue with `undefined` rpId
dfinity · Dec 19, 2024 · a867c7f · a867c7f
1 parent aaf88ff
commit a867c7f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/frontend/src/utils/findWebAuthnRpId.test.ts b/src/frontend/src/utils/findWebAuthnRpId.test.ts
@@ -180,7 +180,7 @@ describe("excludeCredentialsFromOrigins", () => {
       mockDeviceData("https://identity.internetcomputer.org"),
       mockDeviceData("https://identity.icp0.io"),
     ];
-    const originsToExclude = new Set(["https://identity.ic0.app"]);
+    const originsToExclude = new Set(["identity.ic0.app"]);
     const currentOrigin = "https://identity.internetcomputer.org";
 
     const result = excludeCredentialsFromOrigins(
@@ -201,7 +201,7 @@ describe("excludeCredentialsFromOrigins", () => {
       mockDeviceData(undefined), // Should be treated as DEFAULT_DOMAIN
       mockDeviceData("https://identity.internetcomputer.org"),
     ];
-    const originsToExclude = new Set(["https://identity.ic0.app"]); // Should match DEFAULT_DOMAIN
+    const originsToExclude = new Set(["identity.ic0.app"]); // Should match DEFAULT_DOMAIN
     const currentOrigin = "https://identity.internetcomputer.org";
 
     const result = excludeCredentialsFromOrigins(
@@ -240,8 +240,8 @@ describe("excludeCredentialsFromOrigins", () => {
       mockDeviceData("https://identity.internetcomputer.org"),
     ];
     const originsToExclude = new Set([
-      "https://identity.ic0.app",
-      "https://identity.internetcomputer.org",
+      "identity.ic0.app",
+      "identity.internetcomputer.org",
     ]);
     const currentOrigin = "https://identity.ic0.app";
 

diff --git a/src/frontend/src/utils/findWebAuthnRpId.ts b/src/frontend/src/utils/findWebAuthnRpId.ts
@@ -43,21 +43,21 @@ export const hasCredentialsFromMultipleOrigins = (
  * Two origins match if they have the same hostname (domain).
  *
  * @param credentials - List of credential devices to filter
- * @param origins - Set of origins to exclude (undefined values are treated as `currentOrigin`)
+ * @param rpIds - Set of origins to exclude (undefined values are treated as `currentOrigin`)
  * @param currentOrigin - The current origin to use when comparing against undefined origins
  * @returns Filtered list of credentials, excluding those from the specified origins
  */
 export const excludeCredentialsFromOrigins = (
   credentials: CredentialData[],
-  origins: Set<string | undefined>,
+  rpIds: Set<string | undefined>,
   currentOrigin: string
 ): CredentialData[] => {
-  if (origins.size === 0) {
+  if (rpIds.size === 0) {
     return credentials;
   }
   // Change `undefined` to the current origin.
-  const originsToExclude = Array.from(origins).map(
-    (origin) => origin ?? currentOrigin
+  const originsToExclude = Array.from(rpIds).map((origin) =>
+    origin === undefined ? currentOrigin : `https://${origin}`
   );
   return credentials.filter(
     (credential) =>