diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs index 118690002..5f4ef875d 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IIdentityService.cs @@ -1,10 +1,8 @@ -using System.Threading.Tasks; - -namespace eShopOnContainers.Core.Services.Identity +namespace eShopOnContainers.Core.Services.Identity { public interface IIdentityService { - string CreateAuthorizeRequest(); + string CreateAuthorizationRequest(); string CreateLogoutRequest(string token); string DecodeToken(string token); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs index bfb938b18..da97eee30 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs @@ -9,11 +9,10 @@ namespace eShopOnContainers.Core.Services.Identity { public class IdentityService : IIdentityService { - public string CreateAuthorizeRequest() + public string CreateAuthorizationRequest() { - // Create URI to authorize endpoint - var authorizeRequest = - new AuthorizeRequest(GlobalSetting.Instance.IdentityEndpoint); + // Create URI to authorization endpoint + var authorizeRequest = new AuthorizeRequest(GlobalSetting.Instance.IdentityEndpoint); // Dictionary with values for the authorize request var dic = new Dictionary(); @@ -29,7 +28,6 @@ namespace eShopOnContainers.Core.Services.Identity dic.Add("state", currentCSRFToken); var authorizeUri = authorizeRequest.Create(dic); - return authorizeUri; } @@ -53,6 +51,7 @@ namespace eShopOnContainers.Core.Services.Identity string partToConvert = parts[1]; partToConvert = partToConvert.Replace('-', '+'); partToConvert = partToConvert.Replace('_', '/'); + switch (partToConvert.Length % 4) { case 0: diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs index aea19cbdf..89eb1fe66 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs @@ -188,7 +188,7 @@ namespace eShopOnContainers.Core.ViewModels await Task.Delay(500); - LoginUrl = _identityService.CreateAuthorizeRequest(); + LoginUrl = _identityService.CreateAuthorizationRequest(); IsValid = true; IsLogin = true; @@ -226,7 +226,7 @@ namespace eShopOnContainers.Core.ViewModels Settings.AuthAccessToken = string.Empty; Settings.AuthIdToken = string.Empty; IsLogin = false; - LoginUrl = _identityService.CreateAuthorizeRequest(); + LoginUrl = _identityService.CreateAuthorizationRequest(); } else if (url.Contains(GlobalSetting.Instance.IdentityCallback)) {