config: update some logic and NuGet packages (DO NOT UPDATE Authentic…

…ation packages!!!)
Vasar007 · Jan 19, 2025 · fe62570 · fe62570
1 parent 3fea0b2
commit fe62570
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 31 deletions.
diff --git a/ProjectV/Directory.Packages.props b/ProjectV/Directory.Packages.props
@@ -16,32 +16,32 @@
     <PackageVersion Include="Gridsum.DataflowEx" Version="2.0.0" />
     <PackageVersion Include="HttpToSocks5Proxy" Version="1.4.0" />
     <PackageVersion Include="JsonSubTypes" Version="2.0.1" />
-    <PackageVersion Include="MaterialDesignColors" Version="3.1.0" />
-    <PackageVersion Include="MaterialDesignThemes" Version="5.1.0" />
+    <PackageVersion Include="MaterialDesignColors" Version="5.2.1" />
+    <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.11" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.3.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Moq" Version="4.20.70" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.3.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.15" />
     <PackageVersion Include="NLog.Schema" Version="5.3.4" />
-    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
     <PackageVersion Include="OmdbApiNet" Version="1.3.0" />
     <PackageVersion Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageVersion Include="Prism.Unity" Version="9.0.537" />
@@ -50,14 +50,14 @@
     <PackageVersion Include="SteamWebApiLib" Version="1.1.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
-    <PackageVersion Include="Telegram.Bot" Version="22.2.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.1" />
+    <PackageVersion Include="Telegram.Bot" Version="22.3.0" />
     <PackageVersion Include="TMDbLib" Version="2.2.0" />
     <PackageVersion Include="Unquote" Version="7.0.1" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/ProjectV/Libraries/ProjectV.Configuration/config.json b/ProjectV/Libraries/ProjectV.Configuration/config.json
@@ -17,11 +17,12 @@
       "ProcessingServiceApiUrl": "api/v1/processing"
     },
     "HttpClient": {
-      "ValidateServerCertificates": "true"
+      "ValidateServerCertificates": "false"
     }
   },
 
   "UserServiceOptions": {
+    "AllowSignup": "false",
     "ShouldCreateSystemUser": "true",
     "CanUseSystemUserToAuthenticate": "true"
   }

diff --git a/ProjectV/Libraries/ProjectV.Core/Authorization/Tokens/Caches/TokenCache .cs b/ProjectV/Libraries/ProjectV.Core/Authorization/Tokens/Caches/TokenCache .cs
@@ -62,13 +62,14 @@ private bool IsTokenValid()
                 return false;
             }
 
-            if (string.IsNullOrWhiteSpace(_cachedResponse.Value.Ok.AccessToken.Token))
+            var accessToken = _cachedResponse.Value.Ok.AccessToken;
+            if (string.IsNullOrWhiteSpace(accessToken.Token))
             {
                 return false;
             }
 
             // Now we check only access token.
-            return _cachedResponse.Value.Ok.AccessToken.ExpiryDateUtc > DateTime.UtcNow;
+            return accessToken.ExpiryDateUtc > DateTime.UtcNow;
         }
 
         private async Task<Result<TokenResponse, ErrorResponse>> RequestToken(LoginRequest login,

diff --git a/ProjectV/Libraries/ProjectV.Core/Authorization/Tokens/Clients/TokenClient.cs b/ProjectV/Libraries/ProjectV.Core/Authorization/Tokens/Clients/TokenClient.cs
@@ -50,10 +50,10 @@ public TokenClient(
 
         public TokenClient(
             IHttpClientFactory httpClientFactory,
-            IOptions<ProjectVServiceOptions> serivceSettings)
+            IOptions<ProjectVServiceOptions> serviceSettings)
             : this(
                 httpClientFactory,
-                serivceSettings.GetCheckedValue()
+                serviceSettings.GetCheckedValue()
             )
         {
         }

diff --git a/ProjectV/WebServices/ProjectV.CommonWebApi/Service/Extensions/ServiceCollectionExtensions.cs b/ProjectV/WebServices/ProjectV.CommonWebApi/Service/Extensions/ServiceCollectionExtensions.cs
@@ -40,7 +40,7 @@ public static IServiceCollection AddJtwAuthentication(this IServiceCollection se
                         ValidIssuer = jwtOptions.Issuer,
                         ValidAudience = jwtOptions.Audience,
                         IssuerSigningKey = key,
-                        ClockSkew = TimeSpan.Zero
+                        ClockSkew = TimeSpan.Zero,
                     };
                 });
 

diff --git a/ProjectV/WebServices/ProjectV.CommunicationWebService/appsettings.json b/ProjectV/WebServices/ProjectV.CommunicationWebService/appsettings.json
@@ -19,7 +19,7 @@
       "ProcessingServiceApiUrl": "api/v1/processing"
     },
     "HttpClient": {
-      "ValidateServerCertificates": "true"
+      "ValidateServerCertificates": "false"
     }
   },
 

diff --git a/ProjectV/WebServices/ProjectV.TelegramBotWebService/appsettings.json b/ProjectV/WebServices/ProjectV.TelegramBotWebService/appsettings.json
@@ -19,14 +19,14 @@
       "ProcessingServiceApiUrl": "api/v1/processing"
     },
     "HttpClient": {
-      "ValidateServerCertificates": "true"
+      "ValidateServerCertificates": "false"
     }
   },
 
   "TelegramBotWebServiceOptions": {
     "Bot": {
       "Webhook": {
-        "Url": "https://link.ngrok.io",
+        "Url": "https://2a7d-2a02-8308-9002-4000-842d-a50c-9c5d-3102.ngrok-free.app",
         "BotApiUrl": "bot"
       },
       "Polling": {