Skip to content

[PM-19022] Separate Manage Account Recovery and Manage Users custom role #14629

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

Merged
merged 4 commits into from
May 8, 2025
Merged

[PM-19022] Separate Manage Account Recovery and Manage Users custom role #14629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67388be
Add SeparateCustomRolePermissions feature flag
r-tome May 5, 2025
eb62aa4
Allow 'Manage Account Recovery' to be configured separately from 'Man…
r-tome May 5, 2025
b016f17
Merge branch 'main' into ac/pm-19022/separate-account-recovery-and-ma…
r-tome May 7, 2025
1c9d629
Merge branch 'main' into ac/pm-19022/separate-account-recovery-and-ma…
r-tome May 8, 2025
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
8 changes: 7 additions & 1 deletion ...p/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,13 @@
return Object.assign(p, partialPermissions);
}

handleDependentPermissions() {
async handleDependentPermissions() {
const separateCustomRolePermissions = await this.configService.getFeatureFlag(

Check warning on line 460 in apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts#L460 

Added line #L460 was not covered by tests
FeatureFlag.SeparateCustomRolePermissions,
);
if (separateCustomRolePermissions) {
return;

Check warning on line 464 in apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts#L464 

Added line #L464 was not covered by tests
}
// Manage Password Reset (Account Recovery) must have Manage Users enabled
if (
this.permissionsGroup.value.manageResetPassword &&
Expand Down
2 changes: 2 additions & 0 deletions libs/common/src/enums/feature-flag.enum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export enum FeatureFlag {
LimitItemDeletion = "pm-15493-restrict-item-deletion-to-can-manage-permission",
SsoExternalIdVisibility = "pm-18630-sso-external-id-visibility",
AccountDeprovisioningBanner = "pm-17120-account-deprovisioning-admin-console-banner",
SeparateCustomRolePermissions = "pm-19917-separate-custom-role-permissions",

/* Auth */
PM9112_DeviceApprovalPersistence = "pm-9112-device-approval-persistence",
Expand Down Expand Up @@ -83,6 +84,7 @@ export const DefaultFeatureFlagValue = {
[FeatureFlag.LimitItemDeletion]: FALSE,
[FeatureFlag.SsoExternalIdVisibility]: FALSE,
[FeatureFlag.AccountDeprovisioningBanner]: FALSE,
[FeatureFlag.SeparateCustomRolePermissions]: FALSE,

/* Autofill */
[FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,
Expand Down
Loading