fix: 修正遺漏屬性

Author: arenchen

Helpers/ContextStateHelper.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Microsoft.Net.Http.Headers;
 using Netcorext.Contracts;
 
 namespace Netcorext.Extensions.Grpc.Helpers;
@@ -7,7 +8,7 @@ public static class ContextStateHelper
 {
     public static string? GetAuthorizationToken(this IContextState context, IHeaderDictionary? headers)
     {
-        if (headers?.TryGetValue("Authorization", out var authorization) == true && !string.IsNullOrWhiteSpace(authorization))
+        if (headers?.TryGetValue(HeaderNames.Authorization, out var authorization) == true && !string.IsNullOrWhiteSpace(authorization))
             return authorization;
         if (context.User?.Identity == null)
             return null;

Interceptors/AuthorizationHeaderInterceptor.cs

@@ -1,5 +1,6 @@
 using Grpc.Core;
 using Grpc.Core.Interceptors;
+using Microsoft.Net.Http.Headers;
 using Netcorext.Contracts;
 using Netcorext.Extensions.Grpc.Helpers;
 
@@ -25,7 +26,7 @@ public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(TR
         if (string.IsNullOrWhiteSpace(authorization))
             return continuation(request, context);
 
-        var metadata = new Metadata { { "Authorization", $"{authorization}" } };
+        var metadata = new Metadata { { HeaderNames.Authorization, $"{authorization}" } };
         var options = context.Options.WithHeaders(metadata);
         var newContext = new ClientInterceptorContext<TRequest, TResponse>(context.Method, context.Host, options);
 
@@ -39,7 +40,7 @@ public override TResponse BlockingUnaryCall<TRequest, TResponse>(TRequest reques
         if (string.IsNullOrWhiteSpace(authorization))
             return continuation(request, context);
 
-        var metadata = new Metadata { { "Authorization", $"{authorization}" } };
+        var metadata = new Metadata { { HeaderNames.Authorization, $"{authorization}" } };
         var options = context.Options.WithHeaders(metadata);
         var newContext = new ClientInterceptorContext<TRequest, TResponse>(context.Method, context.Host, options);
 

Interceptors/OriginHeaderPassingInterceptor.cs

@@ -1,5 +1,7 @@
 using Grpc.Core;
 using Grpc.Core.Interceptors;
+using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 using Netcorext.Contracts;
 using Netcorext.Extensions.Grpc.Helpers;
 using Netcorext.Extensions.Grpc.Options;
@@ -26,11 +28,15 @@ public override AsyncUnaryCall<TResponse> AsyncUnaryCall<TRequest, TResponse>(TR
         var entries = _httpContextAccessor.HttpContext?.Request.Headers
                                           .Where(_options.Handler)
                                           .Select(t => new Metadata.Entry(t.Key.ToLower(), t.Value))
-                                          .ToArray();
+                                          .ToList() ?? new List<Metadata.Entry>();
 
         var authorization = _contextState.GetAuthorizationToken(_httpContextAccessor.HttpContext?.Request.Headers);
+        var authorizationHeader = new KeyValuePair<string, StringValues>(HeaderNames.Authorization, authorization);
 
-        if (entries?.Any() != true)
+        if (_options.Handler(authorizationHeader))
+            entries.Add(new Metadata.Entry(authorizationHeader.Key, authorizationHeader.Value));
+
+        if (entries.Count == 0)
             return continuation(request, context);
 
         var metadata = new Metadata();
@@ -52,11 +58,15 @@ public override TResponse BlockingUnaryCall<TRequest, TResponse>(TRequest reques
         var entries = _httpContextAccessor.HttpContext?.Request.Headers
                                           .Where(_options.Handler)
                                           .Select(t => new Metadata.Entry(t.Key.ToLower(), t.Value))
-                                          .ToArray();
+                                          .ToList() ?? new List<Metadata.Entry>();
 
         var authorization = _contextState.GetAuthorizationToken(_httpContextAccessor.HttpContext?.Request.Headers);
+        var authorizationHeader = new KeyValuePair<string, StringValues>(HeaderNames.Authorization, authorization);
+
+        if (_options.Handler(authorizationHeader))
+            entries.Add(new Metadata.Entry(authorizationHeader.Key, authorizationHeader.Value));
 
-        if (entries?.Any() != true)
+        if (entries.Count == 0)
             return continuation(request, context);
 
         var metadata = new Metadata();

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 NETCOREXT
+Copyright (c) 2025 NETCOREXT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Options/OriginHeaderPassingInterceptorOptions.cs

@@ -1,9 +1,9 @@
-using Grpc.Core;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 
 namespace Netcorext.Extensions.Grpc.Options;
 
 public class OriginHeaderPassingInterceptorOptions
 {
-    public Func<KeyValuePair<string, StringValues>, bool> Handler { get; set; } = entry => entry.Key == "Authorization";
+    public Func<KeyValuePair<string, StringValues>, bool> Handler { get; set; } = entry => entry.Key == HeaderNames.Authorization;
 }