Merge pull request #1100 from enkodellc/IS4-removal

Is4 removal
enkodellc · Apr 8, 2024 · f8759ed · f8759ed
2 parents 4a59a8e + 0dbc38b
commit f8759ed
Show file tree

Hide file tree

Showing 78 changed files with 358 additions and 6,273 deletions.
diff --git a/README.md b/README.md
@@ -120,8 +120,6 @@ This project is licensed under the terms of the [MIT license](LICENSE).
 ### Postgres Support
 *Note this might be out of date.. Delete Existing Migrations in the BlazorBoilerplate.Server/Migrations Folder and then create your own migrations:  
   -`dotnet ef --startup-project ..\BlazorBoilerplate.Server migrations add InitialApplicationDbMigration --context ApplicationDbContext -o Migrations\ApplicationDb`  
-  -`dotnet ef --startup-project ..\BlazorBoilerplate.Server\ migrations add InitialConfigurationDbMigration --context ConfigurationDbContext  -o Migrations\ConfigurationDb`  
-  -`dotnet ef --startup-project ..\BlazorBoilerplate.Server\ migrations add PersistedGrantDbContext --context PersistedGrantDbContext -o Migrations\PersistedGrantDb`  
 
 ### Docker Support
 - Prerequisite: Install [Docker Desktop](https://go.microsoft.com/fwlink/?linkid=847268) 

diff --git a/src/BlazorBoilerplate.sln b/src/BlazorBoilerplate.sln
@@ -65,12 +65,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBoilerplate.Theme.Mud
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBoilerplate.Theme.MudBlazor.Demo", "Shared\Modules\BlazorBoilerplate.Theme.MudBlazor.Demo\BlazorBoilerplate.Theme.MudBlazor.Demo.csproj", "{AA995175-2593-4EBB-BE4F-2367A4D65751}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBoilerplate.IdentityServer.Test1", "Tests\BlazorBoilerplate.IdentityServer.Test1\BlazorBoilerplate.IdentityServer.Test1.csproj", "{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBoilerplate.IdentityServer.Test2", "Tests\BlazorBoilerplate.IdentityServer.Test2\BlazorBoilerplate.IdentityServer.Test2.csproj", "{75C35AD4-0C15-4B78-B721-D1881E44FFF9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorBoilerplate.IdentityServer.Test3", "Tests\BlazorBoilerplate.IdentityServer.Test3\BlazorBoilerplate.IdentityServer.Test3.csproj", "{D0618267-62AC-431C-9F7E-E8120194F969}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC5BA6FF-C7DA-42BD-85FF-7EC07539D896}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -291,42 +285,6 @@ Global
 		{AA995175-2593-4EBB-BE4F-2367A4D65751}.Release|x64.Build.0 = Release|Any CPU
 		{AA995175-2593-4EBB-BE4F-2367A4D65751}.Release|x86.ActiveCfg = Release|Any CPU
 		{AA995175-2593-4EBB-BE4F-2367A4D65751}.Release|x86.Build.0 = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|x64.Build.0 = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Debug|x86.Build.0 = Debug|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|x64.Build.0 = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A}.Release|x86.Build.0 = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|x64.Build.0 = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Debug|x86.Build.0 = Debug|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|x64.ActiveCfg = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|x64.Build.0 = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|x86.ActiveCfg = Release|Any CPU
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9}.Release|x86.Build.0 = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|x64.Build.0 = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Debug|x86.Build.0 = Debug|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|x64.ActiveCfg = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|x64.Build.0 = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|x86.ActiveCfg = Release|Any CPU
-		{D0618267-62AC-431C-9F7E-E8120194F969}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -353,9 +311,6 @@ Global
 		{E421767A-8852-4622-859E-CF4159345BE2} = {BE02426C-DCC8-41E6-BFCE-8A03657F53B5}
 		{E7EF4701-968D-4934-A779-C98D9A194D69} = {BE02426C-DCC8-41E6-BFCE-8A03657F53B5}
 		{AA995175-2593-4EBB-BE4F-2367A4D65751} = {BE02426C-DCC8-41E6-BFCE-8A03657F53B5}
-		{DC3A4B8C-939D-4AF3-824A-21BF7C2F772A} = {1921F468-24D6-43B8-8274-2C980DF05237}
-		{75C35AD4-0C15-4B78-B721-D1881E44FFF9} = {1921F468-24D6-43B8-8274-2C980DF05237}
-		{D0618267-62AC-431C-9F7E-E8120194F969} = {1921F468-24D6-43B8-8274-2C980DF05237}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {75F45143-A365-4C32-A2D5-56BDADCE76CC}

diff --git a/src/Client/BlazorBoilerplate.Client/BlazorBoilerplate.Client.csproj b/src/Client/BlazorBoilerplate.Client/BlazorBoilerplate.Client.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.9" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Client/BlazorBoilerplate.Client/Program.cs b/src/Client/BlazorBoilerplate.Client/Program.cs
@@ -11,7 +11,6 @@
 using Microsoft.JSInterop;
 using System.Globalization;
 using System.Reflection;
-using Toolbelt.Blazor.Extensions.DependencyInjection;
 
 namespace BlazorBoilerplate.Client
 {
@@ -21,7 +20,6 @@ public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-            //TODO see what oqtane does
             var baseModule = new Theme.Material.Module();
             var demoModule = new Theme.Material.Demo.Module();
 
@@ -51,14 +49,6 @@ public static async Task Main(string[] args)
             builder.Services.AddScoped<AppState>();
             builder.Services.AddScoped<IApiClient, ApiClient>();
 
-            builder.Services.AddLoadingBar();
-            builder.UseLoadingBar();
-
-            builder.Services.AddScoped(sp => new HttpClient
-            {
-                BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
-            }.EnableIntercept(sp));
-
             foreach (var module in ModuleProvider.Modules)
                 module.ConfigureWebAssemblyServices(builder.Services);
 

diff --git a/src/Server/BlazorBoilerplate.Server/Authorization/AdditionalUserClaimsPrincipalFactory.cs b/src/Server/BlazorBoilerplate.Server/Authorization/AdditionalUserClaimsPrincipalFactory.cs
@@ -1,6 +1,5 @@
 using BlazorBoilerplate.Infrastructure.AuthorizationDefinitions;
 using BlazorBoilerplate.Infrastructure.Storage.DataModels;
-using IdentityModel;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using System.Security.Claims;
@@ -50,11 +49,11 @@ public async override Task<ClaimsPrincipal> CreateAsync(ApplicationUser user)
             //https://docs.microsoft.com/it-it/aspnet/core/security/authentication/mfa
             if (user.TwoFactorEnabled)
             {
-                identity.AddClaim(new Claim(JwtClaimTypes.AuthenticationMethod, ClaimValues.AuthenticationMethodMFA));
+                identity.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, ClaimValues.AuthenticationMethodMFA));
             }
             else
             {
-                identity.AddClaim(new Claim(JwtClaimTypes.AuthenticationMethod, ClaimValues.AuthenticationMethodPwd));
+                identity.AddClaim(new Claim(ClaimTypes.AuthenticationMethod, ClaimValues.AuthenticationMethodPwd));
             }
 
             return principal;

diff --git a/src/Server/BlazorBoilerplate.Server/BlazorBoilerplate.Server.csproj b/src/Server/BlazorBoilerplate.Server/BlazorBoilerplate.Server.csproj
@@ -19,42 +19,39 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspectInjector" Version="2.7.4" />
+    <PackageReference Include="AspectInjector" Version="2.8.2" />
     <PackageReference Include="AspNet.Security.OAuth.Apple" Version="7.0.2" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" />
-    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.2" />
-    <PackageReference Include="Azure.Identity" Version="1.9.0" />
-    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
-    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.5.1" />
-    <PackageReference Include="Breeze.AspNetCore.NetCore" Version="7.1.0" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.3" />
+    <PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
+    <PackageReference Include="Azure.Identity" Version="1.10.4" />
+    <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.6.0" />
+    <PackageReference Include="Azure.Security.KeyVault.Certificates" Version="4.6.0" />
+    <PackageReference Include="Breeze.AspNetCore.NetCore" Version="7.2.1" />
     <PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
     <PackageReference Include="FormatWith" Version="3.0.1" />
-    <PackageReference Include="IdentityServer4" Version="4.1.2" />
-    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="4.1.2" />
-    <PackageReference Include="IdentityServer4.Contrib.Certificates" Version="0.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="7.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.9" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="7.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="7.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.17" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.17" />
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.17">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.17">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	</PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.8" />
-    <PackageReference Include="NSwag.AspNetCore" Version="13.19.0" />
-    <PackageReference Include="Serilog" Version="3.0.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="7.0.0" />
+    <PackageReference Include="NSwag.AspNetCore" Version="14.0.7" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.1-dev-00947" />
-    <PackageReference Include="MailKit" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.3.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.9" />
+    <PackageReference Include="MailKit" Version="4.4.0" />
+    <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="6.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.17" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
     <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1" />

diff --git a/src/Server/BlazorBoilerplate.Server/Controllers/AccountController.cs b/src/Server/BlazorBoilerplate.Server/Controllers/AccountController.cs
@@ -16,7 +16,7 @@ namespace BlazorBoilerplate.Server.Controllers
     [SecurityHeaders]
     [Route("api/[controller]")]
     [ApiController]
-    public class AccountController : BaseController
+    public class AccountController : ControllerBase
     {
         private readonly IAccountManager _accountManager;
 
@@ -190,4 +190,4 @@ public async Task<ApiResponse> AdminUpdateUser([FromBody] UserViewModel userView
         public async Task<ApiResponse> AdminResetUserPasswordAsync(ChangePasswordViewModel changePasswordViewModel)
         => ModelState.IsValid ? await _accountManager.AdminResetUserPasswordAsync(changePasswordViewModel, User) : _invalidData;
     }
-}
+}