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

More descriptive arg names for processTokenResponse

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-20 11:51:52 +10:00
parent 358ba67e82
commit 1b33dbff32
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ export class AuthService implements AuthServiceAbstraction {
const response = await this.apiService.postIdentityToken(tokenRequest); const response = await this.apiService.postIdentityToken(tokenRequest);
const result = await this.processTokenResponse(response, null); const result = await this.processTokenResponse(response);
if (!!result.captchaSiteKey) { if (!!result.captchaSiteKey) {
return result; return result;
@@ -132,8 +132,10 @@ export class AuthService implements AuthServiceAbstraction {
} }
const response = await this.apiService.postIdentityToken(tokenRequest); const response = await this.apiService.postIdentityToken(tokenRequest);
const tokenResponse = response as IdentityTokenResponse;
const result = await this.processTokenResponse(response, code); const newSsoUser = tokenResponse.key == null;
const result = await this.processTokenResponse(response, newSsoUser);
if (!!result.captchaSiteKey) { if (!!result.captchaSiteKey) {
return result; return result;
@@ -144,9 +146,8 @@ export class AuthService implements AuthServiceAbstraction {
return result; return result;
} }
const tokenResponse = response as IdentityTokenResponse;
if (this.setCryptoKeys && tokenResponse.keyConnectorUrl != null) { if (this.setCryptoKeys && tokenResponse.keyConnectorUrl != null) {
if (tokenResponse.key != null) { if (!newSsoUser) {
// Existing SSO user that uses Key Connector // Existing SSO user that uses Key Connector
await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl); await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl);
} else { } else {
@@ -186,7 +187,7 @@ export class AuthService implements AuthServiceAbstraction {
const response = await this.apiService.postIdentityToken(tokenRequest); const response = await this.apiService.postIdentityToken(tokenRequest);
const result = await this.processTokenResponse(response, null); const result = await this.processTokenResponse(response);
if (!!result.captchaSiteKey) { if (!!result.captchaSiteKey) {
return result; return result;
@@ -265,7 +266,7 @@ export class AuthService implements AuthServiceAbstraction {
private async processTokenResponse( private async processTokenResponse(
response: IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse, response: IdentityTokenResponse | IdentityTwoFactorResponse | IdentityCaptchaResponse,
code: string, newSsoUser?: boolean,
): Promise<AuthResult> { ): Promise<AuthResult> {
this.clearState(); this.clearState();
const result = new AuthResult(); const result = new AuthResult();
@@ -291,7 +292,7 @@ export class AuthService implements AuthServiceAbstraction {
await this.tokenService.setTwoFactorToken(tokenResponse.twoFactorToken); await this.tokenService.setTwoFactorToken(tokenResponse.twoFactorToken);
} }
if (this.setCryptoKeys && !this.isNewSsoUser(code, tokenResponse.key)) { if (this.setCryptoKeys && !newSsoUser) {
await this.cryptoService.setEncKey(tokenResponse.key); await this.cryptoService.setEncKey(tokenResponse.key);
// User doesn't have a key pair yet (old account), let's generate one for them // User doesn't have a key pair yet (old account), let's generate one for them