Merge pull request #86 from rcyq/master

hikalkan · web-flow · commit f29ae1384a87 · 2017-07-20T12:08:52.000+03:00
Fixed Authenticate action in TokenAuthController not returning UserId
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/Controllers/TokenAuthController.cs
@@ -65,7 +65,8 @@ public async Task<AuthenticateResultModel> Authenticate([FromBody] AuthenticateM
             {
                 AccessToken = accessToken,
                 EncryptedAccessToken = GetEncrpyedAccessToken(accessToken),
-                ExpireInSeconds = (int)_configuration.Expiration.TotalSeconds
+                ExpireInSeconds = (int)_configuration.Expiration.TotalSeconds,
+                UserId = loginResult.User.Id
             };
         }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ public async Task<AuthenticateResultModel> Authenticate([FromBody] AuthenticateM`
`65`	`65`	`{`
`66`	`66`	`AccessToken = accessToken,`
`67`	`67`	`EncryptedAccessToken = GetEncrpyedAccessToken(accessToken),`
`68`		`- ExpireInSeconds = (int)_configuration.Expiration.TotalSeconds`
	`68`	`+ ExpireInSeconds = (int)_configuration.Expiration.TotalSeconds,`
	`69`	`+ UserId = loginResult.User.Id`
`69`	`70`	`};`
`70`	`71`	`}`
`71`	`72`