return userId after login

Author: damienmoulard

Diff for: Zenergy/Zenergy/Controllers/AccountController.cs

@@ -271,7 +271,7 @@ public async Task<IHttpActionResult> GetExternalLogin(string provider, string er
                 ClaimsIdentity cookieIdentity = await user.GenerateUserIdentityAsync(UserManager,
                     CookieAuthenticationDefaults.AuthenticationType);
 
-                AuthenticationProperties properties = ApplicationOAuthProvider.CreateProperties(user.UserName);
+                AuthenticationProperties properties = ApplicationOAuthProvider.CreateProperties(null, user.UserName);
                 Authentication.SignIn(properties, oAuthIdentity, cookieIdentity);
             }
             else

Diff for: Zenergy/Zenergy/Providers/ApplicationOAuthProvider.cs

@@ -51,7 +51,9 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
             identity.AddClaim(new Claim("mail", context.UserName));
             identity.AddClaim(new Claim("role", "user"));
             identity.AddClaim(new Claim(ClaimTypes.Name, context.UserName));
-            
+            //identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, user.userId.ToString()));
+            identity.AddClaim(new Claim("UserId", user.userId.ToString()));
+
             if (user.member != null)
             {
                 identity.AddClaim(new Claim(ClaimTypes.Role, "Member"));
@@ -69,7 +71,7 @@ public override async Task GrantResourceOwnerCredentials(OAuthGrantResourceOwner
                 identity.AddClaim(new Claim(ClaimTypes.Role, "Admin"));
             }
 
-            AuthenticationProperties properties = CreateProperties(user.mail);
+            AuthenticationProperties properties = CreateProperties(user.userId.ToString(), user.mail);
             AuthenticationTicket ticket = new AuthenticationTicket(identity, properties);
             context.Validated(ticket);
             //context.Request.Context.Authentication.SignIn(cookiesIdentity);
@@ -83,6 +85,8 @@ public override Task TokenEndpoint(OAuthTokenEndpointContext context)
                 context.AdditionalResponseParameters.Add(property.Key, property.Value);
             }
 
+            context.AdditionalResponseParameters.Add("userID", context.Identity.GetUserId());
+
             return Task.FromResult<object>(null);
         }
 
@@ -112,10 +116,11 @@ public override Task ValidateClientRedirectUri(OAuthValidateClientRedirectUriCon
             return Task.FromResult<object>(null);
         }
 
-        public static AuthenticationProperties CreateProperties(string userName)
+        public static AuthenticationProperties CreateProperties(string userId, string userName)
         {
             IDictionary<string, string> data = new Dictionary<string, string>
             {
+                { "userId", userId },
                 { "userName", userName }
             };
             return new AuthenticationProperties(data);