Merge branch 'release/v1.1.0'

Author: EvilLord666

Wissance.Authorization/Wissance.Authorization.Tests/Checkers/UserInfoChecker.cs

@@ -10,10 +10,15 @@ internal static class UserInfoChecker
     {
         public static void Check(UserInfo expected, UserInfo actual)
         {
+            Assert.Equal(expected.UserId, actual.UserId);
             Assert.Equal(expected.UserName, actual.UserName);
             Assert.Equal(expected.FullName, actual.FullName);
             Assert.Equal(expected.Email, actual.Email);
             Assert.Equal(expected.IsEmailVerified, actual.IsEmailVerified);
+            if (expected.Roles == null)
+            {
+                Assert.Null(actual.Roles);
+            }
         }
     }
 }

Wissance.Authorization/Wissance.Authorization.Tests/OpenId/TestKeyCloakOpenIdAuthenticator.cs

@@ -52,19 +52,26 @@ public void TestPrivateClientAuthentication(string userName, string password, st
         }
 
         [Theory]
-        [InlineData(TestUser, TestPassword, TestScope)]
-        public void TestGetUserInfo(string userName, string password, string scope)
+        [InlineData(TestUser, TestPassword, TestScope, true, true)]
+        [InlineData(TestUser, TestPassword, TestScope, false, false)]
+        public void TestGetUserInfo(string userName, string password, string scope, bool isPrivateClient, bool userIdExists)
         {
-            IOpenIdAuthenticator authenticator = new KeyCloakOpenIdAuthenticator(_testPrivateKeyCloakConfig, new LoggerFactory());
+            KeyCloakServerConfig config = isPrivateClient ? _testPrivateKeyCloakConfig : _testPublicKeyCloakConfig;
+            IOpenIdAuthenticator authenticator = new KeyCloakOpenIdAuthenticator(config, new LoggerFactory());
             TokenInfo token = GetToken(authenticator, userName, password, scope);
             Assert.NotNull(token);
             Task<UserInfo> getUserInfoTask = authenticator.GetUserInfoAsync(token.AccessToken, token.TokenType);
             getUserInfoTask.Wait();
             UserInfo actualUserInfo = getUserInfoTask.Result;
             Assert.NotNull(actualUserInfo);
-            UserInfo expectedUserInfo = new UserInfo(actualUserInfo.Session, TestUser, "firstTestName lastTestName",
+            UserInfo expectedUserInfo = new UserInfo(actualUserInfo.UserId, actualUserInfo.Session, TestUser, "firstTestName lastTestName",
                                                      null, false, null);
             UserInfoChecker.Check(expectedUserInfo, actualUserInfo);
+            
+            if (userIdExists)
+            {
+                Assert.NotNull(expectedUserInfo.UserId);
+            }
         }
 
         [Theory]

Wissance.Authorization/Wissance.Authorization/Authentication/OpenIdAuthenticationHandler.cs

@@ -60,9 +60,13 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
                 {
                     new Claim(ClaimTypes.NameIdentifier, userInfo.UserName),
                     new Claim(ClaimTypes.Name, userInfo.FullName)
-                    //new Claim(ClaimTypes.Email, null),
                 };
 
+                if (userInfo.UserId != null)
+                {
+                    claims.Add(new Claim(Wissance.Authorization.Claims.ClaimTypes.UserId, userInfo.UserId));
+                }
+
                 if (userInfo.Email != null)
                     claims.Add(new Claim(ClaimTypes.Email, userInfo.Email));
                 // todo: umv: add Custom claims (EmailVerified & so on )

Wissance.Authorization/Wissance.Authorization/Claims/ClaimTypes.cs

@@ -0,0 +1,7 @@
+namespace Wissance.Authorization.Claims
+{
+    public class ClaimTypes
+    {
+        public const string UserId = "id";
+    }
+}

Wissance.Authorization/Wissance.Authorization/Data/UserInfo.cs

@@ -10,16 +10,18 @@ public UserInfo()
         {
         }
 
-        public UserInfo(string session, string userName, string fullName, string[] roles, bool isEmailVerified, string email)
+        public UserInfo(string userId, string session, string userName, string fullName, string[] roles, bool isEmailVerified, string email)
         {
+            UserId = userId;
             Session = session;
             UserName = userName;
             FullName = fullName;
             Roles = roles;
             IsEmailVerified = isEmailVerified;
             Email = email;
         }
-
+        
+        public string UserId { get; set; }
         public string Session { get; set; }
         public string UserName { get; set; }
         public string FullName { get; set; }

Wissance.Authorization/Wissance.Authorization/Dto/KeyCloak/UserInfoDto.cs

@@ -12,9 +12,10 @@ public UserInfoDto()
 
         }
 
-        public UserInfoDto(string sub, bool isEmailVerified, string[] roles, string name, string userName,
+        public UserInfoDto(string id, string sub, bool isEmailVerified, string[] roles, string name, string userName,
                            string firstName, string lastName)
         {
+            Id = id;
             Sub = sub;
             IsEmailVerified = isEmailVerified;
             Roles = roles;
@@ -23,6 +24,9 @@ public UserInfoDto(string sub, bool isEmailVerified, string[] roles, string name
             FirstName = firstName;
             LastName = lastName;
         }
+        
+        [JsonProperty("id")]
+        public string Id { get; set; }
 
         [JsonProperty("sub")]
         public string Sub { get; set; }

Wissance.Authorization/Wissance.Authorization/OpenId/KeyCloakOpenIdAuthenticator.cs

@@ -52,7 +52,8 @@ public async Task<UserInfo> GetUserInfoAsync(string accessToken, string tokenTyp
                     }
 
                     // todo: umv: add pass and parse e-mail to userinfo
-                    return new UserInfo(kcUserInfo.Sub, kcUserInfo.UserName, kcUserInfo.Name, kcUserInfo.Roles, kcUserInfo.IsEmailVerified, null);
+                    return new UserInfo(kcUserInfo.Id, kcUserInfo.Sub, kcUserInfo.UserName, kcUserInfo.Name, 
+                                        kcUserInfo.Roles, kcUserInfo.IsEmailVerified, null);
                 }
             }
             catch (Exception ex)