Add optionsTransformer

Author: ForgeRockEmma

packages/javascript-sdk/src/fr-webauthn/index.ts

@@ -147,16 +147,17 @@ abstract class FRWebAuthn {
    * Automatically handles conditional UI if indicated by the server metadata.
    *
    * @param step The step that contains WebAuthn authentication data
+   * @param optionsTransformer Augments the derived options with custom behaviour
    * @return The populated step
    */
-  public static async authenticate(step: FRStep): Promise<FRStep> {
+  public static async authenticate(step: FRStep, optionsTransformer: Function = a => a): Promise<FRStep> {
     const { hiddenCallback, metadataCallback, textOutputCallback } = this.getCallbacks(step);
     if (hiddenCallback && (metadataCallback || textOutputCallback)) {
       let outcome: ReturnType<typeof this.getAuthenticationOutcome>;
       let credential: PublicKeyCredential | null = null;
+      const options: CredentialRequestOptions = {};
 
       try {
-        let publicKey: PublicKeyCredentialRequestOptions;
 
         if (metadataCallback) {
           const meta = metadataCallback.getOutputValue('data') as WebAuthnAuthenticationMetadata;
@@ -173,23 +174,18 @@ abstract class FRWebAuthn {
             }
           }
 
-          publicKey = this.createAuthenticationPublicKey(meta);
+          options.publicKey = this.createAuthenticationPublicKey(meta);
+          options.mediation = mediation;
 
-          credential = await this.getAuthenticationCredential({ publicKey, mediation });
-          outcome = this.getAuthenticationOutcome(credential);
         } else if (textOutputCallback) {
           const metadata = this.extractMetadata(textOutputCallback.getMessage());
-
           if (metadata) {
-            publicKey = this.createAuthenticationPublicKey(
+            options.publicKey = this.createAuthenticationPublicKey(
               metadata as WebAuthnAuthenticationMetadata,
             );
           } else {
-            publicKey = parseWebAuthnAuthenticateText(textOutputCallback.getMessage());
+            options.publicKey = parseWebAuthnAuthenticateText(textOutputCallback.getMessage());
           }
-
-          credential = await this.getAuthenticationCredential({ publicKey });
-          outcome = this.getAuthenticationOutcome(credential);
         } else {
           throw new Error('No Credential found from Public Key');
         }
@@ -204,6 +200,9 @@ abstract class FRWebAuthn {
         throw error;
       }
 
+      credential = await this.getAuthenticationCredential(optionsTransformer(options));
+      outcome = this.getAuthenticationOutcome(credential);
+
       if (metadataCallback) {
         const meta = metadataCallback.getOutputValue('data') as WebAuthnAuthenticationMetadata;
         if (meta?.supportsJsonResponse && credential && 'authenticatorAttachment' in credential) {