@dfns/sdk-browser 0.7.8 → 0.7.9-rc.2

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@dfns/sdk-browser",
-  "version": "0.7.8",
+  "version": "0.7.9-rc.2",
   "dependencies": {
     "buffer": "6.0.3",
     "cross-fetch": "3.1.6"
   },
   "peerDependencies": {
-    "@dfns/sdk": "0.7.8"
+    "@dfns/sdk": "0.7.9-rc.2"
   },
   "main": "./index.js",
   "type": "commonjs"

package/signers/webauthn.d.ts

@@ -22,7 +22,9 @@ interface WebAuthnSignerConf {
 }
 export declare class WebAuthnSigner implements CredentialSigner<Fido2Assertion>, CredentialStore<Fido2Attestation> {
     private conf;
+    private _signal?;
     constructor(conf: WebAuthnSignerConf);
+    set signal(signal: AbortSignal);
     sign(challenge: UserActionChallenge): Promise<Fido2Assertion>;
     create(challenge: CreateRegistrationChallengeResponse | (CreateCredentialChallengeResponse & {
         kind: 'Fido2';

package/signers/webauthn.js

@@ -12,69 +12,84 @@ class WebAuthnSigner {
             throw new sdk_1.DfnsError(-1, `Relying party ID and name must be specified in the WebauthnSigner initializer`);
         }
     }
+    set signal(signal) {
+        this._signal = signal;
+    }
     async sign(challenge) {
-        const response = await navigator.credentials.get({
-            publicKey: {
-                challenge: buffer_1.Buffer.from(challenge.challenge),
-                allowCredentials: challenge.allowCredentials.webauthn.map(({ id, type }) => ({
-                    id: (0, utils_1.fromBase64Url)(id),
-                    type,
-                })),
-                rpId: this.conf.relyingParty.id,
-                userVerification: challenge.userVerification,
-                timeout: this.conf.timeout ?? exports.DEFAULT_WAIT_TIMEOUT,
-            },
-        });
-        if (response === null) {
-            throw new sdk_1.DfnsError(-1, 'Failed to sign with WebAuthn credential');
+        try {
+            const response = await navigator.credentials.get({
+                publicKey: {
+                    challenge: buffer_1.Buffer.from(challenge.challenge),
+                    allowCredentials: challenge.allowCredentials.webauthn.map(({ id, type }) => ({
+                        id: (0, utils_1.fromBase64Url)(id),
+                        type,
+                    })),
+                    rpId: this.conf.relyingParty.id,
+                    userVerification: challenge.userVerification,
+                    timeout: this.conf.timeout ?? exports.DEFAULT_WAIT_TIMEOUT,
+                },
+                signal: this._signal,
+            });
+            if (response === null) {
+                throw new sdk_1.DfnsError(-1, 'Failed to sign with WebAuthn credential');
+            }
+            const credential = response;
+            const assertion = credential.response;
+            return {
+                kind: 'Fido2',
+                credentialAssertion: {
+                    credId: credential.id,
+                    clientData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.clientDataJSON)),
+                    authenticatorData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.authenticatorData)),
+                    signature: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.signature)),
+                    userHandle: assertion.userHandle ? (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.userHandle)) : undefined,
+                },
+            };
+        }
+        finally {
+            this._signal = undefined;
         }
-        const credential = response;
-        const assertion = credential.response;
-        return {
-            kind: 'Fido2',
-            credentialAssertion: {
-                credId: credential.id,
-                clientData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.clientDataJSON)),
-                authenticatorData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.authenticatorData)),
-                signature: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.signature)),
-                userHandle: assertion.userHandle ? (0, utils_1.toBase64Url)(buffer_1.Buffer.from(assertion.userHandle)) : undefined,
-            },
-        };
     }
     async create(challenge) {
-        const options = {
-            publicKey: {
-                challenge: buffer_1.Buffer.from(challenge.challenge),
-                pubKeyCredParams: challenge.pubKeyCredParams,
-                rp: this.conf.relyingParty,
-                user: {
-                    displayName: challenge.user.displayName,
-                    id: buffer_1.Buffer.from(challenge.user.id),
-                    name: challenge.user.name,
+        try {
+            const options = {
+                publicKey: {
+                    challenge: buffer_1.Buffer.from(challenge.challenge),
+                    pubKeyCredParams: challenge.pubKeyCredParams,
+                    rp: this.conf.relyingParty,
+                    user: {
+                        displayName: challenge.user.displayName,
+                        id: buffer_1.Buffer.from(challenge.user.id),
+                        name: challenge.user.name,
+                    },
+                    attestation: challenge.attestation,
+                    excludeCredentials: challenge.excludeCredentials.map(({ id, type }) => ({
+                        id: (0, utils_1.fromBase64Url)(id),
+                        type,
+                    })),
+                    authenticatorSelection: challenge.authenticatorSelection,
+                    timeout: this.conf.timeout ?? exports.DEFAULT_WAIT_TIMEOUT,
+                },
+                signal: this._signal,
+            };
+            const response = await navigator.credentials.create(options);
+            if (response === null) {
+                throw new sdk_1.DfnsError(-1, `Failed to create and sign with WebAuthn credential`);
+            }
+            const credential = response;
+            const attestation = credential.response;
+            return {
+                credentialKind: 'Fido2',
+                credentialInfo: {
+                    credId: credential.id,
+                    attestationData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(attestation.attestationObject)),
+                    clientData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(attestation.clientDataJSON)),
                 },
-                attestation: challenge.attestation,
-                excludeCredentials: challenge.excludeCredentials.map(({ id, type }) => ({
-                    id: (0, utils_1.fromBase64Url)(id),
-                    type,
-                })),
-                authenticatorSelection: challenge.authenticatorSelection,
-                timeout: this.conf.timeout ?? exports.DEFAULT_WAIT_TIMEOUT,
-            },
-        };
-        const response = await navigator.credentials.create(options);
-        if (response === null) {
-            throw new sdk_1.DfnsError(-1, `Failed to create and sign with WebAuthn credential`);
+            };
+        }
+        finally {
+            this._signal = undefined;
         }
-        const credential = response;
-        const attestation = credential.response;
-        return {
-            credentialKind: 'Fido2',
-            credentialInfo: {
-                credId: credential.id,
-                attestationData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(attestation.attestationObject)),
-                clientData: (0, utils_1.toBase64Url)(buffer_1.Buffer.from(attestation.clientDataJSON)),
-            },
-        };
     }
 }
 exports.WebAuthnSigner = WebAuthnSigner;