Merge pull request #9 from jxnkwlp/feature/account-identity

jxnkwlp · web-flow · commit 81cec054c5cb · 2024-07-07T14:31:00.000+08:00
fix: account external callback login
diff --git a/modules/account/common.props b/modules/account/common.props
@@ -6,8 +6,8 @@
     <Description>an abp module that provider account service, such as login, 2fa, account link,
       impersonation, settings. </Description>
     <PackageTags>abp-module</PackageTags>
-    <Version>1.3.0</Version>
-    <PackageVersion>1.3.0</PackageVersion>
+    <Version>1.3.1</Version>
+    <PackageVersion>1.3.1</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,4 +17,4 @@
     </None>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/AccountSecurityLogPagedListRequestDto.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/AccountSecurityLogPagedListRequestDto.cs
@@ -3,7 +3,7 @@
 
 namespace Passingwind.Abp.Account;
 
-public class AccountSecurityLogPagedListRequestDto : PagedAndSortedResultRequestDto
+public class AccountSecurityLogsPagedListRequestDto : PagedAndSortedResultRequestDto
 {
     public string? ApplicationName { get; set; }
     public string? Identity { get; set; }
diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountSecurityLogsAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountSecurityLogsAppService.cs
@@ -7,5 +7,5 @@ namespace Passingwind.Abp.Account;
 
 public interface IAccountSecurityLogsAppService : IApplicationService
 {
-    Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(AccountSecurityLogPagedListRequestDto input);
+    Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(AccountSecurityLogsPagedListRequestDto input);
 }
diff --git a/modules/account/src/Passingwind.Abp.Account.Application/AccountExternalAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application/AccountExternalAppService.cs
@@ -29,7 +29,7 @@ public class AccountExternalAppService : AccountAppBaseService, IAccountExternal
 {
     protected HttpContext? HttpContext { get; }
     protected IJsonSerializer JsonSerializer { get; }
-    protected SignInManager<IdentityUser> SignInManager { get; }
+    protected SignInManager SignInManager { get; }
     protected IOptions<IdentityOptions> IdentityOptions { get; }
     protected IdentitySecurityLogManager IdentitySecurityLogManager { get; }
     protected IdentityUserManager UserManager { get; }
@@ -38,7 +38,7 @@ public class AccountExternalAppService : AccountAppBaseService, IAccountExternal
     protected ILocalEventBus LocalEventBus { get; }
 
     public AccountExternalAppService(
-        SignInManager<IdentityUser> signInManager,
+        SignInManager signInManager,
         IHttpContextAccessor httpContextAccessor,
         IOptions<IdentityOptions> identityOptions,
         IdentitySecurityLogManager identitySecurityLogManager,
@@ -102,9 +102,6 @@ public virtual async Task<AccountExternalLoginResultDto> CallbackAsync([NotNull]
             Logger.LogDebug("Received external login principal claims: \n{LogClaimsString}", logClaimsString);
         }
 
-        // TODO: Check Tenant ???
-        // 
-
         var result = await ExternalLoginSignInAsync(loginInfo);
 
         if (result.ToString() != SignInResult.Failed.ToString())
@@ -122,23 +119,18 @@ public virtual async Task<AccountExternalLoginResultDto> CallbackAsync([NotNull]
             throw new BusinessException(AccountErrorCodes.ExternalLoginUserNotFound);
         }
 
-        // TODO: two-factory check!
-        // sign in
-        await SignInManager.SignInAsync(user, false);
+        // try login again
+        result = await ExternalLoginSignInAsync(loginInfo);
 
-        await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
+        if (result.ToString() != SignInResult.Failed.ToString())
         {
-            Identity = IdentitySecurityLogIdentityConsts.IdentityExternal,
-            Action = IdentitySecurityLogActionConsts.LoginSucceeded,
-            UserName = user.Name
-        });
-
-        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.ExternalLogin), onUnitOfWorkComplete: true);
+            return new AccountExternalLoginResultDto(GetAccountLoginResultType(result))
+            {
+                RedirectUrl = input.ReturnUrl,
+            };
+        }
 
-        return new AccountExternalLoginResultDto(AccountLoginResultType.Success)
-        {
-            RedirectUrl = input.ReturnUrl,
-        };
+        throw new BusinessException(AccountErrorCodes.ExternalLoginUserNotFound);
     }
 
     protected virtual async Task<SignInResult> ExternalLoginSignInAsync(ExternalLoginInfo loginInfo)
@@ -164,6 +156,7 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             {
                 Identity = IdentitySecurityLogIdentityConsts.IdentityExternal,
                 Action = result.ToIdentitySecurityLogAction(),
+                UserName = user.UserName,
             });
         }
 
diff --git a/modules/account/src/Passingwind.Abp.Account.Application/AccountSecurityLogsAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application/AccountSecurityLogsAppService.cs
@@ -17,7 +17,7 @@ public AccountSecurityLogsAppService(IIdentitySecurityLogRepository securityLogR
         SecurityLogRepository = securityLogRepository;
     }
 
-    public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(AccountSecurityLogPagedListRequestDto input)
+    public virtual async Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(AccountSecurityLogsPagedListRequestDto input)
     {
         var count = await SecurityLogRepository.GetCountAsync(
            startTime: input.StartTime,
@@ -42,6 +42,6 @@ public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(A
             clientId: input.ClientId,
             correlationId: input.CorrelationId);
 
-        return new PagedResultDto<IdentitySecurityLogDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogDto>>(list));
+        return new PagedResultDto<IdentitySecurityLogsDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogsDto>>(list));
     }
 }
diff --git a/modules/account/src/Passingwind.Abp.Account.Application/NullAccountTwoFactorTokenSender.cs b/modules/account/src/Passingwind.Abp.Account.Application/NullAccountTwoFactorTokenSender.cs
@@ -17,29 +17,35 @@ public NullAccountTwoFactorTokenSender(ILogger<NullAccountTwoFactorTokenSender>
 
     public virtual Task SendAsync(IdentityUser user, string provider, string token, CancellationToken cancellationToken = default)
     {
-        Logger.LogWarning("Two-factor token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);
+        Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);
 
         return Task.CompletedTask;
     }
 
     public virtual Task SendEmailConfirmationTokenAsync(IdentityUser user, string token, CancellationToken cancellationToken = default)
     {
-        Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);
+        Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);
 
         return Task.CompletedTask;
     }
 
     public virtual Task SendChangePhoneNumberTokenAsync(IdentityUser user, string phoneNumber, string token, CancellationToken cancellationToken = default)
     {
-        Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);
+        Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);
 
         return Task.CompletedTask;
     }
 
     public virtual Task SendChangeEmailTokenAsync(IdentityUser user, string email, string token, CancellationToken cancellationToken = default)
     {
-        Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);
+        Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);
 
         return Task.CompletedTask;
     }
 }
+
+internal static partial class NullAccountTwoFactorTokenSenderLoggerMessage
+{
+    [LoggerMessage("Token '{Token}' not sent. Please implement '{TypeName}' first.", Level = LogLevel.Warning)]
+    internal static partial void NotImplement(this ILogger logger, string token, string? typeName);
+}
diff --git a/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/AccountExternalAuthController.cs b/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/AccountExternalAuthController.cs
@@ -20,7 +20,7 @@ public AccountExternalAuthController(IIdentityClientLoginAppService identityClie
 
     [AllowAnonymous]
     [HttpGet("identity/{provider}/login")]
-    public virtual async Task IdentityClientLoginAsync(string provider, string? returnUrl = null, string? returnUrlHash = null)
+    public virtual async Task LoginAsync(string provider, string? returnUrl = null, string? returnUrlHash = null)
     {
         var redirectUrl = Url.Action("callback", values: new { returnUrl, returnUrlHash });
 
diff --git a/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/IdentityClientExternalProvider.cs b/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/IdentityClientExternalProvider.cs
@@ -25,9 +25,14 @@ public override async Task LoginInfoReceivedAsync(AccountExternalCallbackLoginIn
         // check is debug mode
         var identityClient = await IdentityClientRepository.FindByProviderNameAsync(providerName);
 
-        // TODO check tenant 
-        // 
-        if (identityClient?.IsDebugMode == true)
+        if (identityClient == null)
+        {
+            context.Handled = true;
+            context.Result = new NotFoundResult();
+            return;
+        }
+
+        if (identityClient.IsDebugMode)
         {
             Logger.LogWarning("YOU ARE USE DEBUG MODE FOR IDENTITY PROVIDER");
             context.Handled = true;
diff --git a/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountSecurityLogsController.cs b/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountSecurityLogsController.cs
@@ -20,7 +20,7 @@ public AccountSecurityLogsController(IAccountSecurityLogsAppService service)
     }
 
     [HttpGet]
-    public virtual Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync([FromQuery] AccountSecurityLogPagedListRequestDto input)
+    public virtual Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync([FromQuery] AccountSecurityLogsPagedListRequestDto input)
     {
         return _service.GetListAsync(input);
     }
diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IIdentitySecurityLogAppService.cs b/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IIdentitySecurityLogAppService.cs
@@ -7,9 +7,9 @@ namespace Passingwind.Abp.Identity;
 
 public interface IIdentitySecurityLogAppService : IApplicationService
 {
-    Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input);
+    Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input);
 
-    Task<IdentitySecurityLogDto> GetAsync(Guid id);
+    Task<IdentitySecurityLogsDto> GetAsync(Guid id);
 
     Task DeleteAsync(Guid id);
 }
diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentitySecurityLogDto.cs b/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentitySecurityLogDto.cs
@@ -3,7 +3,7 @@
 
 namespace Passingwind.Abp.Identity;
 
-public class IdentitySecurityLogDto : ExtensibleEntityDto<Guid>
+public class IdentitySecurityLogsDto : ExtensibleEntityDto<Guid>
 {
     public Guid? TenantId { get; set; }
 
diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityApplicationAutoMapperProfile.cs b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityApplicationAutoMapperProfile.cs
@@ -22,7 +22,7 @@ public IdentityApplicationAutoMapperProfile()
         CreateMap<OrganizationUnit, OrganizationUnitDto>()
             .ForMember(x => x.RoleIds, x => x.MapFrom(r => r.Roles.Select(s => s.RoleId)));
 
-        CreateMap<IdentitySecurityLog, IdentitySecurityLogDto>();
+        CreateMap<IdentitySecurityLog, IdentitySecurityLogsDto>();
 
         CreateMap<IdentityUserSettings, IdentityUserSettingsDto>().ReverseMap();
         CreateMap<IdentityPasswordSettings, IdentityPasswordSettingsDto>().ReverseMap();
diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentitySecurityLogAppService.cs b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentitySecurityLogAppService.cs
@@ -23,14 +23,14 @@ public virtual async Task DeleteAsync(Guid id)
         await SecurityLogRepository.DeleteAsync(id);
     }
 
-    public virtual async Task<IdentitySecurityLogDto> GetAsync(Guid id)
+    public virtual async Task<IdentitySecurityLogsDto> GetAsync(Guid id)
     {
         var entity = await SecurityLogRepository.GetAsync(id);
 
-        return ObjectMapper.Map<IdentitySecurityLog, IdentitySecurityLogDto>(entity);
+        return ObjectMapper.Map<IdentitySecurityLog, IdentitySecurityLogsDto>(entity);
     }
 
-    public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input)
+    public virtual async Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input)
     {
         var count = await SecurityLogRepository.GetCountAsync(
             input.StartTime,
@@ -57,6 +57,6 @@ public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(I
             input.ClientId,
             input.CorrelationId);
 
-        return new PagedResultDto<IdentitySecurityLogDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogDto>>(list));
+        return new PagedResultDto<IdentitySecurityLogsDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogsDto>>(list));
     }
 }
diff --git a/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/AspNetCore/SignInManager.cs b/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/AspNetCore/SignInManager.cs
@@ -35,7 +35,7 @@ public SignInManager(
         IdentityUserManager = identityUserManager;
     }
 
-    protected override async Task<SignInResult?> PreSignInCheck(Volo.Abp.Identity.IdentityUser user)
+    protected override async Task<SignInResult?> PreSignInCheck(IdentityUser user)
     {
         if (!user.IsActive)
         {
@@ -56,16 +56,23 @@ public SignInManager(
         return null;
     }
 
-    protected virtual async Task<SignInResult> PostSignInCheck(IdentityUser user, SignInResult signInResult)
+    /// <summary>
+    ///  Post action when user signin
+    /// </summary>
+    protected virtual Task<SignInResult> PostSignInCheckAsync(IdentityUser user, SignInResult signInResult)
     {
-        if (await IdentityUserManager.ShouldChangePasswordAsync(user))
-        {
-            return AbpSignInResult.ChangePasswordRequired;
-        }
+        return Task.FromResult(signInResult);
+    }
 
-        return signInResult;
+    /// <summary>
+    ///  Check if the user has need change password before login
+    /// </summary>
+    public virtual async Task<bool> ShouldChangePasswordAsync(IdentityUser user)
+    {
+        return await IdentityUserManager.ShouldChangePasswordAsync(user);
     }
 
+    /// <inheritdoc />
     public override async Task<bool> IsTwoFactorEnabledAsync(IdentityUser user)
     {
         var behaviour = await SettingProvider.GetEnumValueAsync<IdentityTwofactoryBehaviour>(IdentitySettingNamesV2.Twofactor.TwoFactorBehaviour);
@@ -79,55 +86,46 @@ public override async Task<bool> IsTwoFactorEnabledAsync(IdentityUser user)
         return await base.IsTwoFactorEnabledAsync(user);
     }
 
-    public virtual async Task<bool> ShouldChangePasswordAsync(IdentityUser user)
+    /// <summary>
+    ///  This is to call the protection method <see cref="SignInOrTwoFactorAsync"/>
+    /// </summary>
+    public virtual async Task<SignInResult> DirectSignInAsync(IdentityUser user, bool isPersistent, string? loginProvider = null, bool bypassTwoFactor = false, bool bypassChangePassword = false)
     {
-        return await IdentityUserManager.ShouldChangePasswordAsync(user);
+        return await SignInOrTwoFactorAsync(
+            user,
+            isPersistent: isPersistent,
+            loginProvider: loginProvider,
+            bypassTwoFactor: bypassTwoFactor,
+            bypassChangePassword: bypassChangePassword);
     }
 
-    // TODO
-    // review this when upgrade to .net8
-    protected override async Task<SignInResult> SignInOrTwoFactorAsync(IdentityUser user, bool isPersistent, string? loginProvider = null, bool bypassTwoFactor = false)
+    /// <inheritdoc />
+    protected virtual async Task<SignInResult> SignInOrTwoFactorAsync(IdentityUser user, bool isPersistent, string? loginProvider = null, bool bypassTwoFactor = false, bool bypassChangePassword = false)
     {
-        if (await ShouldChangePasswordAsync(user))
+        SignInResult result = SignInResult.Failed;
+
+        if (!bypassChangePassword && await ShouldChangePasswordAsync(user))
         {
             var userId = await UserManager.GetUserIdAsync(user);
             await Context.SignInAsync(IdentityV2Constants.ChangePasswordUserIdScheme, StoreChangePasswordInfo(userId, loginProvider));
 
-            return AbpSignInResult.ChangePasswordRequired;
-        }
-
-        if (!bypassTwoFactor && await IsTwoFactorEnabledAsync(user))
-        {
-            if (!await IsTwoFactorClientRememberedAsync(user))
-            {
-                // Store the userId for use after two factor check
-                var userId = await UserManager.GetUserIdAsync(user);
-                await Context.SignInAsync(IdentityConstants.TwoFactorUserIdScheme, StoreTwoFactorInfo(userId, loginProvider));
-
-                return SignInResult.TwoFactorRequired;
-            }
-        }
-
-        // Cleanup external cookie
-        if (loginProvider != null)
-        {
-            await Context.SignOutAsync(IdentityConstants.ExternalScheme);
-        }
-
-        if (loginProvider == null)
-        {
-            await SignInWithClaimsAsync(user, isPersistent, new Claim[] { new Claim("amr", "pwd") });
+            result = AbpSignInResult.ChangePasswordRequired;
         }
         else
         {
-            await SignInAsync(user, isPersistent, loginProvider);
+            result = await base.SignInOrTwoFactorAsync(user, isPersistent, loginProvider, bypassTwoFactor);
         }
 
-        return SignInResult.Success;
+        return await PostSignInCheckAsync(user, result);
+    }
 
-        // return await base.SignInOrTwoFactorAsync(user, isPersistent, loginProvider, bypassTwoFactor);
+    /// <inheritdoc />
+    protected override async Task<SignInResult> SignInOrTwoFactorAsync(IdentityUser user, bool isPersistent, string? loginProvider = null, bool bypassTwoFactor = false)
+    {
+        return await SignInOrTwoFactorAsync(user, isPersistent, loginProvider, bypassTwoFactor, false);
     }
 
+    /// <inheritdoc />
     public override async Task SignOutAsync()
     {
         await base.SignOutAsync();
@@ -154,23 +152,6 @@ public override async Task SignOutAsync()
         return await UserManager.FindByIdAsync(userId);
     }
 
-    /// <summary>
-    /// Creates a claims principal for the specified 2fa information.
-    /// </summary>
-    /// <param name="userId">The user whose is logging in via 2fa.</param>
-    /// <param name="loginProvider">The 2fa provider.</param>
-    /// <returns>A <see cref="ClaimsPrincipal"/> containing the user 2fa information.</returns>
-    internal static ClaimsPrincipal StoreTwoFactorInfo(string userId, string? loginProvider)
-    {
-        var identity = new ClaimsIdentity(IdentityConstants.TwoFactorUserIdScheme);
-        identity.AddClaim(new Claim(ClaimTypes.Name, userId));
-        if (loginProvider != null)
-        {
-            identity.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, loginProvider));
-        }
-        return new ClaimsPrincipal(identity);
-    }
-
     /// <summary>
     ///  Creates a claims principal for the specified user information that requires change password.
     /// </summary>
diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentitySecurityLogController.cs b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentitySecurityLogController.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace Passingwind.Abp.Account;`
`5`	`5`
`6`		`-public class AccountSecurityLogPagedListRequestDto : PagedAndSortedResultRequestDto`
	`6`	`+public class AccountSecurityLogsPagedListRequestDto : PagedAndSortedResultRequestDto`
`7`	`7`	`{`
`8`	`8`	`public string? ApplicationName { get; set; }`
`9`	`9`	`public string? Identity { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ namespace Passingwind.Abp.Account;`
`7`	`7`
`8`	`8`	`public interface IAccountSecurityLogsAppService : IApplicationService`
`9`	`9`	`{`
`10`		`- Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(AccountSecurityLogPagedListRequestDto input);`
	`10`	`+ Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(AccountSecurityLogsPagedListRequestDto input);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public AccountSecurityLogsAppService(IIdentitySecurityLogRepository securityLogR`
`17`	`17`	`SecurityLogRepository = securityLogRepository;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(AccountSecurityLogPagedListRequestDto input)`
	`20`	`+ public virtual async Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(AccountSecurityLogsPagedListRequestDto input)`
`21`	`21`	`{`
`22`	`22`	`var count = await SecurityLogRepository.GetCountAsync(`
`23`	`23`	`startTime: input.StartTime,`
`@@ -42,6 +42,6 @@ public virtual async Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(A`
`42`	`42`	`clientId: input.ClientId,`
`43`	`43`	`correlationId: input.CorrelationId);`
`44`	`44`
`45`		`- return new PagedResultDto<IdentitySecurityLogDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogDto>>(list));`
	`45`	`+ return new PagedResultDto<IdentitySecurityLogsDto>(count, ObjectMapper.Map<List<IdentitySecurityLog>, List<IdentitySecurityLogsDto>>(list));`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,29 +17,35 @@ public NullAccountTwoFactorTokenSender(ILogger<NullAccountTwoFactorTokenSender>`
`17`	`17`
`18`	`18`	`public virtual Task SendAsync(IdentityUser user, string provider, string token, CancellationToken cancellationToken = default)`
`19`	`19`	`{`
`20`		`- Logger.LogWarning("Two-factor token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);`
	`20`	`+ Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);`
`21`	`21`
`22`	`22`	`return Task.CompletedTask;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public virtual Task SendEmailConfirmationTokenAsync(IdentityUser user, string token, CancellationToken cancellationToken = default)`
`26`	`26`	`{`
`27`		`- Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);`
	`27`	`+ Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);`
`28`	`28`
`29`	`29`	`return Task.CompletedTask;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public virtual Task SendChangePhoneNumberTokenAsync(IdentityUser user, string phoneNumber, string token, CancellationToken cancellationToken = default)`
`33`	`33`	`{`
`34`		`- Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);`
	`34`	`+ Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);`
`35`	`35`
`36`	`36`	`return Task.CompletedTask;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public virtual Task SendChangeEmailTokenAsync(IdentityUser user, string email, string token, CancellationToken cancellationToken = default)`
`40`	`40`	`{`
`41`		`- Logger.LogWarning("Token not sent. Please implement '{0}' first.", typeof(IAccountTwoFactorTokenSender).FullName);`
	`41`	`+ Logger.NotImplement(token, typeof(IAccountTwoFactorTokenSender).FullName);`
`42`	`42`
`43`	`43`	`return Task.CompletedTask;`
`44`	`44`	`}`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+internal static partial class NullAccountTwoFactorTokenSenderLoggerMessage`
	`48`	`+{`
	`49`	`+ [LoggerMessage("Token '{Token}' not sent. Please implement '{TypeName}' first.", Level = LogLevel.Warning)]`
	`50`	`+ internal static partial void NotImplement(this ILogger logger, string token, string? typeName);`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public AccountExternalAuthController(IIdentityClientLoginAppService identityClie`
`20`	`20`
`21`	`21`	`[AllowAnonymous]`
`22`	`22`	`[HttpGet("identity/{provider}/login")]`
`23`		`- public virtual async Task IdentityClientLoginAsync(string provider, string? returnUrl = null, string? returnUrlHash = null)`
	`23`	`+ public virtual async Task LoginAsync(string provider, string? returnUrl = null, string? returnUrlHash = null)`
`24`	`24`	`{`
`25`	`25`	`var redirectUrl = Url.Action("callback", values: new { returnUrl, returnUrlHash });`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public AccountSecurityLogsController(IAccountSecurityLogsAppService service)`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[HttpGet]`
`23`		`- public virtual Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync([FromQuery] AccountSecurityLogPagedListRequestDto input)`
	`23`	`+ public virtual Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync([FromQuery] AccountSecurityLogsPagedListRequestDto input)`
`24`	`24`	`{`
`25`	`25`	`return _service.GetListAsync(input);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ namespace Passingwind.Abp.Identity;`
`7`	`7`
`8`	`8`	`public interface IIdentitySecurityLogAppService : IApplicationService`
`9`	`9`	`{`
`10`		`- Task<PagedResultDto<IdentitySecurityLogDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input);`
	`10`	`+ Task<PagedResultDto<IdentitySecurityLogsDto>> GetListAsync(IdentitySecurityLogPagedListRequestDto input);`
`11`	`11`
`12`		`- Task<IdentitySecurityLogDto> GetAsync(Guid id);`
	`12`	`+ Task<IdentitySecurityLogsDto> GetAsync(Guid id);`
`13`	`13`
`14`	`14`	`Task DeleteAsync(Guid id);`
`15`	`15`	`}`