clean up some stuff

Author: paule96

KK.AspNetCore.EasyAuthAuthentication.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0

src/KK.AspNetCore.EasyAuthAuthentication/EasyAuthAuthenticationHandler.cs

@@ -39,13 +39,18 @@ public EasyAuthAuthenticationHandler(
         {
         }
 
-        private static Func<ClaimsPrincipal, bool> isContextUserNotAuthenticated = user => (user == null || user.Identity == null || user.Identity.IsAuthenticated == false);
-        private static Func<IHeaderDictionary, bool> isAADIdTokenNotSet = headers => !string.IsNullOrEmpty(headers[AuthTokenHeaderNames.AADIdToken].ToString());
-        private Func<IHeaderDictionary, ClaimsPrincipal, bool> canUseHeaderAuth => (headers, user) => isContextUserNotAuthenticated(user) && !isAADIdTokenNotSet(headers);
-        private Func<IHeaderDictionary, ClaimsPrincipal, HttpRequest, bool> canUseEasyAuthJson => (headers, user, request) =>
-            isContextUserNotAuthenticated(user)
-            && isAADIdTokenNotSet(headers)
-            && request.Path != "/" + $"{this.Options.AuthEndpoint}";
+        private static Func<ClaimsPrincipal, bool> isContextUserNotAuthenticated =
+            user => (user == null || user.Identity == null || user.Identity.IsAuthenticated == false);
+        private static Func<IHeaderDictionary, string, bool> isHeaderSet =
+            (headers, headerName) => !string.IsNullOrEmpty(headers[headerName].ToString());
+        private Func<IHeaderDictionary, ClaimsPrincipal, bool> canUseHeaderAuth =
+            (headers, user) => isContextUserNotAuthenticated(user) &&
+            isHeaderSet(headers, AuthTokenHeaderNames.AADIdToken);
+        private static Func<IHeaderDictionary, ClaimsPrincipal, HttpRequest, string, bool> canUseEasyAuthJson =
+            (headers, user, request, authEndpoint) =>
+                isContextUserNotAuthenticated(user)
+                && !isHeaderSet(headers, AuthTokenHeaderNames.AADIdToken)
+                && request.Path != "/" + $"{authEndpoint}";
 
         /// <inheritdoc/>
         protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
@@ -56,7 +61,7 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
             {
                 return EasyAuthWithHeaderService.AuthUser(this.Logger, this.Context);
             }
-            else if (canUseEasyAuthJson(this.Context.Request.Headers, this.Context.User, this.Context.Request))
+            else if (canUseEasyAuthJson(this.Context.Request.Headers, this.Context.User, this.Context.Request, this.Options.AuthEndpoint))
             {
                 return await EasyAuthWithAuthMeService.AuthUser(this.Logger, this.Context, this.Options.AuthEndpoint);
             }

src/KK.AspNetCore.EasyAuthAuthentication/KK.AspNetCore.EasyAuthAuthentication.csproj

@@ -16,7 +16,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
   </ItemGroup>
 
   <!-- StyleCop Settings -->
@@ -25,12 +26,6 @@
     <CodeAnalysisRuleSet>..\..\StyleCop.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta009" privateassets="all" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.3.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.IdentityModel.Tokens.Jwt">
-      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\system.identitymodel.tokens.jwt\5.2.0\lib\netstandard1.4\System.IdentityModel.Tokens.Jwt.dll</HintPath>
-    </Reference>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" privateassets="all" />
   </ItemGroup>
 </Project>

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthWithAuthMeService.cs

@@ -36,7 +36,6 @@ private EasyAuthWithAuthMeService(
             Headers = headers;
             AuthEndPoint = authEndPoint;
             this.Logger = logger;
-
         }
 
         /// <summary>

src/KK.AspNetCore.EasyAuthAuthentication/Services/EasyAuthWithHeaderService.cs

@@ -14,6 +14,12 @@ namespace KK.AspNetCore.EasyAuthAuthentication.Services
 {
     public class EasyAuthWithHeaderService
     {
+        public const string PrincipalNameHeader = "X-MS-CLIENT-PRINCIPAL-NAME";
+        /// <summary>
+        /// JWT
+        /// </summary>
+        public const string PrincipalObjectHeader = "X-MS-CLIENT-PRINCIPAL";
+        public const string PrincipalIdpHeaderName = "X-MS-CLIENT-PRINCIPAL-IDP";
         public ILogger Logger { get; }
         public IHeaderDictionary Headers { get; }
 
@@ -44,14 +50,14 @@ public static AuthenticateResult AuthUser(ILogger logger, HttpContext context)
 
         private AuthenticationTicket BuildIdentityFromEasyAuthRequestHeaders()
         {
-            var name = this.Headers["X-MS-CLIENT-PRINCIPAL-NAME"][0];
+            var name = this.Headers[PrincipalNameHeader][0];
             this.Logger.LogDebug($"payload was fetched from easyauth headers, name: {name}");
 
             var identity = new GenericIdentity(name, AuthenticationTypesNames.Federation); // setting ClaimsIdentity.AuthenticationType to value that azureAd non-easyauth setups use
 
             this.Logger.LogInformation("building claims from payload...");
 
-            var xMsClientPrincipal = JObject.Parse(Encoding.UTF8.GetString(Convert.FromBase64String(this.Headers["X-MS-CLIENT-PRINCIPAL"][0])));
+            var xMsClientPrincipal = JObject.Parse(Encoding.UTF8.GetString(Convert.FromBase64String(this.Headers[PrincipalObjectHeader][0])));
             var claims = xMsClientPrincipal["claims"].Children<JObject>();
             var providerName = this.Headers["X-MS-CLIENT-PRINCIPAL-IDP"][0];
             return AuthenticationTicketBuilder.Build(claims, name, providerName);