From e3a25a9d955e912fafd4b6bf0e4c03172100f375 Mon Sep 17 00:00:00 2001 From: Lisa Jian Date: Mon, 11 Oct 2021 17:49:49 -0700 Subject: [PATCH 1/2] Remove request body for deleteTenant (#1452) --- src/auth/auth-api-request.ts | 10 ++++++---- test/unit/auth/auth-api-request.spec.ts | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/auth/auth-api-request.ts b/src/auth/auth-api-request.ts index 7ea6916a42..b097cd4ac2 100644 --- a/src/auth/auth-api-request.ts +++ b/src/auth/auth-api-request.ts @@ -1887,12 +1887,14 @@ export abstract class AbstractAuthRequestHandler { */ protected invokeRequestHandler( urlBuilder: AuthResourceUrlBuilder, apiSettings: ApiSettings, - requestData: object, additionalResourceParams?: object): Promise { + requestData: object | undefined, additionalResourceParams?: object): Promise { return urlBuilder.getUrl(apiSettings.getEndpoint(), additionalResourceParams) .then((url) => { // Validate request. - const requestValidator = apiSettings.getRequestValidator(); - requestValidator(requestData); + if (requestData != null) { + const requestValidator = apiSettings.getRequestValidator(); + requestValidator(requestData); + } // Process request. const req: HttpRequestConfig = { method: apiSettings.getHttpMethod(), @@ -2120,7 +2122,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, {}, { tenantId }) + return this.invokeRequestHandler(this.tenantMgmtResourceBuilder, DELETE_TENANT, undefined, { 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 75000300e7..a980d7cf17 100644 --- a/test/unit/auth/auth-api-request.spec.ts +++ b/test/unit/auth/auth-api-request.spec.ts @@ -4547,7 +4547,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, {})); + expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, undefined)); }); }); @@ -4582,7 +4582,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, {})); + expect(stub).to.have.been.calledOnce.and.calledWith(callParams(path, method, undefined)); }); }); }); From 51d97c8895ad1996ba1c95648976a8efcf7e5131 Mon Sep 17 00:00:00 2001 From: Lisa Jian Date: Wed, 13 Oct 2021 17:54:37 -0700 Subject: [PATCH 2/2] Remove nullish check and replace with truthy check --- src/auth/auth-api-request.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/auth/auth-api-request.ts b/src/auth/auth-api-request.ts index b097cd4ac2..13018337da 100644 --- a/src/auth/auth-api-request.ts +++ b/src/auth/auth-api-request.ts @@ -1891,7 +1891,7 @@ export abstract class AbstractAuthRequestHandler { return urlBuilder.getUrl(apiSettings.getEndpoint(), additionalResourceParams) .then((url) => { // Validate request. - if (requestData != null) { + if (requestData) { const requestValidator = apiSettings.getRequestValidator(); requestValidator(requestData); }