Merge pull request #465 from kopczynski1991/fix/master/GetCurrentUserAsync

maliming · web-flow · commit 46b6d4bc9a6b · 2019-06-18T08:57:24.000+08:00
fix awaiting to get current user, because not waiting a result
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpProjectNameAppServiceBase.cs
@@ -23,9 +23,9 @@ protected AbpProjectNameAppServiceBase()
             LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;
         }
 
-        protected virtual Task<User> GetCurrentUserAsync()
+        protected virtual async Task<User> GetCurrentUserAsync()
         {
-            var user = UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());
+            var user = await UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());
             if (user == null)
             {
                 throw new Exception("There is no current user!");

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ protected AbpProjectNameAppServiceBase()`
`23`	`23`	`LocalizationSourceName = AbpProjectNameConsts.LocalizationSourceName;`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected virtual Task<User> GetCurrentUserAsync()`
	`26`	`+ protected virtual async Task<User> GetCurrentUserAsync()`
`27`	`27`	`{`
`28`		`- var user = UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());`
	`28`	`+ var user = await UserManager.FindByIdAsync(AbpSession.GetUserId().ToString());`
`29`	`29`	`if (user == null)`
`30`	`30`	`{`
`31`	`31`	`throw new Exception("There is no current user!");`