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

Extract isNewSsoUser to own method, invert logic

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-16 11:52:27 +10:00
parent c43bd0e144
commit 30ccb330c6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,6 +400,10 @@ export class AuthService implements AuthServiceAbstraction {
} }
} }
private isNewSsoUser(code: string, key: string) {
return code == null || key != null
}
private async logInHelper(email: string, hashedPassword: string, localHashedPassword: string, code: string, private async logInHelper(email: string, hashedPassword: string, localHashedPassword: string, code: string,
codeVerifier: string, redirectUrl: string, clientId: string, clientSecret: string, key: SymmetricCryptoKey, codeVerifier: string, redirectUrl: string, clientId: string, clientSecret: string, key: SymmetricCryptoKey,
twoFactorProvider?: TwoFactorProviderType, twoFactorToken?: string, remember?: boolean, captchaToken?: string, twoFactorProvider?: TwoFactorProviderType, twoFactorToken?: string, remember?: boolean, captchaToken?: string,
@@ -446,8 +450,7 @@ export class AuthService implements AuthServiceAbstraction {
} }
// Skip this step during SSO new user flow. No key is returned from server. // Skip this step during SSO new user flow. No key is returned from server.
if (code == null || tokenResponse.key != null) { if (!this.isNewSsoUser(code, tokenResponse.key)) {
if (tokenResponse.keyConnectorUrl != null) { if (tokenResponse.keyConnectorUrl != null) {
await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl); await this.keyConnectorService.getAndSetKey(tokenResponse.keyConnectorUrl);
} else if (tokenResponse.apiUseKeyConnector) { } else if (tokenResponse.apiUseKeyConnector) {