update logic set role

meofiscoding · Nov 17, 2023 · 6ac2539 · 6ac2539
1 parent d4a1d62
commit 6ac2539
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/Identity.API/Controllers/AuthController.cs b/Identity.API/Controllers/AuthController.cs
@@ -215,7 +215,7 @@ public async Task<IActionResult> Register([FromBody] RegisterViewModel vm)
         };
 
         var result = await _userManager.CreateAsync(user, vm.Password);
-        //await _userManager.AddToRoleAsync(user, UserRoles.User);
+        await _userManager.AddToRoleAsync(user, UserRoles.User);
 
         if (!result.Succeeded)
         {

diff --git a/Identity.API/Entity/UserRoles.cs b/Identity.API/Entity/UserRoles.cs
@@ -4,6 +4,7 @@ namespace Identity.API.Entity
     public static class UserRoles
     {
         public const string Member = "Member";
+        public const string User = "User";
     }
 }
 
diff --git a/Identity.API/SeedData.cs b/Identity.API/SeedData.cs
@@ -24,10 +24,18 @@ await retryPolicy.ExecuteAsync(async () =>
                     context.Database.Migrate();
 
                     var roleMgr = scope.ServiceProvider.GetRequiredService<RoleManager<IdentityRole>>();
-                    // create roles member if not exists
-                    if (!await roleMgr.RoleExistsAsync(UserRoles.Member))
+                    // for each const string in UserRoles, create a role if it doesn't exist
+                    foreach (var role in (List<string>)typeof(UserRoles).GetFields().Select(x => x.GetValue(null).ToString()).ToList())
                     {
-                        await roleMgr.CreateAsync(new IdentityRole(UserRoles.Member));
+                        var roleExist = await roleMgr.RoleExistsAsync(role);
+                        if (!roleExist)
+                        {
+                            var result = await roleMgr.CreateAsync(new IdentityRole(role));
+                            if (!result.Succeeded)
+                            {
+                                throw new Exception(result.Errors.First().Description);
+                            }
+                        }
                     }
 
                     var userMgr = scope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();

diff --git a/Identity.API/Service/UserService.cs b/Identity.API/Service/UserService.cs
@@ -27,8 +27,27 @@ public override async Task<PaymentResponse> UpdateUserMembership(PaymentRequest
                 };
             }
 
-            var result = request.Success ? await _userManager.AddToRoleAsync(user, "PayingUser") : await _userManager.RemoveFromRoleAsync(user, "PayingUser");
-
+            var result = new IdentityResult();
+            if (request.Success)
+            {
+                // if user have role user, then add role user
+                var oldRole = await _userManager.GetRolesAsync(user);
+                if (oldRole.Contains(UserRoles.User))
+                {
+                    await _userManager.RemoveFromRoleAsync(user, UserRoles.User);
+                }
+                result = await _userManager.AddToRoleAsync(user, UserRoles.Member);
+            }
+            else
+            {
+                // if have role member, then remove role member 
+                var oldRole = await _userManager.GetRolesAsync(user);
+                if (oldRole.Contains(UserRoles.Member))
+                {
+                    await _userManager.RemoveFromRoleAsync(user, UserRoles.Member);
+                }
+                result = await _userManager.AddToRoleAsync(user, UserRoles.User);
+            }
             return new PaymentResponse
             {
                 Success = result.Succeeded,