bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

option to not set crypto keys

Browse Source
This commit is contained in:
Kyle Spearrin
2018-04-25 12:42:52 -04:00
parent 05e6d2c0f0
commit 6e6dc422ac
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/services/auth.service.ts
View File

@@ -65,10 +65,11 @@ export class AuthService {
private key: SymmetricCryptoKey; private key: SymmetricCryptoKey;
constructor(private cryptoService: CryptoService, private apiService: ApiService, private userService: UserService, constructor(private cryptoService: CryptoService, private apiService: ApiService,
private tokenService: TokenService, private appIdService: AppIdService, private i18nService: I18nService, private userService: UserService, private tokenService: TokenService,
private platformUtilsService: PlatformUtilsService, private messagingService: MessagingService) { private appIdService: AppIdService, private i18nService: I18nService,
} private platformUtilsService: PlatformUtilsService, private messagingService: MessagingService,
private setCryptoKeys = true) { }
init() { init() {
TwoFactorProviders[TwoFactorProviderType.Email].name = this.i18nService.t('emailTitle'); TwoFactorProviders[TwoFactorProviderType.Email].name = this.i18nService.t('emailTitle');
@@ -166,7 +167,7 @@ export class AuthService {
const twoFactorResponse = response as IdentityTwoFactorResponse; const twoFactorResponse = response as IdentityTwoFactorResponse;
this.email = email; this.email = email;
this.masterPasswordHash = hashedPassword; this.masterPasswordHash = hashedPassword;
this.key = key; this.key = this.setCryptoKeys ? key : null;
this.twoFactorProviders = twoFactorResponse.twoFactorProviders2; this.twoFactorProviders = twoFactorResponse.twoFactorProviders2;
result.twoFactorProviders = twoFactorResponse.twoFactorProviders2; result.twoFactorProviders = twoFactorResponse.twoFactorProviders2;
return result; return result;
@@ -178,11 +179,13 @@ export class AuthService {
} }
await this.tokenService.setTokens(tokenResponse.accessToken, tokenResponse.refreshToken); await this.tokenService.setTokens(tokenResponse.accessToken, tokenResponse.refreshToken);
await this.cryptoService.setKey(key);
await this.cryptoService.setKeyHash(hashedPassword);
await this.userService.setUserIdAndEmail(this.tokenService.getUserId(), this.tokenService.getEmail()); await this.userService.setUserIdAndEmail(this.tokenService.getUserId(), this.tokenService.getEmail());
await this.cryptoService.setEncKey(tokenResponse.key); if (this.setCryptoKeys) {
await this.cryptoService.setEncPrivateKey(tokenResponse.privateKey); await this.cryptoService.setKey(key);
await this.cryptoService.setKeyHash(hashedPassword);
await this.cryptoService.setEncKey(tokenResponse.key);
await this.cryptoService.setEncPrivateKey(tokenResponse.privateKey);
}
this.messagingService.send('loggedIn'); this.messagingService.send('loggedIn');
return result; return result;