Merge pull request #151 from ministryofjustice/hotfix/user-registration

Addresses issues with user registration
ministryofjustice · Aug 20, 2024 · 26f1358 · 26f1358
2 parents dc9be25 + e2f8eb0
commit 26f1358
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Application/Features/Identity/DTOs/ApplicationUserDto.cs b/src/Application/Features/Identity/DTOs/ApplicationUserDto.cs
@@ -78,6 +78,7 @@ public Mapping()
                 .ForMember(x => x.SuperiorName, s => s.MapFrom(y => y.Superior!.UserName))
                 .ForMember(x => x.TenantName, s => s.MapFrom(y => y.Tenant!.Name))
                 .ForMember(x => x.AssignedRoles, s => s.MapFrom(y => y.UserRoles.Select(r => r.Role.Name)))
+                .ForMember(x => x.PhoneNumber, s => s.MapFrom(x => x.PhoneNumber))
             .ReverseMap()
                 .ForMember(x => x.UserName, s => s.MapFrom(y => y.Email))
                 .ForMember(x => x.Notes, s => s.Ignore())

diff --git a/src/Server.UI/Pages/Identity/Users/Users.razor b/src/Server.UI/Pages/Identity/Users/Users.razor
@@ -389,8 +389,8 @@
         policies ??= new()
         {
             { SecurityPolicies.SystemFunctionsWrite, (await AuthService.AuthorizeAsync(state.User, SecurityPolicies.SystemFunctionsWrite)).Succeeded },
-            { SecurityPolicies.Import, (await AuthService.AuthorizeAsync(state.User, SecurityPolicies.Import)).Succeeded },
-            { SecurityPolicies.Export, (await AuthService.AuthorizeAsync(state.User, SecurityPolicies.Export)).Succeeded }
+            { SecurityPolicies.Import, false /*(await AuthService.AuthorizeAsync(state.User, SecurityPolicies.Import)).Succeeded */ },
+            { SecurityPolicies.Export, false /* (await AuthService.AuthorizeAsync(state.User, SecurityPolicies.Export)).Succeeded */ }
         };
 
         _canCreate = policies.GetValueOrDefault(SecurityPolicies.SystemFunctionsWrite);
@@ -533,6 +533,8 @@
         var applicationUser = Mapper.Map<ApplicationUser>(model);
         applicationUser.EmailConfirmed = true;
         applicationUser.IsActive = true;
+        applicationUser.TwoFactorEnabled = true;
+        applicationUser.PhoneNumberConfirmed = string.IsNullOrWhiteSpace(applicationUser.PhoneNumber) == false;
 
         var identityResult = await UserManager.CreateAsync(applicationUser);
         if (!identityResult.Succeeded)
@@ -556,6 +558,8 @@
 
         Mapper.Map(model, user);
 
+        user.PhoneNumberConfirmed = string.IsNullOrWhiteSpace(user.PhoneNumber) == false;
+
         var identityResult = await UserManager.UpdateAsync(user);
         if (identityResult.Succeeded)
         {