Merge pull request #17737 from abpframework/IdentityUserLookupAppService-obsolete

Replace IdentityUserLookupAppService by an integration service

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

@@ -6,6 +6,7 @@ using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity;
 
+[Obsolete("Use IIdentityUserIntegrationService for module-to-module (or service-to-service) communication.")]
 public interface IIdentityUserLookupAppService : IApplicationService
 {
     Task<UserData> FindByIdAsync(Guid id);

modules/identity/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/Integration/IIdentityUserIntegrationService.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity.Integration;
 
@@ -8,4 +10,12 @@ namespace Volo.Abp.Identity.Integration;
 public interface IIdentityUserIntegrationService : IApplicationService
 {
     Task<string[]> GetRoleNamesAsync(Guid id);
+    
+    Task<UserData> FindByIdAsync(Guid id);
+
+    Task<UserData> FindByUserNameAsync(string userName);
+
+    Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input);
+
+    Task<long> GetCountAsync(UserLookupCountInputDto input);
 }

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

@@ -1,63 +1,41 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.Identity.Integration;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity;
 
+[Obsolete("Use IdentityUserIntegrationService for module-to-module (or service-to-service) communication.")]
 [Authorize(IdentityPermissions.UserLookup.Default)]
 public class IdentityUserLookupAppService : IdentityAppServiceBase, IIdentityUserLookupAppService
 {
-    protected IdentityUserRepositoryExternalUserLookupServiceProvider UserLookupServiceProvider { get; }
+    protected IIdentityUserIntegrationService IdentityUserIntegrationService { get; }
 
     public IdentityUserLookupAppService(
-        IdentityUserRepositoryExternalUserLookupServiceProvider userLookupServiceProvider)
+        IIdentityUserIntegrationService identityUserIntegrationService)
     {
-        UserLookupServiceProvider = userLookupServiceProvider;
+        IdentityUserIntegrationService = identityUserIntegrationService;
     }
 
     public virtual async Task<UserData> FindByIdAsync(Guid id)
     {
-        var userData = await UserLookupServiceProvider.FindByIdAsync(id);
-        if (userData == null)
-        {
-            return null;
-        }
-
-        return new UserData(userData);
+        return await IdentityUserIntegrationService.FindByIdAsync(id);
     }
 
     public virtual async Task<UserData> FindByUserNameAsync(string userName)
     {
-        var userData = await UserLookupServiceProvider.FindByUserNameAsync(userName);
-        if (userData == null)
-        {
-            return null;
-        }
-
-        return new UserData(userData);
+        return await IdentityUserIntegrationService.FindByUserNameAsync(userName);
     }
 
     public virtual async Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input)
     {
-        var users = await UserLookupServiceProvider.SearchAsync(
-            input.Sorting,
-            input.Filter,
-            input.MaxResultCount,
-            input.SkipCount
-        );
-
-        return new ListResultDto<UserData>(
-            users
-                .Select(u => new UserData(u))
-                .ToList()
-        );
+        return await IdentityUserIntegrationService.SearchAsync(input);
     }
 
     public virtual async Task<long> GetCountAsync(UserLookupCountInputDto input)
     {
-        return await UserLookupServiceProvider.GetCountAsync(input.Filter);
+        return await IdentityUserIntegrationService.GetCountAsync(input);
     }
 }

modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/Integration/IdentityUserIntegrationService.cs

@@ -1,19 +1,69 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity.Integration;
 
 public class IdentityUserIntegrationService : IdentityAppServiceBase, IIdentityUserIntegrationService
 {
     protected IUserRoleFinder UserRoleFinder { get; }
+    protected IdentityUserRepositoryExternalUserLookupServiceProvider UserLookupServiceProvider { get; }
 
-    public IdentityUserIntegrationService(IUserRoleFinder userRoleFinder)
+    public IdentityUserIntegrationService(
+        IUserRoleFinder userRoleFinder,
+        IdentityUserRepositoryExternalUserLookupServiceProvider userLookupServiceProvider)
     {
         UserRoleFinder = userRoleFinder;
+        UserLookupServiceProvider = userLookupServiceProvider;
     }
 
     public virtual async Task<string[]> GetRoleNamesAsync(Guid id)
     {
         return await UserRoleFinder.GetRoleNamesAsync(id);
     }
+
+    public virtual async Task<UserData> FindByIdAsync(Guid id)
+    {
+        var userData = await UserLookupServiceProvider.FindByIdAsync(id);
+        if (userData == null)
+        {
+            return null;
+        }
+
+        return new UserData(userData);
+    }
+
+    public virtual async Task<UserData> FindByUserNameAsync(string userName)
+    {
+        var userData = await UserLookupServiceProvider.FindByUserNameAsync(userName);
+        if (userData == null)
+        {
+            return null;
+        }
+
+        return new UserData(userData);
+    }
+
+    public virtual async Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input)
+    {
+        var users = await UserLookupServiceProvider.SearchAsync(
+            input.Sorting,
+            input.Filter,
+            input.MaxResultCount,
+            input.SkipCount
+        );
+
+        return new ListResultDto<UserData>(
+            users
+                .Select(u => new UserData(u))
+                .ToList()
+        );
+    }
+
+    public virtual async Task<long> GetCountAsync(UserLookupCountInputDto input)
+    {
+        return await UserLookupServiceProvider.GetCountAsync(input.Filter);
+    }
 }

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

@@ -8,7 +8,9 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http.Client;
 using Volo.Abp.Http.Client.ClientProxying;
 using Volo.Abp.Http.Modeling;
+using Volo.Abp.Identity;
 using Volo.Abp.Identity.Integration;
+using Volo.Abp.Users;
 
 // ReSharper disable once CheckNamespace
 namespace Volo.Abp.Identity.Integration;
@@ -25,4 +27,36 @@ public partial class IdentityUserIntegrationClientProxy : ClientProxyBase<IIdent
             { typeof(Guid), id }
         });
     }
+
+    public virtual async Task<UserData> FindByIdAsync(Guid id)
+    {
+        return await RequestAsync<UserData>(nameof(FindByIdAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(Guid), id }
+        });
+    }
+
+    public virtual async Task<UserData> FindByUserNameAsync(string userName)
+    {
+        return await RequestAsync<UserData>(nameof(FindByUserNameAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(string), userName }
+        });
+    }
+
+    public virtual async Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input)
+    {
+        return await RequestAsync<ListResultDto<UserData>>(nameof(SearchAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(UserLookupSearchInputDto), input }
+        });
+    }
+
+    public virtual async Task<long> GetCountAsync(UserLookupCountInputDto input)
+    {
+        return await RequestAsync<long>(nameof(GetCountAsync), new ClientProxyRequestTypeValue
+        {
+            { typeof(UserLookupCountInputDto), input }
+        });
+    }
 }

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

@@ -1296,6 +1296,74 @@
                     "type": "System.String[]",
                     "typeSimple": "[string]"
                   }
+                },
+                {
+                  "name": "FindByIdAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "id",
+                      "typeAsString": "System.Guid, System.Private.CoreLib",
+                      "type": "System.Guid",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.Abp.Users.UserData",
+                    "typeSimple": "Volo.Abp.Users.UserData"
+                  }
+                },
+                {
+                  "name": "FindByUserNameAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "userName",
+                      "typeAsString": "System.String, System.Private.CoreLib",
+                      "type": "System.String",
+                      "typeSimple": "string",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.Abp.Users.UserData",
+                    "typeSimple": "Volo.Abp.Users.UserData"
+                  }
+                },
+                {
+                  "name": "SearchAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "input",
+                      "typeAsString": "Volo.Abp.Identity.UserLookupSearchInputDto, Volo.Abp.Identity.Application.Contracts",
+                      "type": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                      "typeSimple": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>",
+                    "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>"
+                  }
+                },
+                {
+                  "name": "GetCountAsync",
+                  "parametersOnMethod": [
+                    {
+                      "name": "input",
+                      "typeAsString": "Volo.Abp.Identity.UserLookupCountInputDto, Volo.Abp.Identity.Application.Contracts",
+                      "type": "Volo.Abp.Identity.UserLookupCountInputDto",
+                      "typeSimple": "Volo.Abp.Identity.UserLookupCountInputDto",
+                      "isOptional": false,
+                      "defaultValue": null
+                    }
+                  ],
+                  "returnValue": {
+                    "type": "System.Int64",
+                    "typeSimple": "number"
+                  }
                 }
               ]
             }
@@ -1337,6 +1405,190 @@
               },
               "allowAnonymous": null,
               "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
+            },
+            "FindByIdAsyncById": {
+              "uniqueName": "FindByIdAsyncById",
+              "name": "FindByIdAsync",
+              "httpMethod": "GET",
+              "url": "integration-api/identity/users/{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.Users.UserData",
+                "typeSimple": "Volo.Abp.Users.UserData"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
+            },
+            "FindByUserNameAsyncByUserName": {
+              "uniqueName": "FindByUserNameAsyncByUserName",
+              "name": "FindByUserNameAsync",
+              "httpMethod": "GET",
+              "url": "integration-api/identity/users/by-username/{userName}",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "userName",
+                  "typeAsString": "System.String, System.Private.CoreLib",
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "userName",
+                  "name": "userName",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": [],
+                  "bindingSourceId": "Path",
+                  "descriptorName": ""
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Users.UserData",
+                "typeSimple": "Volo.Abp.Users.UserData"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
+            },
+            "SearchAsyncByInput": {
+              "uniqueName": "SearchAsyncByInput",
+              "name": "SearchAsync",
+              "httpMethod": "GET",
+              "url": "integration-api/identity/users/search",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UserLookupSearchInputDto, Volo.Abp.Identity.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                  "typeSimple": "Volo.Abp.Identity.UserLookupSearchInputDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "Sorting",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "SkipCount",
+                  "jsonName": null,
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                },
+                {
+                  "nameOnMethod": "input",
+                  "name": "MaxResultCount",
+                  "jsonName": null,
+                  "type": "System.Int32",
+                  "typeSimple": "number",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>",
+                "typeSimple": "Volo.Abp.Application.Dtos.ListResultDto<Volo.Abp.Users.UserData>"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
+            },
+            "GetCountAsyncByInput": {
+              "uniqueName": "GetCountAsyncByInput",
+              "name": "GetCountAsync",
+              "httpMethod": "GET",
+              "url": "integration-api/identity/users/count",
+              "supportedVersions": [],
+              "parametersOnMethod": [
+                {
+                  "name": "input",
+                  "typeAsString": "Volo.Abp.Identity.UserLookupCountInputDto, Volo.Abp.Identity.Application.Contracts",
+                  "type": "Volo.Abp.Identity.UserLookupCountInputDto",
+                  "typeSimple": "Volo.Abp.Identity.UserLookupCountInputDto",
+                  "isOptional": false,
+                  "defaultValue": null
+                }
+              ],
+              "parameters": [
+                {
+                  "nameOnMethod": "input",
+                  "name": "Filter",
+                  "jsonName": null,
+                  "type": "System.String",
+                  "typeSimple": "string",
+                  "isOptional": false,
+                  "defaultValue": null,
+                  "constraintTypes": null,
+                  "bindingSourceId": "ModelBinding",
+                  "descriptorName": "input"
+                }
+              ],
+              "returnValue": {
+                "type": "System.Int64",
+                "typeSimple": "number"
+              },
+              "allowAnonymous": null,
+              "implementFrom": "Volo.Abp.Identity.Integration.IIdentityUserIntegrationService"
             }
           }
         }

modules/identity/src/Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientExternalUserLookupServiceProvider.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Identity.Integration;
 using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity;
@@ -11,21 +12,21 @@ namespace Volo.Abp.Identity;
 [Dependency(TryRegister = true)]
 public class HttpClientExternalUserLookupServiceProvider : IExternalUserLookupServiceProvider, ITransientDependency
 {
-    protected IIdentityUserLookupAppService UserLookupAppService { get; }
+    protected IIdentityUserIntegrationService IdentityUserIntegrationService { get; }
 
-    public HttpClientExternalUserLookupServiceProvider(IIdentityUserLookupAppService userLookupAppService)
+    public HttpClientExternalUserLookupServiceProvider(IIdentityUserIntegrationService identityUserIntegrationService)
     {
-        UserLookupAppService = userLookupAppService;
+        IdentityUserIntegrationService = identityUserIntegrationService;
     }
 
     public virtual async Task<IUserData> FindByIdAsync(Guid id, CancellationToken cancellationToken = default)
     {
-        return await UserLookupAppService.FindByIdAsync(id);
+        return await IdentityUserIntegrationService.FindByIdAsync(id);
     }
 
     public virtual async Task<IUserData> FindByUserNameAsync(string userName, CancellationToken cancellationToken = default)
     {
-        return await UserLookupAppService.FindByUserNameAsync(userName);
+        return await IdentityUserIntegrationService.FindByUserNameAsync(userName);
     }
 
     public async Task<List<IUserData>> SearchAsync(
@@ -35,7 +36,7 @@ public class HttpClientExternalUserLookupServiceProvider : IExternalUserLookupSe
         int skipCount = 0,
         CancellationToken cancellationToken = default)
     {
-        var result = await UserLookupAppService.SearchAsync(
+        var result = await IdentityUserIntegrationService.SearchAsync(
             new UserLookupSearchInputDto
             {
                 Filter = filter,
@@ -52,7 +53,7 @@ public class HttpClientExternalUserLookupServiceProvider : IExternalUserLookupSe
         string filter = null,
         CancellationToken cancellationToken = new CancellationToken())
     {
-        return await UserLookupAppService
+        return await IdentityUserIntegrationService
             .GetCountAsync(
                 new UserLookupCountInputDto
                 {

modules/identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/Integration/IdentityUserIntegrationController.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Users;
 
 namespace Volo.Abp.Identity.Integration;
 
@@ -24,4 +26,32 @@ public class IdentityUserIntegrationController : AbpControllerBase, IIdentityUse
     {
         return UserIntegrationService.GetRoleNamesAsync(id);
     }
+
+    [HttpGet]
+    [Route("{id}")]
+    public Task<UserData> FindByIdAsync(Guid id)
+    {
+        return UserIntegrationService.FindByIdAsync(id);
+    }
+
+    [HttpGet]
+    [Route("by-username/{userName}")]
+    public Task<UserData> FindByUserNameAsync(string userName)
+    {
+        return UserIntegrationService.FindByUserNameAsync(userName);
+    }
+
+    [HttpGet]
+    [Route("search")]
+    public Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input)
+    {
+        return UserIntegrationService.SearchAsync(input);
+    }
+
+    [HttpGet]
+    [Route("count")]
+    public Task<long> GetCountAsync(UserLookupCountInputDto input)
+    {
+        return UserIntegrationService.GetCountAsync(input);
+    }
 }

modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserLookupAppService_Tests.cs → modules/identity/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/Integration/IdentityUserIntegrationService_Tests.cs

@@ -1,23 +1,35 @@
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using Shouldly;
 using Xunit;
 
-namespace Volo.Abp.Identity;
+namespace Volo.Abp.Identity.Integration;
 
-public class IdentityUserLookupAppService_Tests : AbpIdentityApplicationTestBase
+public class IdentityUserIntegrationService_Tests : AbpIdentityApplicationTestBase
 {
-    private readonly IIdentityUserLookupAppService _identityUserLookupAppService;
+    private readonly IIdentityUserIntegrationService _identityUserIntegrationService;
     private readonly IIdentityUserRepository _identityUserRepository;
     private readonly ILookupNormalizer _lookupNormalizer;
 
-    public IdentityUserLookupAppService_Tests()
+    public IdentityUserIntegrationService_Tests()
     {
-        _identityUserLookupAppService = GetRequiredService<IIdentityUserLookupAppService>();
+        _identityUserIntegrationService = GetRequiredService<IIdentityUserIntegrationService>();
         _identityUserRepository = GetRequiredService<IIdentityUserRepository>();
         _lookupNormalizer = GetRequiredService<ILookupNormalizer>();
     }
+    
+    [Fact]
+    public async Task GetRoleNamesAsync()
+    {
+        var adminUser = await _identityUserRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName("admin"));
+        adminUser.ShouldNotBeNull();
+        
+        var roles = await _identityUserIntegrationService.GetRoleNamesAsync(adminUser.Id);
+        roles.Length.ShouldBe(1);
+        roles.ShouldContain("admin");
+    }
 
     [Fact]
     public async Task FindByIdAsync()
@@ -25,13 +37,13 @@ public class IdentityUserLookupAppService_Tests : AbpIdentityApplicationTestBase
         var user = await _identityUserRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName("john.nash"));
         user.ShouldNotBeNull();
 
-        (await _identityUserLookupAppService.FindByIdAsync(user.Id)).UserName.ShouldBe(user.UserName);
+        (await _identityUserIntegrationService.FindByIdAsync(user.Id)).UserName.ShouldBe(user.UserName);
     }
 
     [Fact]
     public async Task FindById_NotExist_Should_Return_Null()
     {
-        var user = await _identityUserLookupAppService.FindByIdAsync(Guid.NewGuid());
+        var user = await _identityUserIntegrationService.FindByIdAsync(Guid.NewGuid());
         user.ShouldBeNull();
     }
 
@@ -41,20 +53,20 @@ public class IdentityUserLookupAppService_Tests : AbpIdentityApplicationTestBase
         var user = await _identityUserRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName("john.nash"));
         user.ShouldNotBeNull();
 
-        (await _identityUserLookupAppService.FindByUserNameAsync(user.UserName)).UserName.ShouldBe(user.UserName);
+        (await _identityUserIntegrationService.FindByUserNameAsync(user.UserName)).UserName.ShouldBe(user.UserName);
     }
 
     [Fact]
     public async Task FindByUserName_NotExist_Should_Return_Null()
     {
-        var user = await _identityUserLookupAppService.FindByUserNameAsync(Guid.NewGuid().ToString());
+        var user = await _identityUserIntegrationService.FindByUserNameAsync(Guid.NewGuid().ToString());
         user.ShouldBeNull();
     }
 
     [Fact]
     public async Task Search_Without_Filter_And_Sorting()
     {
-        var result = await _identityUserLookupAppService.SearchAsync(new UserLookupSearchInputDto());
+        var result = await _identityUserIntegrationService.SearchAsync(new UserLookupSearchInputDto());
         result.Items.Count.ShouldBeGreaterThanOrEqualTo(3);
         result.Items.ShouldContain(u => u.UserName == "john.nash");
     }
@@ -62,7 +74,7 @@ public class IdentityUserLookupAppService_Tests : AbpIdentityApplicationTestBase
     [Fact]
     public async Task Search_With_Filter()
     {
-        var result = await _identityUserLookupAppService.SearchAsync(
+        var result = await _identityUserIntegrationService.SearchAsync(
             new UserLookupSearchInputDto
             {
                 Filter = "a"
@@ -73,7 +85,7 @@ public class IdentityUserLookupAppService_Tests : AbpIdentityApplicationTestBase
         result.Items.ShouldContain(u => u.UserName == "john.nash");
         result.Items.ShouldContain(u => u.UserName == "david");
 
-        result = await _identityUserLookupAppService.SearchAsync(
+        result = await _identityUserIntegrationService.SearchAsync(
             new UserLookupSearchInputDto
             {
                 Filter = "neo"