From 6e1b67609aea84f46ee80b1816872317d910f6fd Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sat, 27 Dec 2025 15:38:44 +0800
Subject: [PATCH] :bug: Fix bugs related to new depedecies versions

---
 DysonNetwork.Drive/Storage/FileService.cs                      | 2 +-
 DysonNetwork.Insight/Thought/Plugins/SnAccountKernelPlugin.cs  | 3 +--
 .../Auth/OidcProvider/Controllers/OidcProviderController.cs    | 2 +-
 .../Auth/OidcProvider/Services/OidcProviderService.cs          | 1 +
 DysonNetwork.Pass/Auth/OpenId/UserInfoStrategies.cs            | 2 --
 DysonNetwork.Shared/DysonNetwork.Shared.csproj                 | 2 ++
 DysonNetwork.Zone/Pages/Shared/_LayoutContained.cshtml         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DysonNetwork.Drive/Storage/FileService.cs b/DysonNetwork.Drive/Storage/FileService.cs
index ac8965c..29ae955 100644
--- a/DysonNetwork.Drive/Storage/FileService.cs
+++ b/DysonNetwork.Drive/Storage/FileService.cs
@@ -793,7 +793,7 @@ file class UpdatableCloudFile(SnCloudFile file)
     public Dictionary<string, object?>? UserMeta { get; set; } = file.UserMeta;
     public bool IsMarkedRecycle { get; set; } = file.IsMarkedRecycle;
 
-    public Expression<Func<SetPropertyCalls<SnCloudFile>, SetPropertyCalls<SnCloudFile>>> ToSetPropertyCalls()
+    public Action<UpdateSettersBuilder<SnCloudFile>> ToSetPropertyCalls()
     {
         var userMeta = UserMeta ?? [];
         return setter => setter
diff --git a/DysonNetwork.Insight/Thought/Plugins/SnAccountKernelPlugin.cs b/DysonNetwork.Insight/Thought/Plugins/SnAccountKernelPlugin.cs
index e37a9b8..1403ea2 100644
--- a/DysonNetwork.Insight/Thought/Plugins/SnAccountKernelPlugin.cs
+++ b/DysonNetwork.Insight/Thought/Plugins/SnAccountKernelPlugin.cs
@@ -1,6 +1,5 @@
 using DysonNetwork.Shared.Models;
 using DysonNetwork.Shared.Proto;
-using Microsoft.IdentityModel.Tokens;
 using Microsoft.SemanticKernel;
 
 namespace DysonNetwork.Insight.Thought.Plugins;
@@ -24,6 +23,6 @@ public class SnAccountKernelPlugin(
         var request = new LookupAccountBatchRequest();
         request.Names.Add(username);
         var response = await accountClient.LookupAccountBatchAsync(request);
-        return response.Accounts.IsNullOrEmpty() ? null : SnAccount.FromProtoValue(response.Accounts[0]);
+        return response.Accounts.Count == 0 ? null : SnAccount.FromProtoValue(response.Accounts[0]);
     }
 }
\ No newline at end of file
diff --git a/DysonNetwork.Pass/Auth/OidcProvider/Controllers/OidcProviderController.cs b/DysonNetwork.Pass/Auth/OidcProvider/Controllers/OidcProviderController.cs
index 75ae9e5..49a9203 100644
--- a/DysonNetwork.Pass/Auth/OidcProvider/Controllers/OidcProviderController.cs
+++ b/DysonNetwork.Pass/Auth/OidcProvider/Controllers/OidcProviderController.cs
@@ -8,9 +8,9 @@ using System.Text.Json.Serialization;
 using System.Web;
 using DysonNetwork.Pass.Auth.OidcProvider.Options;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
 using NodaTime;
 using DysonNetwork.Shared.Models;
+using Microsoft.IdentityModel.Tokens;
 
 namespace DysonNetwork.Pass.Auth.OidcProvider.Controllers;
 
diff --git a/DysonNetwork.Pass/Auth/OidcProvider/Services/OidcProviderService.cs b/DysonNetwork.Pass/Auth/OidcProvider/Services/OidcProviderService.cs
index bcbeebe..b9eec02 100644
--- a/DysonNetwork.Pass/Auth/OidcProvider/Services/OidcProviderService.cs
+++ b/DysonNetwork.Pass/Auth/OidcProvider/Services/OidcProviderService.cs
@@ -13,6 +13,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 using NodaTime;
 using AccountContactType = DysonNetwork.Shared.Models.AccountContactType;
+using JwtRegisteredClaimNames = Microsoft.IdentityModel.JsonWebTokens.JwtRegisteredClaimNames;
 
 namespace DysonNetwork.Pass.Auth.OidcProvider.Services;
 
diff --git a/DysonNetwork.Pass/Auth/OpenId/UserInfoStrategies.cs b/DysonNetwork.Pass/Auth/OpenId/UserInfoStrategies.cs
index 972afe4..2f48300 100644
--- a/DysonNetwork.Pass/Auth/OpenId/UserInfoStrategies.cs
+++ b/DysonNetwork.Pass/Auth/OpenId/UserInfoStrategies.cs
@@ -1,7 +1,5 @@
 using System.IdentityModel.Tokens.Jwt;
-using System.Security.Cryptography;
 using System.Text.Json;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 
 namespace DysonNetwork.Pass.Auth.OpenId;
diff --git a/DysonNetwork.Shared/DysonNetwork.Shared.csproj b/DysonNetwork.Shared/DysonNetwork.Shared.csproj
index 567c9dc..c177968 100644
--- a/DysonNetwork.Shared/DysonNetwork.Shared.csproj
+++ b/DysonNetwork.Shared/DysonNetwork.Shared.csproj
@@ -26,6 +26,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.3.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.1" />
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.1" />
+        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.15.0" />
         <PackageReference Include="NATS.Net" Version="2.7.0" />
         <PackageReference Include="NodaTime" Version="3.2.3" />
         <PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.2.0" />
@@ -37,6 +38,7 @@
         <PackageReference Include="StackExchange.Redis" Version="2.10.1" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
         <PackageReference Include="Yarp.ReverseProxy" Version="2.3.0" />
 
         <PackageReference Include="Aspire.NATS.Net" Version="13.1.0" />
diff --git a/DysonNetwork.Zone/Pages/Shared/_LayoutContained.cshtml b/DysonNetwork.Zone/Pages/Shared/_LayoutContained.cshtml
index 8ed8faf..3efc865 100644
--- a/DysonNetwork.Zone/Pages/Shared/_LayoutContained.cshtml
+++ b/DysonNetwork.Zone/Pages/Shared/_LayoutContained.cshtml
@@ -12,7 +12,7 @@
         <a class="btn btn-ghost text-xl" href="/">@siteDisplayName</a>
     </div>
     <div class="flex-none">
-        @if (site?.Config.NavItems is null || site.Config.NavItems.IsNullOrEmpty())
+        @if (site?.Config.NavItems is null || site.Config.NavItems.Count == 0)
         {
             @*Use preset navs*@
             <ul class="menu menu-horizontal px-1">