Merge remote-tracking branch 'origin/master' into add_all_providers

Author: paule96

.github/dependabot.yml

@@ -0,0 +1,9 @@
+# Basic set up for three package managers
+
+version: 2
+updates:
+  # Maintain dependencies for Composer
+  - package-ecosystem: "nuget"
+    directory: "/src/"
+    schedule:
+      interval: "weekly"

src/CZ.AspNetCore.EasyAuthAuthentication/Services/EasyAuthForAuthorizationTokenService.cs

@@ -70,11 +70,15 @@ private bool CanHandleAuthentification(HttpContext httpContext) =>
 
         private IEnumerable<AADClaimsModel> BuildFromAuthToken(JObject xMsClientPrincipal, ProviderOptions options)
         {
-            this.logger.LogDebug($"payload was {xMsClientPrincipal[this.defaultOptions.RoleClaimType].ToString()}");
+            var claims = new List<AADClaimsModel>();
 
-            var claims = JsonConvert.DeserializeObject<IEnumerable<string>>(xMsClientPrincipal[this.defaultOptions.RoleClaimType].ToString())
-                    .Select(r => new AADClaimsModel { Typ = this.defaultOptions.RoleClaimType, Values = r })
-                    .ToList();
+            if (xMsClientPrincipal.ContainsKey(this.defaultOptions.RoleClaimType))
+            {
+                this.logger.LogDebug($"payload was {xMsClientPrincipal[this.defaultOptions.RoleClaimType]}");
+
+                claims.AddRange(JsonConvert.DeserializeObject<IEnumerable<string>>(xMsClientPrincipal[this.defaultOptions.RoleClaimType].ToString())
+                        .Select(r => new AADClaimsModel { Typ = this.defaultOptions.RoleClaimType, Values = r }));
+            }
             var otherClaims = xMsClientPrincipal.Properties()
                 .Where(claimToken => claimToken.Name != this.defaultOptions.RoleClaimType)
                 .Select(claimToken => new AADClaimsModel { Typ = claimToken.Name, Values = claimToken.Value.ToString() })

test/CZ.AspNetCore.EasyAuthAuthentication.Test/Services/EasyAuthForAuthorizationTokenServiceTest.cs

@@ -113,5 +113,21 @@ public void IfAValidJwtTokenWithoutIdpAndIssPropertyIsInTheHeaderItsThrowsAnErro
             // Act && Arrange
             _ = Assert.Throws<ArgumentException>(() => handler.AuthUser(httpcontext));
         }
+
+        [Fact]
+        public void IfAValidJwtTokenWithoutTheClaimPropertyIsInTheHeaderItsNotThrowAnError()
+        {
+            // Arrange
+            var handler = new EasyAuthForAuthorizationTokenService(this.loggerFactory.CreateLogger<EasyAuthForAuthorizationTokenService>());
+            var httpcontext = new DefaultHttpContext();
+            var jwtWithoutIdpProperty = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiIwN2Q2ZDE1YS1jZTg5LTQ4MmMtOTcxYi01NDMxYjc1MTkxNjciLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC9lOTgxZGNhZi05MTk3LTQ3N2YtYmQwNi0wZTU3MmIwYjMzNDcvIiwiaWF0IjoxNTYyNjk4ODc2LCJuYmYiOjE1NjI2OTg4NzYsImV4cCI6MTU2MjcwMjc3NiwiYWlvIjoiNDJaZ1lPQmZzRzd0ZEg1ZVBpSHZvNU9QdDdyT0J3QT0iLCJhcHBpZCI6ImQzMTViZmFmLTYzMDQtNGY5Zi04MjFjLTU0NmJkYzAwYjViMCIsImFwcGlkYWNyIjoiMSIsIm9pZCI6ImY1ZjlmYTg2LTQ0MTQtNDRjNy04MGY4LWY3ODBhZTBhYmYyMSIsInN1YiI6ImY1ZjlmYTg2LTQ0MTQtNDRjNy04MGY4LWY3ODBhZTBhYmYyMSIsInRpZCI6ImU5ODFkY2FmLTkxOTctNDc3Zi1iZDA2LTBlNTcyYjBiMzM0NyIsInV0aSI6ImhDSnUzb2g3d1VlWmFpNVFKT1lBQUEiLCJ2ZXIiOiIxLjAifQ.HFVt3Moojs3G7J5CoqfJ8lDtxUf3SsO1bGb8_9O-314";
+            httpcontext.Request.Headers.Add("Authorization", jwtWithoutIdpProperty);
+
+            // Act
+            var result = handler.AuthUser(httpcontext);
+            // Arrange
+            Assert.True(result.Succeeded);
+            Assert.Equal(this.testJwtAppId, result.Principal.Identity.Name);
+        }
     }
 }