Merge pull request #25557 from abpframework/maliming/fix-edit-modal-soft-deleted-creator

Fix user edit modal failing when creator or modifier is soft-deleted

Author: EngincanV

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs

@@ -22,4 +22,6 @@ public interface IIdentityUserAppService
     Task<IdentityUserDto> FindByUsernameAsync(string userName);
 
     Task<IdentityUserDto> FindByEmailAsync(string email);
+
+    Task<IdentityUserDto> FindByIdAsync(Guid id);
 }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs

@@ -180,6 +180,14 @@ await UserManager.FindByEmailAsync(email)
         );
     }
 
+    [Authorize(IdentityPermissions.Users.Default)]
+    public virtual async Task<IdentityUserDto> FindByIdAsync(Guid id)
+    {
+        return ObjectMapper.Map<IdentityUser, IdentityUserDto>(
+            await UserManager.FindByIdAsync(id.ToString())
+        );
+    }
+
     protected virtual async Task UpdateUserByInput(IdentityUser user, IdentityUserCreateOrUpdateDtoBase input)
     {
         if (!string.Equals(user.Email, input.Email, StringComparison.InvariantCultureIgnoreCase))

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/ClientProxies/Volo/Abp/Identity/IdentityUserClientProxy.Generated.cs

@@ -58,6 +58,14 @@ public virtual async Task DeleteAsync(Guid id)
         });
     }
 
+    public virtual async Task<IdentityUserDto> FindByIdAsync(Guid id)
+    {
+        return await RequestAsync<IdentityUserDto>(nameof(FindByIdAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(Guid), id }
+        });
+    }
+
     public virtual async Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)
     {
         return await RequestAsync<ListResultDto<IdentityRoleDto>>(nameof(GetRolesAsync), new ClientProxyRequestTypeValue

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/ClientProxies/identity-generate-proxy.json

@@ -487,6 +487,23 @@
                     "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
                   }
                 },
+                {
+                  "name": "FindByIdAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "id",
+                      "typeAsString": "System.Guid, System.Private.CoreLib",
+                      "type": "System.Guid",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.Abp.Identity.IdentityUserDto",
+                    "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+                  }
+                },
                 {
                   "name": "GetAsync",
                   "parametersOnMethod": [
@@ -1019,6 +1036,43 @@
               },
               "allowAnonymous": null,
               "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService"
+            },
+            "FindByIdAsyncById": {
+              "uniqueName": "FindByIdAsyncById",
+              "name": "FindByIdAsync",
+              "httpMethod": "GET",
+              "url": "api/identity/users/by-id/{id}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "id",
+                  "typeAsString": "System.Guid, System.Private.CoreLib",
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "id",
+                  "name": "id",
+                  "jsonName": null,
+                  "type": "System.Guid",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Identity.IdentityUserDto",
+                "typeSimple": "Volo.Abp.Identity.IdentityUserDto"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Abp.Identity.IIdentityUserAppService"
             }
           }
         },

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserController.cs

@@ -53,6 +53,13 @@ public virtual Task DeleteAsync(Guid id)
         return UserAppService.DeleteAsync(id);
     }
 
+    [HttpGet]
+    [Route("by-id/{id}")]
+    public virtual Task<IdentityUserDto> FindByIdAsync(Guid id)
+    {
+        return UserAppService.FindByIdAsync(id);
+    }
+
     [HttpGet]
     [Route("{id}/roles")]
     public virtual Task<ListResultDto<IdentityRoleDto>> GetRolesAsync(Guid id)

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs

@@ -83,8 +83,8 @@ private async Task<string> GetUserNameOrNullAsync(Guid? userId)
             return null;
         }
 
-        var user = await IdentityUserAppService.GetAsync(userId.Value);
-        return user.UserName;
+        var user = await IdentityUserAppService.FindByIdAsync(userId.Value);
+        return user?.UserName;
     }
 
     public virtual async Task<IActionResult> OnPostAsync()

modules/identity/src/Volo.Abp.Identity.Web/wwwroot/client-proxies/identity-proxy.js

@@ -102,6 +102,13 @@
       }, ajaxParams));
     };
 
+    volo.abp.identity.identityUser.findById = function(id, ajaxParams) {
+      return abp.ajax($.extend(true, {
+        url: abp.appPath + 'api/identity/users/by-id/' + id + '',
+        type: 'GET'
+      }, ajaxParams));
+    };
+
     volo.abp.identity.identityUser.getRoles = function(id, ajaxParams) {
       return abp.ajax($.extend(true, {
         url: abp.appPath + 'api/identity/users/' + id + '/roles',

modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs

@@ -51,6 +51,37 @@ public async Task GetAsync()
         result.PhoneNumber.ShouldBe(johnNash.PhoneNumber);
     }
 
+    [Fact]
+    public async Task FindByIdAsync_Should_Return_User_When_Exists()
+    {
+        var johnNash = GetUser("john.nash");
+
+        var result = await _userAppService.FindByIdAsync(johnNash.Id);
+
+        result.ShouldNotBeNull();
+        result.Id.ShouldBe(johnNash.Id);
+        result.UserName.ShouldBe(johnNash.UserName);
+    }
+
+    [Fact]
+    public async Task FindByIdAsync_Should_Return_Null_When_User_Does_Not_Exist()
+    {
+        var result = await _userAppService.FindByIdAsync(Guid.NewGuid());
+
+        result.ShouldBeNull();
+    }
+
+    [Fact]
+    public async Task FindByIdAsync_Should_Return_Null_When_User_Is_Soft_Deleted()
+    {
+        var johnNash = GetUser("john.nash");
+        await _userAppService.DeleteAsync(johnNash.Id);
+
+        var result = await _userAppService.FindByIdAsync(johnNash.Id);
+
+        result.ShouldBeNull();
+    }
+
     [Fact]
     public async Task GetListAsync()
     {