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

Simplify various syntax

Browse Source
This commit is contained in:
Thomas Rittson
2021-12-20 15:16:56 +10:00
parent 82cf44cd85
commit da2c73ff67
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,14 +267,7 @@ export class AuthService implements AuthServiceAbstraction {
if (this.setCryptoKeys && !newSsoUser) { if (this.setCryptoKeys && !newSsoUser) {
await this.cryptoService.setEncKey(tokenResponse.key); await this.cryptoService.setEncKey(tokenResponse.key);
await this.cryptoService.setEncPrivateKey(tokenResponse.privateKey ?? await this.createKeyPairForOldAccount());
// User doesn't have a key pair yet (old account), let's generate one for them
if (tokenResponse.privateKey == null) {
const newKeyPair = await this.createKeyPair();
await this.cryptoService.setEncPrivateKey(newKeyPair);
} else {
await this.cryptoService.setEncPrivateKey(tokenResponse.privateKey);
}
} }
await onSuccess(); await onSuccess();
@@ -290,25 +283,26 @@ export class AuthService implements AuthServiceAbstraction {
return new DeviceRequest(appId, this.platformUtilsService); return new DeviceRequest(appId, this.platformUtilsService);
} }
private async createTwoFactorData(twoFactor: TwoFactorData) { private async createTwoFactorData(userProvidedTwoFactor: TwoFactorData) {
if (twoFactor == null) { if (userProvidedTwoFactor != null) {
return userProvidedTwoFactor;
}
const storedTwoFactorToken = await this.tokenService.getTwoFactorToken(); const storedTwoFactorToken = await this.tokenService.getTwoFactorToken();
if (storedTwoFactorToken != null) { if (storedTwoFactorToken != null) {
twoFactor = { return {
token: storedTwoFactorToken, token: storedTwoFactorToken,
provider: TwoFactorProviderType.Remember, provider: TwoFactorProviderType.Remember,
remember: false, remember: false,
}; };
} else { }
twoFactor = {
return {
token: null, token: null,
provider: null, provider: null,
remember: false, remember: false,
}; };
} }
}
return twoFactor;
}
private async saveAccountInformation(tokenResponse: IdentityTokenResponse) { private async saveAccountInformation(tokenResponse: IdentityTokenResponse) {
const accountInformation = await this.tokenService.decodeToken(tokenResponse.accessToken); const accountInformation = await this.tokenService.decodeToken(tokenResponse.accessToken);
@@ -333,7 +327,7 @@ export class AuthService implements AuthServiceAbstraction {
}); });
} }
private async createKeyPair() { private async createKeyPairForOldAccount() {
try { try {
const keyPair = await this.cryptoService.makeKeyPair(); const keyPair = await this.cryptoService.makeKeyPair();
await this.apiService.postAccountKeys( await this.apiService.postAccountKeys(