Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PM-2759 - Fix broken backwards compatibility for authResult.resetMast… #5940

Merged
merged 2 commits into from
Aug 2, 2023
Merged

PM-2759 - Fix broken backwards compatibility for authResult.resetMast… #5940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09eb884
PM-2759 - Fix broken backwards compatibility for authResult.resetMast…
JaredSnider-Bitwarden Aug 2, 2023
1a2222e
PM-2759 - Update TODO with specific tech debt task + target release date
JaredSnider-Bitwarden Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/angular/src/auth/components/sso.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export class SsoComponent {
!acctDecryptionOpts.hasMasterPassword &&
acctDecryptionOpts.keyConnectorOption === undefined;

if (requireSetPassword) {
if (requireSetPassword || authResult.resetMasterPassword) {
// Change implies going no password -> password in this case
return await this.handleChangePasswordRequired(orgIdentifier);
}
Expand Down
2 changes: 1 addition & 1 deletion libs/angular/src/auth/components/two-factor.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
const requireSetPassword =
!acctDecryptionOpts.hasMasterPassword && acctDecryptionOpts.keyConnectorOption === undefined;

if (requireSetPassword) {
if (requireSetPassword || authResult.resetMasterPassword) {
// Change implies going no password -> password in this case
return await this.handleChangePasswordRequired(this.orgIdentifier);
}
Expand Down
1 change: 1 addition & 0 deletions libs/common/src/auth/models/domain/auth-result.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { ForceResetPasswordReason } from "./force-reset-password-reason";

export class AuthResult {
captchaSiteKey = "";
// TODO: PM-3287 - Remove this after 3 releases of backwards compatibility. - Target release 2023.12 for removal
/**
* @deprecated
* Replace with using AccountDecryptionOptions to determine if the user does
Expand Down
Loading