Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-05 09:10:53 +01:00
Code Issues Projects Releases Wiki Activity

Use explicit import paths (#1084)

Browse Source
This commit is contained in:
Oscar Hinton 2021-09-20 10:41:57 +02:00 committed by GitHub
parent 762c026b6f
commit 0297ea57da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit da132217da553365538bbb66a21c40d3966610c1 Subproject commit ed8d39ed85fee7e00520618f0bb831a87438b610

4
src/app/accounts/lock.component.ts
View File

@ -24,7 +24,7 @@ import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component'; import { LockComponent as BaseLockComponent } from 'jslib-angular/components/lock.component';
import { ElectronConstants } from 'jslib-electron/electronConstants'; import { ConstantsService } from 'jslib-common/services/constants.service';
const BroadcasterSubscriptionId = 'LockComponent'; const BroadcasterSubscriptionId = 'LockComponent';
@ -48,7 +48,7 @@ export class LockComponent extends BaseLockComponent implements OnDestroy {
async ngOnInit() { async ngOnInit() {
await super.ngOnInit(); await super.ngOnInit();
const autoPromptBiometric = !await this.storageService.get<boolean>(ElectronConstants.noAutoPromptBiometrics); const autoPromptBiometric = !await this.storageService.get<boolean>(ConstantsService.disableAutoBiometricsPromptKey);
this.route.queryParams.subscribe(params => { this.route.queryParams.subscribe(params => {
if (this.supportsBiometric && params.promptBiometric && autoPromptBiometric) { if (this.supportsBiometric && params.promptBiometric && autoPromptBiometric) {

8
src/app/accounts/settings.component.ts
View File

@ -172,7 +172,7 @@ export class SettingsComponent implements OnInit {
this.supportsBiometric = await this.platformUtilsService.supportsBiometric(); this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
this.biometric = await this.vaultTimeoutService.isBiometricLockSet(); this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText); this.biometricText = await this.storageService.get<string>(ConstantsService.biometricText);
this.noAutoPromptBiometrics = await this.storageService.get<boolean>(ElectronConstants.noAutoPromptBiometrics); this.noAutoPromptBiometrics = await this.storageService.get<boolean>(ConstantsService.disableAutoBiometricsPromptKey);
this.noAutoPromptBiometricsText = await this.storageService.get<string>(ElectronConstants.noAutoPromptBiometricsText); this.noAutoPromptBiometricsText = await this.storageService.get<string>(ElectronConstants.noAutoPromptBiometricsText);
this.alwaysShowDock = await this.storageService.get<boolean>(ElectronConstants.alwaysShowDock); this.alwaysShowDock = await this.storageService.get<boolean>(ElectronConstants.alwaysShowDock);
this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop; this.showAlwaysShowDock = this.platformUtilsService.getDevice() === DeviceType.MacOsDesktop;
@ -235,7 +235,7 @@ export class SettingsComponent implements OnInit {
await this.storageService.save(ConstantsService.biometricUnlockKey, true); await this.storageService.save(ConstantsService.biometricUnlockKey, true);
} else { } else {
await this.storageService.remove(ConstantsService.biometricUnlockKey); await this.storageService.remove(ConstantsService.biometricUnlockKey);
await this.storageService.remove(ElectronConstants.noAutoPromptBiometrics); await this.storageService.remove(ConstantsService.disableAutoBiometricsPromptKey);
this.noAutoPromptBiometrics = false; this.noAutoPromptBiometrics = false;
} }
this.vaultTimeoutService.biometricLocked = false; this.vaultTimeoutService.biometricLocked = false;
@ -248,9 +248,9 @@ export class SettingsComponent implements OnInit {
} }
if (this.noAutoPromptBiometrics) { if (this.noAutoPromptBiometrics) {
await this.storageService.save(ElectronConstants.noAutoPromptBiometrics, true); await this.storageService.save(ConstantsService.disableAutoBiometricsPromptKey, true);
} else { } else {
await this.storageService.remove(ElectronConstants.noAutoPromptBiometrics); await this.storageService.remove(ConstantsService.disableAutoBiometricsPromptKey);
} }
} }

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

@ -7,10 +7,10 @@ import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { LogService } from 'jslib-common/abstractions/log.service'; import { LogService } from 'jslib-common/abstractions/log.service';
import { MessagingService } from 'jslib-common/abstractions/messaging.service'; import { MessagingService } from 'jslib-common/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
import { StorageService } from 'jslib-common/abstractions/storage.service';
import { UserService } from 'jslib-common/abstractions/user.service'; import { UserService } from 'jslib-common/abstractions/user.service';
import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service'; import { VaultTimeoutService } from 'jslib-common/abstractions/vaultTimeout.service';
import { StorageService } from 'jslib-common/abstractions';
import { Utils } from 'jslib-common/misc/utils'; import { Utils } from 'jslib-common/misc/utils';
import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey';
import { ElectronConstants } from 'jslib-electron/electronConstants'; import { ElectronConstants } from 'jslib-electron/electronConstants';