From 9bcbf3dfcbfa2cb928491565ded5ed8935f25af9 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Thu, 15 Jan 2026 15:04:28 +0100 Subject: [PATCH] ts-strict: Fix possibly null on parsedOrigin.hostname --- libs/common/src/platform/services/fido2/domain-utils.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/common/src/platform/services/fido2/domain-utils.ts b/libs/common/src/platform/services/fido2/domain-utils.ts index 16b495f47e9..542beae3435 100644 --- a/libs/common/src/platform/services/fido2/domain-utils.ts +++ b/libs/common/src/platform/services/fido2/domain-utils.ts @@ -48,7 +48,12 @@ export function isValidRpId(rpId: string, origin: string) { if (rpId !== "localhost" && !rpId.includes(".")) { return false; } - if (parsedOrigin.hostname !== "localhost" && !parsedOrigin.hostname.includes(".")) { + + if ( + parsedOrigin.hostname != null && + parsedOrigin.hostname !== "localhost" && + !parsedOrigin.hostname.includes(".") + ) { return false; } @@ -65,7 +70,7 @@ export function isValidRpId(rpId: string, origin: string) { // Check if origin is a subdomain of rpId // This prevents "evilaccounts.example.com" from matching "accounts.example.com" - if (parsedOrigin.hostname.endsWith("." + rpId)) { + if (parsedOrigin.hostname != null && parsedOrigin.hostname.endsWith("." + rpId)) { return true; }