Merge pull request #848 from RayWangQvQ/develop

[#847] DefaultRequestHeaders can not be null or empty
RayWangQvQ · Feb 22, 2025 · 794a01f · 794a01f
2 parents d76206d + d56aa91
commit 794a01f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 2.2.1
+-Fix[#847]: DefaultRequestHeaders can not be null or empty with dotnet 8
 ## 2.2.0
 - Migrate from dotnet 6.0 to dotnet 8.0
 - Add Bruno to document the APIs

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Authors>Ray</Authors>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/src/Ray.BiliBiliTool.Agent/Extensions/ServiceCollectionExtension.cs b/src/Ray.BiliBiliTool.Agent/Extensions/ServiceCollectionExtension.cs
@@ -63,11 +63,13 @@ public static IServiceCollection AddBiliBiliClientApi(this IServiceCollection se
         //bilibli
         Action<IServiceProvider, HttpClient> config = (sp, c) => {
             c.DefaultRequestHeaders.Add("User-Agent", sp.GetRequiredService<IOptionsMonitor<SecurityOptions>>().CurrentValue.UserAgent);
-            c.DefaultRequestHeaders.Add("Cookie", sp.GetRequiredService<BiliCookie>().ToString());
+            var ck = sp.GetRequiredService<BiliCookie>().ToString();
+            if(!string.IsNullOrWhiteSpace(ck)) c.DefaultRequestHeaders.Add("Cookie", ck);
         };
         Action<IServiceProvider, HttpClient> configApp = (sp, c) => {
             c.DefaultRequestHeaders.Add("User-Agent", sp.GetRequiredService<IOptionsMonitor<SecurityOptions>>().CurrentValue.UserAgentApp);
-            c.DefaultRequestHeaders.Add("Cookie", sp.GetRequiredService<BiliCookie>().ToString());
+            var ck = sp.GetRequiredService<BiliCookie>().ToString();
+            if(!string.IsNullOrWhiteSpace(ck)) c.DefaultRequestHeaders.Add("Cookie", ck);
         };
 
         services.AddBiliBiliClientApi<IUserInfoApi>(BiliHosts.Api, config);