JwtBearerTokenResolver should handle null HttpContext (#226)

osstotalsoft · May 27, 2022 · 81e4244 · 81e4244
1 parent 7d1b6d8
commit 81e4244
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/MultiTenancy/NBB.MultiTenancy.Identification.Http/JwtBearerTokenResolver.cs b/src/MultiTenancy/NBB.MultiTenancy.Identification.Http/JwtBearerTokenResolver.cs
@@ -23,7 +23,9 @@ public JwtBearerTokenResolver(IHttpContextAccessor httpContextAccessor, string p
 
         public Task<string> GetTenantToken()
         {
-            if (!_httpContextAccessor.HttpContext.Request.Headers.ContainsKey(HeaderNames.Authorization))
+
+            var hasAuthorizationHeader = _httpContextAccessor?.HttpContext?.Request?.Headers?.ContainsKey(HeaderNames.Authorization) ?? false;
+            if (!hasAuthorizationHeader)
             {
                 return Task.FromResult((string)null);
             }