From 658e4acd71121c629446b2dd5e0fffbf2ae958be Mon Sep 17 00:00:00 2001
From: Marusyk <romamarusyk@gmail.com>
Date: Thu, 29 Mar 2018 18:04:49 +0300
Subject: [PATCH] Identity. Fixed async/await misuses

---
 .../Identity.API/Controllers/AccountController.cs  |  6 +++---
 .../Identity.API/Services/EFLoginService.cs        | 14 +++++++-------
 .../Identity.API/Services/ILoginService.cs         |  6 +++---
 .../Identity.API/Services/ProfileService.cs        |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Services/Identity/Identity.API/Controllers/AccountController.cs b/src/Services/Identity/Identity.API/Controllers/AccountController.cs
index 79e9c247e..206baf55e 100644
--- a/src/Services/Identity/Identity.API/Controllers/AccountController.cs
+++ b/src/Services/Identity/Identity.API/Controllers/AccountController.cs
@@ -78,8 +78,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Controllers
         {
             if (ModelState.IsValid)
             {
-                var user = await _loginService.FindByUsername(model.Email);
-                if (await _loginService.ValidateCredentials(user, model.Password))
+                var user = await _loginService.FindByUsernameAsync(model.Email);
+                if (await _loginService.ValidateCredentialsAsync(user, model.Password))
                 {
                     AuthenticationProperties props = null;
                     if (model.RememberMe)
@@ -91,7 +91,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Controllers
                         };
                     };
 
-                    await _loginService.SignIn(user);
+                    await _loginService.SignInAsync(user);
                    
                     // make sure the returnUrl is still valid, and if yes - redirect back to authorize endpoint
                     if (_interaction.IsValidReturnUrl(model.ReturnUrl))
diff --git a/src/Services/Identity/Identity.API/Services/EFLoginService.cs b/src/Services/Identity/Identity.API/Services/EFLoginService.cs
index 63c4d4b7e..941d7d941 100644
--- a/src/Services/Identity/Identity.API/Services/EFLoginService.cs
+++ b/src/Services/Identity/Identity.API/Services/EFLoginService.cs
@@ -6,25 +6,25 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
 {
     public class EFLoginService : ILoginService<ApplicationUser>
     {
-        UserManager<ApplicationUser> _userManager;
-        SignInManager<ApplicationUser> _signInManager;
+        readonly UserManager<ApplicationUser> _userManager;
+        readonly SignInManager<ApplicationUser> _signInManager;
 
         public EFLoginService(UserManager<ApplicationUser> userManager, SignInManager<ApplicationUser> signInManager) {
             _userManager = userManager;
             _signInManager = signInManager;
         }
 
-        public async Task<ApplicationUser> FindByUsername(string user)
+        public Task<ApplicationUser> FindByUsernameAsync(string user)
         {
-            return await _userManager.FindByEmailAsync(user);
+            return _userManager.FindByEmailAsync(user);
         }
 
-        public async Task<bool> ValidateCredentials(ApplicationUser user, string password)
+        public Task<bool> ValidateCredentialsAsync(ApplicationUser user, string password)
         {
-            return await _userManager.CheckPasswordAsync(user, password);
+            return _userManager.CheckPasswordAsync(user, password);
         }
 
-        public Task SignIn(ApplicationUser user) {
+        public Task SignInAsync(ApplicationUser user) {
             return _signInManager.SignInAsync(user, true);
         }
     }
diff --git a/src/Services/Identity/Identity.API/Services/ILoginService.cs b/src/Services/Identity/Identity.API/Services/ILoginService.cs
index 7bff7f272..b89f1835b 100644
--- a/src/Services/Identity/Identity.API/Services/ILoginService.cs
+++ b/src/Services/Identity/Identity.API/Services/ILoginService.cs
@@ -4,8 +4,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
 {
     public interface ILoginService<T>
     {
-        Task<bool> ValidateCredentials(T user, string password);
-        Task<T> FindByUsername(string user);
-        Task SignIn(T user);
+        Task<bool> ValidateCredentialsAsync(T user, string password);
+        Task<T> FindByUsernameAsync(string user);
+        Task SignInAsync(T user);
     }
 }
diff --git a/src/Services/Identity/Identity.API/Services/ProfileService.cs b/src/Services/Identity/Identity.API/Services/ProfileService.cs
index 204ac3119..cfedbafc5 100644
--- a/src/Services/Identity/Identity.API/Services/ProfileService.cs
+++ b/src/Services/Identity/Identity.API/Services/ProfileService.cs
@@ -20,7 +20,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
             _userManager = userManager;
         }
 
-        async public Task GetProfileDataAsync(ProfileDataRequestContext context)
+        public async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             var subject = context.Subject ?? throw new ArgumentNullException(nameof(context.Subject));
 
@@ -34,7 +34,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
             context.IssuedClaims = claims.ToList();
         }
 
-        async public Task IsActiveAsync(IsActiveContext context)
+        public async Task IsActiveAsync(IsActiveContext context)
         {
             var subject = context.Subject ?? throw new ArgumentNullException(nameof(context.Subject));