From 71b148c0f8e8b96ea5414b047358d9b3d77e2560 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Mon, 20 Dec 2021 14:42:16 +1000
Subject: [PATCH] Assign successCallbacks to named variables

---
 common/src/services/auth.service.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/src/services/auth.service.ts b/common/src/services/auth.service.ts
index 6a30457d..25c56b03 100644
--- a/common/src/services/auth.service.ts
+++ b/common/src/services/auth.service.ts
@@ -88,12 +88,13 @@ export class AuthService implements AuthServiceAbstraction {
 
     const response = await this.apiService.postIdentityToken(tokenRequest);
 
-    const result = await this.processTokenResponse(response, false, async () => {
+    const successCallback = async () => {
       if (this.setCryptoKeys) {
         await this.cryptoService.setKey(key);
         await this.cryptoService.setKeyHash(localHashedPassword);
       }
-    });
+    }
+    const result = await this.processTokenResponse(response, false, successCallback);
 
     if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders, localHashedPassword, key);
@@ -128,7 +129,7 @@ export class AuthService implements AuthServiceAbstraction {
     const tokenResponse = response as IdentityTokenResponse;
 
     const newSsoUser = tokenResponse.key == null;
-    const result = await this.processTokenResponse(response, newSsoUser, async () => {
+    const successCallback = async () => {
       if (this.setCryptoKeys && tokenResponse.keyConnectorUrl != null) {
         if (!newSsoUser) {
           await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl);
@@ -141,7 +142,9 @@ export class AuthService implements AuthServiceAbstraction {
           );
         }
       }
-    });
+    }
+
+    const result = await this.processTokenResponse(response, newSsoUser, successCallback);
 
     if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders);
@@ -171,7 +174,7 @@ export class AuthService implements AuthServiceAbstraction {
 
     const response = await this.apiService.postIdentityToken(tokenRequest);
 
-    const result = await this.processTokenResponse(response, false, async () => {
+    const successCallback = async () => {
       await this.stateService.setApiKeyClientId(clientId);
       await this.stateService.setApiKeyClientSecret(clientSecret);
 
@@ -180,7 +183,9 @@ export class AuthService implements AuthServiceAbstraction {
         const keyConnectorUrl = this.environmentService.getKeyConnectorUrl();
         await this.keyConnectorService.getAndSetKey(keyConnectorUrl);
       }
-    });
+    }
+
+    const result = await this.processTokenResponse(response, false, successCallback);
 
     if (result.requiresTwoFactor) {
       this.saveState(tokenRequest, result.twoFactorProviders);