From bd0fb024c1aa2a442b7482a11f6cb9aa717ddb9c Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Tue, 15 Jun 2021 13:40:34 -0500 Subject: [PATCH 01/10] Always get key from storage to ensure biometric prompt. (#952) * Always get key from storage to ensure biometric prompt. * Update jslib * Update jslib --- jslib | 2 +- src/app/services.module.ts | 5 +++-- src/services/nativeMessaging.service.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index 5ba14166..1f83c3c1 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5ba1416679f112e42e4b5dbd5c47949dcd8d0b56 +Subproject commit 1f83c3c1ba14d2cdbc319ac060a08cc7c0911b5c diff --git a/src/app/services.module.ts b/src/app/services.module.ts index 0aa8d0de..bda73795 100644 --- a/src/app/services.module.ts +++ b/src/app/services.module.ts @@ -29,7 +29,6 @@ import { CipherService } from 'jslib-common/services/cipher.service'; import { CollectionService } from 'jslib-common/services/collection.service'; import { ConstantsService } from 'jslib-common/services/constants.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 { EventService } from 'jslib-common/services/event.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 { 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 { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.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 cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window, platformUtilsService); -const cryptoService = new CryptoService(storageService, secureStorageService, cryptoFunctionService, +const cryptoService = new ElectronCryptoService(storageService, secureStorageService, cryptoFunctionService, platformUtilsService, logService); const tokenService = new TokenService(storageService); const appIdService = new AppIdService(storageService); diff --git a/src/services/nativeMessaging.service.ts b/src/services/nativeMessaging.service.ts index b63f5695..117c1be6 100644 --- a/src/services/nativeMessaging.service.ts +++ b/src/services/nativeMessaging.service.ts @@ -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) { this.send({ command: 'biometricUnlock', response: 'unlocked', keyB64: keyB64 }, appId); From e0d19232379f0a2f4b8f3c68f100624485bbf220 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Wed, 16 Jun 2021 14:44:17 -0500 Subject: [PATCH 02/10] [Toast] - BUG - Fixed styles (#957) --- src/scss/plugins.scss | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss index 5a240788..ca525cac 100644 --- a/src/scss/plugins.scss +++ b/src/scss/plugins.scss @@ -5,9 +5,10 @@ $fa-font-path: "~font-awesome/fonts"; @import "variables.scss"; -#toast-container { +.toast-container { .toast-close-button { - right: -0.15em; + margin-right: 4px; + font-size: 18px; } .toast { @@ -28,8 +29,11 @@ $fa-font-path: "~font-awesome/fonts"; line-height: 20px; float: left; color: #ffffff; - padding-right: 10px; - margin: auto 0 auto -36px; + margin: auto 0 auto 15px; + } + + .toast-content { + padding: 15px; } .toaster-icon { @@ -55,7 +59,6 @@ $fa-font-path: "~font-awesome/fonts"; &:before { content: "\f0e7"; - margin-left: -30px; } } From 9c4ea9b49192b8235cd848ce2ebee0e48d784a66 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Mon, 21 Jun 2021 20:56:37 +0200 Subject: [PATCH 03/10] Add reprompt help link (#963) --- src/app/vault/add-edit.component.html | 6 +++++- src/app/vault/add-edit.component.ts | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html index 97fbee6e..a1855684 100644 --- a/src/app/vault/add-edit.component.html +++ b/src/app/vault/add-edit.component.html @@ -250,7 +250,11 @@
- +
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts index 6d215ae7..326c1a7c 100644 --- a/src/app/vault/add-edit.component.ts +++ b/src/app/vault/add-edit.component.ts @@ -94,4 +94,8 @@ export class AddEditComponent extends BaseAddEditComponent implements OnChanges, markPasswordAsDirty() { this.form.controls['Login.Password'].markAsDirty(); } + + openHelpReprompt() { + this.platformUtilsService.launchUri('https://bitwarden.com/help/article/managing-items/#protect-individual-items'); + } } From 56a1cfe277011be41f8bfb9260a3aa74010db809 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Mon, 21 Jun 2021 20:26:37 -0400 Subject: [PATCH 04/10] Redefine cipher "share" to "move to organization" (#961) * Redefine cipher "share" to "move to organization" * Update jslib * PR review --- jslib | 2 +- src/app/vault/add-edit.component.html | 4 ++-- src/app/vault/ciphers.component.html | 2 +- src/app/vault/share.component.html | 8 ++++---- src/locales/en/messages.json | 22 ++++++++++++++++------ 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/jslib b/jslib index 1f83c3c1..f568c872 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 1f83c3c1ba14d2cdbc319ac060a08cc7c0911b5c +Subproject commit f568c872898c86b3cf8b5a99f8b5b377cb5b49e7 diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html index a1855684..cd026986 100644 --- a/src/app/vault/add-edit.component.html +++ b/src/app/vault/add-edit.component.html @@ -374,9 +374,9 @@ {{'cancel' | i18n}}
-