updated the blazor

antosubash · Jan 19, 2024 · 686c699 · 686c699
1 parent e713f67
commit 686c699
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 30 deletions.
diff --git a/src/apps/Tasky.Blazor.Server/Properties/launchSettings.json b/src/apps/Tasky.Blazor.Server/Properties/launchSettings.json
@@ -14,7 +14,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "dotnetRunMessages": "true",
-      "applicationUrl": "https://localhost:44336/"
+      "applicationUrl": "https://localhost:5001/"
     },
     "Docker": {
       "commandName": "Docker",
@@ -28,8 +28,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "https://localhost:44336/",
-      "sslPort": 44336
+      "applicationUrl": "https://localhost:5001/",
+      "sslPort": 5001
     }
   }
 }
diff --git a/src/apps/Tasky.Blazor.Server/Tasky.Blazor.Server.csproj b/src/apps/Tasky.Blazor.Server/Tasky.Blazor.Server.csproj
@@ -16,12 +16,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.0" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.4.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.4.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.1" />
     <PackageReference Include="DistributedLock.Redis" Version="1.0.2" />
   </ItemGroup>
 

diff --git a/src/apps/Tasky.Blazor.Server/TaskyServerBlazorModule.cs b/src/apps/Tasky.Blazor.Server/TaskyServerBlazorModule.cs
@@ -165,15 +165,19 @@ private void ConfigureAuthentication(ServiceConfigurationContext context, IConfi
                 options.ResponseType = OpenIdConnectResponseType.CodeIdToken;
 
                 options.ClientId = configuration["AuthServer:ClientId"];
-                options.ClientSecret = configuration["AuthServer:ClientSecret"];
+                // options.ClientSecret = configuration["AuthServer:ClientSecret"];
 
                 options.SaveTokens = true;
                 options.GetClaimsFromUserInfoEndpoint = true;
 
+                options.Scope.Add("openid");
+                options.Scope.Add("profile");
                 options.Scope.Add("roles");
                 options.Scope.Add("email");
                 options.Scope.Add("phone");
-                options.Scope.Add("Tasky");
+                options.Scope.Add("SaasService");
+                options.Scope.Add("IdentityService");
+                options.Scope.Add("AdministrationService");
             });
     }
 

diff --git a/src/apps/Tasky.Blazor.Server/appsettings.json b/src/apps/Tasky.Blazor.Server/appsettings.json
@@ -4,7 +4,7 @@
   },
   "RemoteServices": {
     "Default": {
-      "BaseUrl": "https://localhost:7000/"
+      "BaseUrl": "https://localhost:7500/"
     }
   },
   "Redis": {

diff --git a/src/apps/Tasky.Blazor/Tasky.Blazor.csproj b/src/apps/Tasky.Blazor/Tasky.Blazor.csproj
@@ -1,23 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
-    <UserSecretsId>542122a3-33dc-4ba5-b115-1ec20694b784</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.4.1" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.4.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" />
     <PackageReference Include="OpenIddict.Abstractions" Version="5.1.0" />
+
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="3.0.2" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="3.0.*-*" />
   </ItemGroup>
 
   <ItemGroup>
@@ -30,5 +31,4 @@
     <PackageReference Include="Volo.Abp.SettingManagement.Blazor.WebAssembly" Version="8.0.2" />
   </ItemGroup>
 
-
 </Project>
diff --git a/src/apps/Tasky.Blazor/wwwroot/global.css b/src/apps/Tasky.Blazor/wwwroot/global.css
diff --git a/src/apps/Tasky.Blazor/wwwroot/global.js b/src/apps/Tasky.Blazor/wwwroot/global.js
diff --git a/src/apps/Tasky.Blazor/wwwroot/index.html b/src/apps/Tasky.Blazor/wwwroot/index.html
@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=638126061876781070" rel="stylesheet"/>
+    <link href="global.css?_v=638382754995487892" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="Tasky.Blazor.styles.css" rel="stylesheet"/>
@@ -24,7 +24,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=638126061880561977"></script>
+    <script src="global.js?_v=638382754996896182"></script>
     <!--/ABP:Scripts-->
 
 </body>