Skip to content

[PM-35201] Enhance password reset logic in MemberActionsService #20504

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

Open
JaredScar wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −1
Open

[PM-35201] Enhance password reset logic in MemberActionsService #20504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions ...dmin-console/organizations/members/services/member-actions/member-actions.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,33 @@ describe("MemberActionsService", () => {
expect(result).toBe(false);
});

it("should allow reset password when user status is accepted and AdminResetTwoFactor is enabled", () => {
const user = {
...mockOrgUser,
status: OrganizationUserStatusType.Accepted,
} as OrganizationUserView;

const result = service.allowResetPassword(user, mockOrganization, resetPasswordEnabled, true);

expect(result).toBe(true);
});

it("should not allow reset password when user status is accepted and AdminResetTwoFactor is disabled", () => {
const user = {
...mockOrgUser,
status: OrganizationUserStatusType.Accepted,
} as OrganizationUserView;

const result = service.allowResetPassword(
user,
mockOrganization,
resetPasswordEnabled,
false,
);

expect(result).toBe(false);
});

it("should not allow reset password when user status is invited", () => {
const user = {
...mockOrgUser,
Expand Down
3 changes: 2 additions & 1 deletion ...app/admin-console/organizations/members/services/member-actions/member-actions.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ export class MemberActionsService {

const statusAllowed =
orgUser.status === OrganizationUserStatusType.Confirmed ||
(adminResetTwoFactorEnabled && orgUser.status === OrganizationUserStatusType.Revoked);
(adminResetTwoFactorEnabled && orgUser.status === OrganizationUserStatusType.Revoked) ||
(adminResetTwoFactorEnabled && orgUser.status === OrganizationUserStatusType.Accepted);

return (
organization.canManageUsersPassword &&
Expand Down
Loading