Make origin accept a function.

alexanderson1993 · Oct 6, 2023 · c71dc75 · c71dc75
1 parent 5dfb341
commit c71dc75
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-auth-webauthn",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "author": "Alex Anderson",

diff --git a/src/handleFormSubmit.tsx b/src/handleFormSubmit.tsx
@@ -42,7 +42,7 @@ export function handleFormSubmit(
     }
 
     const target = event.currentTarget;
-    type = event.nativeEvent.submitter.value || target.type.value || type;
+    type = event?.nativeEvent?.submitter?.value || target.type?.value || type;
     event.preventDefault();
 
     const responseValue =

diff --git a/src/strategy.ts b/src/strategy.ts
@@ -124,7 +124,10 @@ export class WebAuthnStrategy<User> extends Strategy<
 
   rpName: string | ((request: Request) => Promise<string> | string);
   rpID: string | ((request: Request) => Promise<string> | string);
-  origin: string | string[];
+  origin:
+    | string
+    | string[]
+    | ((request: Request) => Promise<string | string[]> | string | string[]);
   getUserAuthenticators: (
     user: User | null
   ) => Promise<WebAuthnAuthenticator[]> | WebAuthnAuthenticator[];
@@ -177,6 +180,11 @@ export class WebAuthnStrategy<User> extends Strategy<
             : this.rpID,
       };
 
+      const origin =
+        typeof this.origin === "function"
+          ? await this.origin(request)
+          : this.origin;
+
       if (request.method === "GET") {
         let authenticators: WebAuthnAuthenticator[] = [];
         let userDetails: UserDetails | null = null;
@@ -252,7 +260,7 @@ export class WebAuthnStrategy<User> extends Strategy<
         const verification = await verifyRegistrationResponse({
           response: data as RegistrationResponseJSON,
           expectedChallenge,
-          expectedOrigin: this.origin,
+          expectedOrigin: origin,
           expectedRPID: rp.id,
         });
 
@@ -293,7 +301,7 @@ export class WebAuthnStrategy<User> extends Strategy<
         const verification = await verifyAuthenticationResponse({
           response: authenticationData,
           expectedChallenge,
-          expectedOrigin: this.origin,
+          expectedOrigin: origin,
           expectedRPID: rp.id,
           authenticator: {
             ...authenticator,