Merge pull request #17 from jxnkwlp/feature/feature/abp-8.3

Feature/feature/abp 8.3

common.props

@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <MicrosoftPackageVersion>8.0.4</MicrosoftPackageVersion>
-    <AbpVersion>8.2.0</AbpVersion>
+    <MicrosoftPackageVersion>8.0.6</MicrosoftPackageVersion>
+    <AbpVersion>8.3.0</AbpVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-</Project>
+</Project>

host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
@@ -28,10 +28,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(MicrosoftPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftPackageVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion)" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />
   </ItemGroup>
 
 </Project>

host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj

@@ -24,7 +24,7 @@
     <PackageReference Include="Volo.Abp.BackgroundWorkers.Hangfire" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
     <PackageReference Include="Passingwind.SwaggerExtensions" Version="0.5.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
   </ItemGroup>
 
   <ItemGroup>

host/src/Sample.HttpApi.Host/SampleHttpApiHostModule.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using Hangfire;
 using Hangfire.MemoryStorage;
-using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
@@ -26,6 +25,7 @@
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.AntiForgery;
+using Volo.Abp.AspNetCore.Mvc.Libs;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
@@ -115,6 +115,8 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         });
 
         Configure<AbpAntiForgeryOptions>(options => options.TokenCookie.SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Lax);
+
+        Configure<AbpMvcLibsOptions>(options => options.CheckLibs = false);
     }
 
     private void ConfigureAuthentication(ServiceConfigurationContext context)
@@ -276,11 +278,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         app.UseSwagger();
         app.UseAbpSwaggerUI(c =>
         {
-            c.SwaggerEndpoint("/swagger/v1/swagger.json", "Sample API");
-
-            var configuration = context.ServiceProvider.GetRequiredService<IConfiguration>();
-            c.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
-            c.OAuthScopes("Sample");
+            c.SwaggerEndpoint("/swagger/v1/swagger.json", "Sample API"); 
             c.DisplayOperationId();
             c.DisplayRequestDuration();
             c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);

modules/account/src/Passingwind.Abp.Account.Application/AccountExternalAppService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -94,7 +95,7 @@ public virtual async Task<AccountExternalLoginResultDto> CallbackAsync([NotNull]
             throw new AbpAuthorizationException("External login info is not available");
         }
 
-        Logger.LogInformation("Received external login callback. provider: {LoginProvider}, key: {ProviderKey}", loginInfo.LoginProvider, loginInfo.ProviderKey);
+        Logger.LogDebug("Received external login callback. provider: {LoginProvider}, key: {ProviderKey}", loginInfo.LoginProvider, loginInfo.ProviderKey);
 
         if (ExternalLoginOptions.Value.LogClaims)
         {
@@ -148,9 +149,12 @@ protected virtual async Task<SignInResult> ExternalLoginSignInAsync(ExternalLogi
         {
             var user = await UserManager.FindByLoginAsync(loginInfo.LoginProvider, loginInfo.ProviderKey);
 
-            await LocalEventBus.PublishAsync(new UserLoginEvent(user!.Id, UserLoginEvent.ExternalLogin), onUnitOfWorkComplete: true);
-
-            Logger.LogInformation("User use provider key '{ProviderKey}' logged in with '{LoginProvider}' provider.", loginInfo.ProviderKey, loginInfo.LoginProvider);
+            var loginEventData = new Dictionary<string, object>
+            {
+                { "LoginProvider", loginInfo.LoginProvider },
+                { "ProviderKey", loginInfo.ProviderKey },
+            };
+            await LocalEventBus.PublishAsync(new UserLoginEvent(user!.Id, UserLoginEvent.ExternalLogin, loginEventData), onUnitOfWorkComplete: true);
 
             await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             {
@@ -182,8 +186,6 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                     loginDisplayName: loginInfo.ProviderDisplayName,
                     generateUserName: true);
 
-                Logger.LogInformation("User with name '{UserName}' created by external login with '{LoginProvider}' provider.", user.UserName, loginInfo.LoginProvider);
-
                 await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                 {
                     Identity = IdentitySecurityLogIdentityConsts.IdentityExternal,

modules/account/src/Passingwind.Abp.Account.Application/AccountImpersonationAppService.cs

@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Passingwind.Abp.Account.Events;
 using Passingwind.Abp.Identity;
@@ -84,11 +83,20 @@ public virtual async Task LoginAsync(Guid userId)
             throw new AbpAuthorizationException();
         }
 
+        var currentUserId = CurrentUser.Id;
+        var currentUserName = CurrentUser.Name;
+
         IdentityUser user = await UserManager.FindByIdAsync(userId.ToString()) ?? throw new UserNotFoundException();
 
         await ImpersonateLoginAsync(user);
 
-        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.ImpersonationLogout), onUnitOfWorkComplete: true);
+        var loginEventData = new Dictionary<string, object>
+            {
+                { "CurrentUserName", currentUserName! },
+                { "CurrentUserId", currentUserId! },
+            };
+
+        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.ImpersonationLogout, loginEventData), onUnitOfWorkComplete: true);
     }
 
     public virtual async Task LinkLoginAsync(Guid userId)
@@ -100,15 +108,16 @@ public virtual async Task LinkLoginAsync(Guid userId)
         var source = new IdentityLinkUserInfo(CurrentUser.GetId(), CurrentUser.TenantId);
         var target = new IdentityLinkUserInfo(userId, user.TenantId);
 
+        var currentUserId = CurrentUser.Id;
+        var currentUserName = CurrentUser.Name;
+
         if (user.TenantId.HasValue && user.TenantId != CurrentUser.TenantId)
         {
             CurrentTenant.Change(user.TenantId.Value);
         }
 
         if (await LinkUserManager.IsLinkedAsync(source, target, true))
         {
-            Logger.LogInformation("User with id '{0}' has been link login by user id '{1}'", user.Id, source.UserId);
-
             await ImpersonateLoginAsync(user);
 
             await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
@@ -119,7 +128,13 @@ await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
                 ExtraProperties = { { "SourceUserId", source.UserId } }
             });
 
-            await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.LinkLogin), onUnitOfWorkComplete: true);
+            var loginEventData = new Dictionary<string, object>
+            {
+                { "CurrentUserName", currentUserName! },
+                { "CurrentUserId", currentUserId! },
+            };
+
+            await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.LinkLogin, loginEventData), onUnitOfWorkComplete: true);
         }
         else
         {
@@ -137,11 +152,12 @@ public virtual async Task DelegationLoginAsync(Guid id)
             throw new BusinessException(AccountErrorCodes.UserNotDelegated);
         }
 
+        var currentUserId = CurrentUser.Id;
+        var currentUserName = CurrentUser.Name;
+
         // Get the delegation source user 
         var user = await UserManager.GetByIdAsync(delegation.SourceUserId);
 
-        Logger.LogInformation("User with id '{0}' has been delegation login by user id '{1}'", user.Id, CurrentUser.GetId());
-
         await ImpersonateLoginAsync(user);
 
         await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
@@ -152,7 +168,13 @@ await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             ExtraProperties = { { "SourceUserId", CurrentUser.GetId() } }
         });
 
-        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.DelegationLogin), onUnitOfWorkComplete: true);
+        var loginEventData = new Dictionary<string, object>
+            {
+                { "CurrentUserName", currentUserName! },
+                { "CurrentUserId", currentUserId! },
+            };
+
+        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.DelegationLogin, loginEventData), onUnitOfWorkComplete: true);
     }
 
     protected virtual async Task ImpersonateLoginAsync(IdentityUser user)
@@ -173,8 +195,6 @@ protected virtual async Task ImpersonateLoginAsync(IdentityUser user)
 
         await SignInManager.SignInWithClaimsAsync(user, false, cliams);
 
-        Logger.LogInformation("User with id '{0}' has been impersonate login by user id '{1}'", user.Id, CurrentUser.Id);
-
         await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
         {
             Identity = IdentitySecurityLogIdentityConsts.Identity,

modules/account/src/Passingwind.Abp.Account.Application/AccountLoginAppService.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -145,7 +146,12 @@ await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             UserName = user.UserName,
         });
 
-        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.TwoFactorLogin), onUnitOfWorkComplete: true);
+        var loginEventData = new Dictionary<string, object>
+            {
+                { "ProviderName", provider! },
+            };
+
+        await LocalEventBus.PublishAsync(new UserLoginEvent(user.Id, UserLoginEvent.TwoFactorLogin, loginEventData), onUnitOfWorkComplete: true);
 
         return GetAccountLoginResult(signInResult);
     }
@@ -267,8 +273,9 @@ public virtual async Task SendTfaTokenAsync(string provider)
 
         var token = await UserManager.GenerateTwoFactorTokenAsync(user, provider);
 
-        Logger.LogInformation("User with id '{id}' has been generated new token '{token}' for provider '{provider}'.", user.Id, token, provider);
-
+#if DEBUG
+        Logger.LogDebug("User with id '{id}' has been generated new token '{token}' for provider '{provider}'.", user.Id, token, provider);
+#endif
         await AccountTwoFactorTokenSender.SendAsync(user, provider, token);
     }
 
@@ -290,8 +297,6 @@ public virtual async Task<AccountVerifyTokenResultDto> VerifyTfaTokenAsync(strin
 
         var valid = await UserManager.VerifyTwoFactorTokenAsync(user, provider, input.Token);
 
-        Logger.LogInformation("User with id '{id}' use provider '{provider}' verify two-factor token '{token}' result: {valid}.", user.Id, input.Token, provider, valid);
-
         return new AccountVerifyTokenResultDto
         {
             Valid = valid,
@@ -400,8 +405,6 @@ public virtual async Task<AccountAuthenticatorRecoveryCodesResultDto> VerifyAuth
 
             await UserManager.GetUserIdAsync(user);
 
-            Logger.LogInformation("User with id '{id}' has enabled 2FA with an authenticator app.", user.Id);
-
             await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
             {
                 Identity = IdentitySecurityLogIdentityConsts.IdentityTwoFactor,

modules/account/src/Passingwind.Abp.Account.Application/AccountProfileAppService.cs

@@ -66,8 +66,9 @@ public virtual async Task SendEmailConfirmAsync()
 
         var token = await UserManager.GenerateEmailConfirmationTokenAsync(user);
 
-        Logger.LogInformation("User with id '{id}' has been generated new token '{token}' for email confirmation'.", user.Id, token);
-
+#if DEBUG
+        Logger.LogDebug("User with id '{id}' has been generated new token '{token}' for email confirmation'.", user.Id, token);
+#endif
         await AccountTwoFactorTokenSender.SendEmailConfirmationTokenAsync(user, token);
     }
 
@@ -82,8 +83,6 @@ public virtual async Task UpdateEmailConfirmAsync(AccountVerifyTokenRequestDto i
 
         var result = await UserManager.ConfirmEmailAsync(user, input.Token);
 
-        Logger.LogInformation("User with id '{Id}' valid confirm email token result: {Valid}", user.Id, result.Succeeded);
-
         if (result.Succeeded)
         {
             await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
@@ -114,8 +113,6 @@ public virtual async Task<AccountVerifyTokenResultDto> VerifyEmailConfirmTokenAs
             purpose: IdentityUserManager.ConfirmEmailTokenPurpose,
             token: input.Token);
 
-        Logger.LogInformation("User with id '{Id}' valid confirm email token result: {Valid}", user.Id, valid);
-
         return new AccountVerifyTokenResultDto
         {
             Valid = valid,
@@ -132,9 +129,9 @@ public virtual async Task SendChangePhoneNumberTokenAsync(AccountProfileChangePh
             throw new AbpAuthorizationException();
 
         var token = await UserManager.GenerateChangePhoneNumberTokenAsync(user, input.PhoneNumber);
-
-        Logger.LogInformation("User with id '{id}' has been generated new token '{token}' for change phone number'.", user.Id, token);
-
+#if DEBUG
+        Logger.LogDebug("User with id '{id}' has been generated new token '{token}' for change phone number'.", user.Id, token);
+#endif
         await AccountTwoFactorTokenSender.SendChangePhoneNumberTokenAsync(user, input.PhoneNumber, token);
     }
 
@@ -152,8 +149,6 @@ public virtual async Task<AccountVerifyTokenResultDto> VerifyChangePhoneNumberTo
             token: input.Token,
             phoneNumber: input.PhoneNumber);
 
-        Logger.LogInformation("User with id '{Id}' valid change phone number token result: {Valid}", user.Id, valid);
-
         return new AccountVerifyTokenResultDto
         {
             Valid = valid,
@@ -174,8 +169,6 @@ public virtual async Task ChangePhoneNumberAsync(AccountProfileChangePhoneNumber
             phoneNumber: input.PhoneNumber,
             token: input.Token);
 
-        Logger.LogInformation("User with id '{0}' valid change phone number token result: {1}", user.Id, result.Succeeded);
-
         if (result.Succeeded)
         {
             await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
@@ -202,8 +195,9 @@ public virtual async Task SendChangeEmailTokenAsync(AccountProfileChangeEmailTok
 
         var token = await UserManager.GenerateChangeEmailTokenAsync(user, input.Email);
 
-        Logger.LogInformation("User with id '{id}' has been generated new token '{token}' for change email'.", user.Id, token);
-
+#if DEBUG
+        Logger.LogDebug("User with id '{id}' has been generated new token '{token}' for change email'.", user.Id, token);
+#endif
         await AccountTwoFactorTokenSender.SendChangeEmailTokenAsync(user, input.Email, token);
     }
 
@@ -218,8 +212,6 @@ public virtual async Task<AccountVerifyTokenResultDto> VerifyChangeEmailTokenAsy
 
         var valid = await UserManager.VerifyUserTokenAsync(user, IdentityOptions.Value.Tokens.ChangeEmailTokenProvider, IdentityUserManager.GetChangeEmailTokenPurpose(input.Email), input.Token);
 
-        Logger.LogInformation("User with id '{Id}' valid change email token result: {Valid}", user.Id, valid);
-
         return new AccountVerifyTokenResultDto
         {
             Valid = valid,
@@ -237,8 +229,6 @@ public virtual async Task ChangeEmailAsync(AccountProfileChangeEmailDto input)
 
         var result = await UserManager.ChangeEmailAsync(user, input.Email, input.Token);
 
-        Logger.LogInformation("User with id '{0}' valid change email token result: {1}", user.Id, result.Succeeded);
-
         if (result.Succeeded)
         {
             await SecurityLogManager.SaveAsync(new IdentitySecurityLogContext()