bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 13:53:34 +00:00
Code Issues Releases Wiki Activity

PM-4588 - Resolve desktop issue where account menu was disabled after a user JIT provisions into a MP encryption org - simply add a menu redraw call after succesfully setting the MP and relevant keys. (#6717)

Browse Source
This commit is contained in:
Jared Snider
2023-11-01 11:14:13 -04:00
committed by GitHub
parent 5c7121d881
commit a1729c97df
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/desktop/src/auth/set-password.component.ts
View File

@@ -13,6 +13,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
import { MasterKey, UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { DialogService } from "@bitwarden/components"; import { DialogService } from "@bitwarden/components";
@@ -83,4 +85,13 @@ export class SetPasswordComponent extends BaseSetPasswordComponent implements On
onWindowHidden() { onWindowHidden() {
this.showPassword = false; this.showPassword = false;
} }
protected async onSetPasswordSuccess(
masterKey: MasterKey,
userKey: [UserKey, EncString],
keyPair: [string, EncString]
): Promise<void> {
await super.onSetPasswordSuccess(masterKey, userKey, keyPair);
this.messagingService.send("redrawMenu");
}
} }

2
libs/angular/src/auth/components/set-password.component.ts
View File

@@ -168,7 +168,7 @@ export class SetPasswordComponent extends BaseChangePasswordComponent {
document.getElementById(confirmField ? "masterPasswordRetype" : "masterPassword").focus(); document.getElementById(confirmField ? "masterPasswordRetype" : "masterPassword").focus();
} }
private async onSetPasswordSuccess( protected async onSetPasswordSuccess(
masterKey: MasterKey, masterKey: MasterKey,
userKey: [UserKey, EncString], userKey: [UserKey, EncString],
keyPair: [string, EncString] keyPair: [string, EncString]