Upstream
/
bitwarden-desktop
mirror of https://github.com/bitwarden/desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hide change password when using key connector (#1153)

This commit is contained in:
Oscar Hinton 2021-11-11 23:41:08 +01:00 committed by GitHub
parent 9124314ef9
commit fa98ef37ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/app.component.ts
View File

@ -338,7 +338,7 @@ export class AppComponent implements OnInit {
let data: any;
if (type === 'sync') {
data = {
enableChangeMasterPass: !await this.keyConnectorService.getUsesKeyConnector(),
hideChangeMasterPass: await this.keyConnectorService.getUsesKeyConnector(),
};
} else {
data = {

8
src/main/menu.main.ts
View File

@ -75,10 +75,10 @@ export class MenuMain extends BaseMenu {
this.syncVault, this.exportVault, this.settings, this.lockNow, this.twoStepLogin, this.fingerprintPhrase,
this.changeMasterPass, this.premiumMembership, this.passwordGenerator, this.passwordHistory,
this.searchVault, this.copyUsername, this.copyPassword];
this.updateApplicationMenuState(false, true, true);
this.updateApplicationMenuState(false, true, false);
}
updateApplicationMenuState(isAuthenticated: boolean, isLocked: boolean, enableChangeMasterPass: boolean) {
updateApplicationMenuState(isAuthenticated: boolean, isLocked: boolean, hideChangeMasterPass: boolean) {
if (isAuthenticated != null && isLocked != null) {
this.unlockedRequiredMenuItems.forEach((mi: MenuItem) => {
if (mi != null) {
@ -91,8 +91,8 @@ export class MenuMain extends BaseMenu {
}
}
if (enableChangeMasterPass != null && this.changeMasterPass != null) {
this.changeMasterPass.enabled = enableChangeMasterPass;
if (this.changeMasterPass != null) {
this.changeMasterPass.visible = !(hideChangeMasterPass ?? false);
}
if (this.menu != null) {

2
src/main/messaging.main.ts
View File

@ -33,7 +33,7 @@ export class MessagingMain {
break;
case 'updateAppMenu':
this.main.menuMain.updateApplicationMenuState(message.isAuthenticated, message.isLocked,
message.enableChangeMasterPass);
message.hideChangeMasterPass);
this.updateTrayMenu(message.isAuthenticated, message.isLocked);
break;
case 'minimizeOnCopy':