diff --git a/src/auth/auth-api-request.ts b/src/auth/auth-api-request.ts index 23d028c939..e7f429f811 100644 --- a/src/auth/auth-api-request.ts +++ b/src/auth/auth-api-request.ts @@ -1827,14 +1827,12 @@ export abstract class AbstractAuthRequestHandler { */ protected invokeRequestHandler( urlBuilder: AuthResourceUrlBuilder, apiSettings: ApiSettings, - requestData: object | undefined, additionalResourceParams?: object): Promise { + requestData: object, additionalResourceParams?: object): Promise { return urlBuilder.getUrl(apiSettings.getEndpoint(), additionalResourceParams) .then((url) => { // Validate request. - if (requestData != null) { - const requestValidator = apiSettings.getRequestValidator(); - requestValidator(requestData); - } + const requestValidator = apiSettings.getRequestValidator(); + requestValidator(requestData); // Process request. const req: HttpRequestConfig = { method: apiSettings.getHttpMethod(), @@ -2062,7 +2060,7 @@ export class AuthRequestHandler extends AbstractAuthRequestHandler { if (!validator.isNonEmptyString(tenantId)) { return Promise.reject(new FirebaseAuthError(AuthClientErrorCode.INVALID_TENANT_ID)); } - return this.invokeRequestHandler(this.tenantMgmtResourceBuilder, DELETE_TENANT, undefined, { tenantId }) + return this.invokeRequestHandler(this.tenantMgmtResourceBuilder, DELETE_TENANT, {}, { tenantId }) .then(() => { // Return nothing. }); diff --git a/test/unit/auth/auth-api-request.spec.ts b/test/unit/auth/auth-api-request.spec.ts index 0a5b59d406..29ccf6eb4d 100644 --- a/test/unit/auth/auth-api-request.spec.ts +++ b/test/unit/auth/auth-api-request.spec.ts @@ -4554,7 +4554,7 @@ AUTH_REQUEST_HANDLER_TESTS.forEach((handler) => { return requestHandler.deleteTenant(tenantId) .then((result) => { expect(result).to.be.undefined; - expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, undefined)); + expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, {})); }); }); @@ -4589,7 +4589,7 @@ AUTH_REQUEST_HANDLER_TESTS.forEach((handler) => { throw new Error('Unexpected success'); }, (error) => { expect(error).to.deep.include(expectedError); - expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, undefined)); + expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, {})); }); }); });