Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-24 11:55:50 +01:00
Code Issues Projects Releases Wiki Activity

Always get key from storage to ensure biometric prompt. (#952)

Browse Source 
* Always get key from storage to ensure biometric prompt.

* Update jslib

* Update jslib
This commit is contained in:
Matt Gibson 2021-06-15 13:40:34 -05:00 committed by GitHub
parent 3b4142bd0d
commit bd0fb024c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit 5ba1416679f112e42e4b5dbd5c47949dcd8d0b56 Subproject commit 1f83c3c1ba14d2cdbc319ac060a08cc7c0911b5c

5
src/app/services.module.ts
View File

@ -29,7 +29,6 @@ import { CipherService } from 'jslib-common/services/cipher.service';
import { CollectionService } from 'jslib-common/services/collection.service'; import { CollectionService } from 'jslib-common/services/collection.service';
import { ConstantsService } from 'jslib-common/services/constants.service'; import { ConstantsService } from 'jslib-common/services/constants.service';
import { ContainerService } from 'jslib-common/services/container.service'; import { ContainerService } from 'jslib-common/services/container.service';
import { CryptoService } from 'jslib-common/services/crypto.service';
import { EnvironmentService } from 'jslib-common/services/environment.service'; import { EnvironmentService } from 'jslib-common/services/environment.service';
import { EventService } from 'jslib-common/services/event.service'; import { EventService } from 'jslib-common/services/event.service';
import { ExportService } from 'jslib-common/services/export.service'; import { ExportService } from 'jslib-common/services/export.service';
@ -51,6 +50,8 @@ import { UserService } from 'jslib-common/services/user.service';
import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service'; import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service';
import { ElectronCryptoService } from 'jslib-electron/services/electronCrypto.service';
import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service'; import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service';
import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service'; import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service';
import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service'; import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service';
@ -96,7 +97,7 @@ const platformUtilsService = new ElectronPlatformUtilsService(i18nService, messa
const secureStorageService: StorageServiceAbstraction = new ElectronRendererSecureStorageService(); const secureStorageService: StorageServiceAbstraction = new ElectronRendererSecureStorageService();
const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window, const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window,
platformUtilsService); platformUtilsService);
const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService, const cryptoService = new ElectronCryptoService(storageService, secureStorageService, cryptoFunctionService,
platformUtilsService, logService); platformUtilsService, logService);
const tokenService = new TokenService(storageService); const tokenService = new TokenService(storageService);
const appIdService = new AppIdService(storageService); const appIdService = new AppIdService(storageService);

2
src/services/nativeMessaging.service.ts
View File

@ -102,7 +102,7 @@ export class NativeMessagingService {
}); });
} }
const keyB64 = await (await this.cryptoService.getKey('biometric')).keyB64; const keyB64 = await (await this.cryptoService.getKeyFromStorage('biometric')).keyB64;
if (keyB64 != null) { if (keyB64 != null) {
this.send({ command: 'biometricUnlock', response: 'unlocked', keyB64: keyB64 }, appId); this.send({ command: 'biometricUnlock', response: 'unlocked', keyB64: keyB64 }, appId);