Browse Source

Identity. Fixed async/await misuses

pull/572/head
Marusyk 6 years ago
parent
commit
658e4acd71
4 changed files with 15 additions and 15 deletions
  1. +3
    -3
      src/Services/Identity/Identity.API/Controllers/AccountController.cs
  2. +7
    -7
      src/Services/Identity/Identity.API/Services/EFLoginService.cs
  3. +3
    -3
      src/Services/Identity/Identity.API/Services/ILoginService.cs
  4. +2
    -2
      src/Services/Identity/Identity.API/Services/ProfileService.cs

+ 3
- 3
src/Services/Identity/Identity.API/Controllers/AccountController.cs View File

@ -78,8 +78,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Controllers
{ {
if (ModelState.IsValid) 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; AuthenticationProperties props = null;
if (model.RememberMe) 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 // make sure the returnUrl is still valid, and if yes - redirect back to authorize endpoint
if (_interaction.IsValidReturnUrl(model.ReturnUrl)) if (_interaction.IsValidReturnUrl(model.ReturnUrl))


+ 7
- 7
src/Services/Identity/Identity.API/Services/EFLoginService.cs View File

@ -6,25 +6,25 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
{ {
public class EFLoginService : ILoginService<ApplicationUser> 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) { public EFLoginService(UserManager<ApplicationUser> userManager, SignInManager<ApplicationUser> signInManager) {
_userManager = userManager; _userManager = userManager;
_signInManager = signInManager; _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); return _signInManager.SignInAsync(user, true);
} }
} }


+ 3
- 3
src/Services/Identity/Identity.API/Services/ILoginService.cs View File

@ -4,8 +4,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
{ {
public interface ILoginService<T> 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);
} }
} }

+ 2
- 2
src/Services/Identity/Identity.API/Services/ProfileService.cs View File

@ -20,7 +20,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Services
_userManager = userManager; _userManager = userManager;
} }
async public Task GetProfileDataAsync(ProfileDataRequestContext context)
public async Task GetProfileDataAsync(ProfileDataRequestContext context)
{ {
var subject = context.Subject ?? throw new ArgumentNullException(nameof(context.Subject)); 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(); 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)); var subject = context.Subject ?? throw new ArgumentNullException(nameof(context.Subject));


Loading…
Cancel
Save