fixed unit test errors

Author: dependabot[bot]

etc/firebase-admin.auth.api.md

@@ -367,11 +367,11 @@ export class PasskeyConfig {
 export class PasskeyConfigManager {
     constructor(app: App);
     // (undocumented)
-    createPasskeyConfig(rpId: string, passkeyConfigRequest: PasskeyConfigRequest, tenantId?: string): Promise<PasskeyConfigRequest>;
+    createPasskeyConfig(rpId: string, passkeyConfigRequest: PasskeyConfigRequest, tenantId?: string): Promise<PasskeyConfig>;
     // (undocumented)
     getPasskeyConfig(tenantId?: string): Promise<PasskeyConfig>;
     // (undocumented)
-    updatePasskeyConfig(passkeyConfigRequest: PasskeyConfigRequest, tenantId?: string): Promise<PasskeyConfigRequest>;
+    updatePasskeyConfig(passkeyConfigRequest: PasskeyConfigRequest, tenantId?: string): Promise<PasskeyConfig>;
 }
 
 // @public (undocumented)

package-lock.json

@@ -17,7 +17,7 @@ import { App } from '../app';
 import {
   AuthRequestHandler,
 } from './auth-api-request';
-import {PasskeyConfig, PasskeyConfigClientRequest, PasskeyConfigRequest, PasskeyConfigServerResponse} from './passkey-config';
+import { PasskeyConfig, PasskeyConfigClientRequest, PasskeyConfigRequest, PasskeyConfigServerResponse } from './passkey-config';
 
 
 export class PasskeyConfigManager {
@@ -28,7 +28,7 @@ export class PasskeyConfigManager {
   }
 
   public getPasskeyConfig(tenantId?: string): Promise<PasskeyConfig> {
-    return this.authRequestHandler.getPasskeyConfig()
+    return this.authRequestHandler.getPasskeyConfig(tenantId)
       .then((response: PasskeyConfigServerResponse) => {
         return new PasskeyConfig(response);
       });
@@ -38,13 +38,13 @@ export class PasskeyConfigManager {
     return this.authRequestHandler.updatePasskeyConfig(true, tenantId, passkeyConfigRequest, rpId)
       .then((response: PasskeyConfigClientRequest) => {
         return new PasskeyConfig(response);
-      })
+      });
   }
 
   public updatePasskeyConfig(passkeyConfigRequest: PasskeyConfigRequest, tenantId?: string): Promise<PasskeyConfig> {
     return this.authRequestHandler.updatePasskeyConfig(false, tenantId, passkeyConfigRequest)
       .then((response: PasskeyConfigClientRequest) => {
         return new PasskeyConfig(response);
-      })
+      });
   }
 }

src/auth/passkey-config-manager.ts

@@ -69,20 +69,20 @@ export class PasskeyConfig {
           );
         }
       }
-    if(!validator.isNonEmptyArray(passkeyConfigRequest.expectedOrigins) || !validator.isNonNullObject(passkeyConfigRequest.expectedOrigins)) {
+    if(!validator.isNonEmptyArray(passkeyConfigRequest.expectedOrigins)) {
         throw new FirebaseAuthError(
             AuthClientErrorCode.INVALID_ARGUMENT,
             `'passkeyConfigRequest.expectedOrigins' must be a valid non-empty array of strings.'`,
           );
     }
-    for(const origin in passkeyConfigRequest.expectedOrigins) {
-        if(!validator.isString(origin)) {
-            throw new FirebaseAuthError(
-                AuthClientErrorCode.INVALID_ARGUMENT,
-                `'passkeyConfigRequest.expectedOrigins' must be a valid non-empty array of strings.'`,
-              );
-        }
-    }
+    for (const origin of passkeyConfigRequest.expectedOrigins) {
+      if (!validator.isNonEmptyString(origin)) {
+        throw new FirebaseAuthError(
+          AuthClientErrorCode.INVALID_ARGUMENT,
+          `'passkeyConfigRequest.expectedOrigins' must be a valid non-empty array of strings.'`,
+        );
+      }
+    }    
   };
 
   public static buildServerRequest(isCreateRequest: boolean, passkeyConfigRequest?: PasskeyConfigRequest, rpId?: string): PasskeyConfigClientRequest {
@@ -91,8 +91,8 @@ export class PasskeyConfig {
     if(isCreateRequest && typeof rpId !== 'undefined') {
         request.rpId = rpId;
     }
-    if(typeof request.expectedOrigins !== 'undefined') {
-        request.expectedOrigins = passkeyConfigRequest?.expectedOrigins;
+    if(typeof passkeyConfigRequest?.expectedOrigins !== 'undefined') {
+        request.expectedOrigins = passkeyConfigRequest.expectedOrigins;
     }
     return request;
   };

src/auth/passkey-config.ts

@@ -36,7 +36,6 @@ import {
 } from '../../lib/auth/index';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
-import {PasskeyConfigRequest} from '../../src/auth';
 
 const chalk = require('chalk'); // eslint-disable-line @typescript-eslint/no-var-requires
 
@@ -2206,15 +2205,10 @@ describe('admin.auth', () => {
       expectedOrigins: ['app1', 'example.com'],
     };
 
-    // Helper function to reset passkey config to the initial state
-    async function resetPasskeyConfig() {
-      const resetRequest = { expectedOrigins: expectedPasskeyConfig.expectedOrigins };
-      await getAuth().passkeyConfigManager().updatePasskeyConfig(resetRequest);
-    }
-  
     // Before each test, reset the passkey config to the initial state
     beforeEach(async () => {
-      await resetPasskeyConfig();
+      const resetRequest = { expectedOrigins: expectedPasskeyConfig.expectedOrigins };
+      await getAuth().passkeyConfigManager().updatePasskeyConfig(resetRequest);
     });
 
     it('createPasskeyConfig() should create passkey config with expected passkeyConfig', async () => {
@@ -2223,7 +2217,7 @@ describe('admin.auth', () => {
 
       const createdPasskeyConfig = await getAuth().passkeyConfigManager().createPasskeyConfig(rpId, createRequest);
       const passkeyConfigObj = createdPasskeyConfig.toJSON();
-  
+
       expect(passkeyConfigObj).to.deep.equal(expectedPasskeyConfig);
     });