bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-15 07:43:45 +00:00
Code Issues Releases Wiki Activity

Improve naming conventions

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-20 15:07:16 +10:00
parent c8eedc5dd6
commit 1b19fa55f1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/services/auth.service.ts
View File

@@ -88,13 +88,13 @@ export class AuthService implements AuthServiceAbstraction {
const response = await this.apiService.postIdentityToken(tokenRequest); const response = await this.apiService.postIdentityToken(tokenRequest);
const successCallback = async () => { const onSuccess = async () => {
if (this.setCryptoKeys) { if (this.setCryptoKeys) {
await this.cryptoService.setKey(key); await this.cryptoService.setKey(key);
await this.cryptoService.setKeyHash(localHashedPassword); await this.cryptoService.setKeyHash(localHashedPassword);
} }
} }
const result = await this.processTokenResponse(response, false, successCallback); const result = await this.processTokenResponse(response, false, onSuccess);
if (result.requiresTwoFactor) { if (result.requiresTwoFactor) {
this.saveState(tokenRequest, result.twoFactorProviders, localHashedPassword, key); this.saveState(tokenRequest, result.twoFactorProviders, localHashedPassword, key);
@@ -124,7 +124,7 @@ export class AuthService implements AuthServiceAbstraction {
const tokenResponse = response as IdentityTokenResponse; const tokenResponse = response as IdentityTokenResponse;
const newSsoUser = tokenResponse.key == null; const newSsoUser = tokenResponse.key == null;
const successCallback = async () => { const onSuccess = async () => {
if (this.setCryptoKeys && tokenResponse.keyConnectorUrl != null) { if (this.setCryptoKeys && tokenResponse.keyConnectorUrl != null) {
if (!newSsoUser) { if (!newSsoUser) {
await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl); await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl);
@@ -139,7 +139,7 @@ export class AuthService implements AuthServiceAbstraction {
} }
} }
const result = await this.processTokenResponse(response, newSsoUser, successCallback); const result = await this.processTokenResponse(response, newSsoUser, onSuccess);
if (result.requiresTwoFactor) { if (result.requiresTwoFactor) {
this.saveState(tokenRequest, result.twoFactorProviders); this.saveState(tokenRequest, result.twoFactorProviders);
@@ -164,7 +164,7 @@ export class AuthService implements AuthServiceAbstraction {
const response = await this.apiService.postIdentityToken(tokenRequest); const response = await this.apiService.postIdentityToken(tokenRequest);
const successCallback = async () => { const onSuccess = async () => {
await this.stateService.setApiKeyClientId(clientId); await this.stateService.setApiKeyClientId(clientId);
await this.stateService.setApiKeyClientSecret(clientSecret); await this.stateService.setApiKeyClientSecret(clientSecret);
@@ -175,7 +175,7 @@ export class AuthService implements AuthServiceAbstraction {
} }
} }
const result = await this.processTokenResponse(response, false, successCallback); const result = await this.processTokenResponse(response, false, onSuccess);
if (result.requiresTwoFactor) { if (result.requiresTwoFactor) {
this.saveState(tokenRequest, result.twoFactorProviders); this.saveState(tokenRequest, result.twoFactorProviders);
@@ -240,7 +240,7 @@ export class AuthService implements AuthServiceAbstraction {
private async processTokenResponse( private async processTokenResponse(
response: IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse, response: IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse,
newSsoUser: boolean = false, newSsoUser: boolean = false,
successCallback: () => any onSuccess: () => void
): Promise<AuthResult> { ): Promise<AuthResult> {
this.clearState(); this.clearState();
const result = new AuthResult(); const result = new AuthResult();
@@ -277,7 +277,7 @@ export class AuthService implements AuthServiceAbstraction {
} }
} }
await successCallback(); await onSuccess();
await this.stateService.setBiometricLocked(false); await this.stateService.setBiometricLocked(false);
this.messagingService.send("loggedIn"); this.messagingService.send("loggedIn");