Merge pull request #557 from MasterKale/fix/544-ensure-webauthn-available-autofill-feature-check

fix/544-ensure-webauthn-available-autofill-feature-check

1 files changed, 6 insertions, 0 deletions

diff --git a/packages/browser/src/helpers/browserSupportsWebAuthnAutofill.ts b/packages/browser/src/helpers/browserSupportsWebAuthnAutofill.ts
index 1ac861a..b1312ab 100644
--- a/packages/browser/src/helpers/browserSupportsWebAuthnAutofill.ts
+++ b/packages/browser/src/helpers/browserSupportsWebAuthnAutofill.ts
@@ -1,10 +1,16 @@
 import { PublicKeyCredentialFuture } from '@simplewebauthn/types';
 
+import { browserSupportsWebAuthn } from './browserSupportsWebAuthn';
+
 /**
  * Determine if the browser supports conditional UI, so that WebAuthn credentials can
  * be shown to the user in the browser's typical password autofill popup.
  */
 export function browserSupportsWebAuthnAutofill(): Promise<boolean> {
+  if (!browserSupportsWebAuthn()) {
+    return new Promise((resolve) => resolve(false));
+  }
+
   /**
    * I don't like the `as unknown` here but there's a `declare var PublicKeyCredential` in
    * TS' DOM lib that's making it difficult for me to just go `as PublicKeyCredentialFuture` as I