Skip to content

[PM-30886] - Remove FF for Restoring Users #7071

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
jrmccannon merged 4 commits into from
Mar 2, 2026
Merged

[PM-30886] - Remove FF for Restoring Users #7071

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
3cadbf4
Cleaning up code around feature flag. removing old implementation. wi…
jrmccannon Feb 24, 2026
a975510
Remove unused feature flag
jrmccannon Feb 24, 2026
1489677
Merge branch 'main' into jmccannon/ac/pm-30886-remove-ff-restore-user…
jrmccannon Mar 2, 2026
582f5e2
Fixing test from merge
jrmccannon Mar 2, 2026
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 src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ public async Task<ListResponseModel<OrganizationUserBulkResponseModel>> PatchBul

[HttpPut("{id}/restore")]
[Authorize<ManageUsersRequirement>]
[Obsolete("This endpoint is deprecated. Use _vNext endpoint instead. This will be removed in a future release.")]
public async Task RestoreAsync(Guid orgId, Guid id)
{
await RestoreOrRevokeUserAsync(orgId, id, (orgUser, userId) => _restoreOrganizationUserCommand.RestoreUserAsync(orgUser, userId, null));
Expand All @@ -702,7 +703,6 @@ public async Task RestoreAsync(Guid orgId, Guid id)

[HttpPut("{id}/restore/vnext")]
[Authorize<ManageUsersRequirement>]
[RequireFeature(FeatureFlagKeys.DefaultUserCollectionRestore)]
public async Task RestoreAsync_vNext(Guid orgId, Guid id, [FromBody] OrganizationUserRestoreRequest request)
{
await RestoreOrRevokeUserAsync(orgId, id, (orgUser, userId) => _restoreOrganizationUserCommand.RestoreUserAsync(orgUser, userId, request.DefaultUserCollectionName));
Expand Down
9 changes: 3 additions & 6 deletions ...e/OrganizationFeatures/OrganizationUsers/RestoreUser/v1/RestoreOrganizationUserCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ private async Task RepositoryRestoreUserAsync(OrganizationUser organizationUser,
&& organization.UseMyItems
&& (await policyRequirementQuery.GetAsync<OrganizationDataOwnershipPolicyRequirement>(organizationUser.UserId.Value)).State == OrganizationDataOwnershipState.Enabled
&& status == OrganizationUserStatusType.Confirmed
&& featureService.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
&& !string.IsNullOrWhiteSpace(defaultCollectionName))
{
await collectionRepository.CreateDefaultCollectionsAsync(organizationUser.OrganizationId,
Expand Down Expand Up @@ -252,11 +251,9 @@ public async Task<List<Tuple<OrganizationUser, string>>> RestoreUsersAsync(Guid
}
}

if (featureService.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore))
{
await CreateDefaultCollectionsForConfirmedUsersAsync(organization, defaultCollectionName,
result.Where(r => r.Item2 == "").Select(x => x.Item1).ToList());
}
await CreateDefaultCollectionsForConfirmedUsersAsync(organization, defaultCollectionName,
result.Where(r => r.Item2 == "").Select(x => x.Item1).ToList());


return result;
}
Expand Down
1 change: 0 additions & 1 deletion src/Core/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ public static class FeatureFlagKeys
public const string CreateDefaultLocation = "pm-19467-create-default-location";
public const string AutomaticConfirmUsers = "pm-19934-auto-confirm-organization-users";
public const string ScimRevokeV2 = "pm-32394-scim-revoke-put-v2";
public const string DefaultUserCollectionRestore = "pm-30883-my-items-restored-users";
public const string RefactorMembersComponent = "pm-29503-refactor-members-inheritance";
public const string BulkReinviteUI = "pm-28416-bulk-reinvite-ux-improvements";
public const string UpdateJoinOrganizationEmailTemplate = "pm-28396-update-join-organization-email-template";
Expand Down
52 changes: 0 additions & 52 deletions ...OrganizationFeatures/OrganizationUsers/RestoreUser/RestoreOrganizationUserCommandTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,10 +1188,6 @@ public async Task RestoreUser_WithDataOwnershipPolicyEnabled_AndConfirmedUser_Cr
organizationUser.Email = null; // This causes user to restore to Confirmed status
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

SetupOrganizationDataOwnershipPolicy(
sutProvider,
organizationUser.UserId!.Value,
Expand Down Expand Up @@ -1223,10 +1219,6 @@ public async Task RestoreUser_WithDataOwnershipPolicyDisabled_DoesNotCreateDefau
organizationUser.Email = null; // This causes user to restore to Confirmed status
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

SetupOrganizationDataOwnershipPolicy(
sutProvider,
organizationUser.UserId!.Value,
Expand Down Expand Up @@ -1254,10 +1246,6 @@ public async Task RestoreUser_WithNullDefaultCollectionName_DoesNotCreateDefault
organizationUser.Email = null; // This causes user to restore to Confirmed status
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

SetupOrganizationDataOwnershipPolicy(
sutProvider,
organizationUser.UserId!.Value,
Expand Down Expand Up @@ -1288,10 +1276,6 @@ public async Task RestoreUser_WithEmptyOrWhitespaceDefaultCollectionName_DoesNot
organizationUser.Email = null; // This causes user to restore to Confirmed status
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

SetupOrganizationDataOwnershipPolicy(
sutProvider,
organizationUser.UserId!.Value,
Expand Down Expand Up @@ -1323,10 +1307,6 @@ public async Task RestoreUser_UserRestoredToInvitedStatus_DoesNotCreateDefaultCo
organizationUser.Key = null;
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Act
await sutProvider.Sut.RestoreUserAsync(organizationUser, owner.Id, defaultCollectionName);

Expand All @@ -1351,10 +1331,6 @@ public async Task RestoreUser_WithNoUserId_DoesNotCreateDefaultCollection(
organizationUser.Key = null;
RestoreUser_Setup(organization, owner, organizationUser, sutProvider);

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Act
await sutProvider.Sut.RestoreUserAsync(organizationUser, owner.Id, defaultCollectionName);

Expand Down Expand Up @@ -1382,10 +1358,6 @@ public async Task RestoreUsers_Bulk_WithDataOwnershipPolicy_CreatesCollectionsFo
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
var userService = Substitute.For<IUserService>();

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// orgUser1: Will restore to Confirmed (Email = null)
orgUser1.Email = null;
orgUser1.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1443,10 +1415,6 @@ public async Task RestoreUsers_Bulk_WithMixedPolicyStates_OnlyCreatesForEnabledP
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
var userService = Substitute.For<IUserService>();

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Both users will restore to Confirmed
orgUser1.Email = null;
orgUser1.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1500,10 +1468,6 @@ public async Task RestoreUsers_Bulk_WithNullCollectionName_DoesNotCreateAnyColle
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
var userService = Substitute.For<IUserService>();

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Both users will restore to Confirmed
orgUser1.Email = null;
orgUser1.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1557,10 +1521,6 @@ public async Task RestoreUserAsync_UseMyItemsDisabled_DoesNotCreateCollection(
RestoreUser_Setup(organization, owner, orgUser, sutProvider);
organization.UseMyItems = false;

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// User will restore to Confirmed
orgUser.Email = null;
orgUser.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1590,10 +1550,6 @@ public async Task RestoreUserAsync_UseMyItemsEnabled_CreatesCollection(
RestoreUser_Setup(organization, owner, orgUser, sutProvider);
organization.UseMyItems = true;

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// User will restore to Confirmed
orgUser.Email = null;
orgUser.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1630,10 +1586,6 @@ public async Task RestoreUsersAsync_UseMyItemsDisabled_DoesNotCreateCollections(
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
var userService = Substitute.For<IUserService>();

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Both users will restore to Confirmed
orgUser1.Email = null;
orgUser1.OrganizationId = organization.Id;
Expand Down Expand Up @@ -1687,10 +1639,6 @@ public async Task RestoreUsersAsync_UseMyItemsEnabled_CreatesCollections(
var organizationUserRepository = sutProvider.GetDependency<IOrganizationUserRepository>();
var userService = Substitute.For<IUserService>();

sutProvider.GetDependency<IFeatureService>()
.IsEnabled(FeatureFlagKeys.DefaultUserCollectionRestore)
.Returns(true);

// Both users will restore to Confirmed
orgUser1.Email = null;
orgUser1.OrganizationId = organization.Id;
Expand Down
Loading