bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 01:33:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/bitwarden/browser into feature/hidden-password

Browse Source
This commit is contained in:
Hinton
2020-06-11 20:35:30 +02:00
parent 17c79af830 6e21b26904
commit 954d78a46e
20 changed files with 133 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/background/idle.background.ts
View File

@@ -43,10 +43,10 @@ export default class IdleBackground {
const timeout = await this.storageService.get<number>(ConstantsService.vaultTimeoutKey);
if (timeout === -2) { // On System Lock vault timeout option
const action = await this.storageService.get<string>(ConstantsService.vaultTimeoutActionKey);
if (action === 'lock') {
await this.vaultTimeoutService.lock(true);
} else {
if (action === 'logOut') {
await this.vaultTimeoutService.logOut();
} else {
await this.vaultTimeoutService.lock(true);
}
}
}

19
src/background/main.background.ts
View File

@@ -445,13 +445,15 @@ export default class MainBackground {
title: this.i18nService.t('copyPassword'),
});
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp',
parentId: 'root',
contexts: ['all'],
title: this.i18nService.t('copyVerificationCode'),
});
if (await this.userService.canAccessPremium()) {
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp',
parentId: 'root',
contexts: ['all'],
title: this.i18nService.t('copyVerificationCode'),
});
}
await this.contextMenusCreate({
type: 'separator',
@@ -587,7 +589,8 @@ export default class MainBackground {
});
}
if (cipher == null || (cipher.login.totp && cipher.login.totp !== '')) {
const canAccessPremium = await this.userService.canAccessPremium();
if (canAccessPremium && (cipher == null || (cipher.login.totp && cipher.login.totp !== ''))) {
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp_' + idSuffix,