From 8b5d69320101a1da3928e179d040ae33f79ea901 Mon Sep 17 00:00:00 2001 From: Tudor Stanciu Date: Tue, 7 Mar 2023 20:36:12 +0200 Subject: [PATCH] Tuitio refactoring --- .../CommandHandlers/AccountLoginHandler.cs | 2 +- .../CommandHandlers/AccountLogoutHandler.cs | 2 +- .../CommandHandlers/AuthorizationHandler.cs | 2 +- .../{AuthenticationStatus.cs => EnvelopeError.cs} | 2 +- src/Tuitio.PublishedLanguage/Dto/Envelope.cs | 8 ++++---- src/Tuitio.Wrapper/Services/ITuitioService.cs | 7 ++++--- src/Tuitio.Wrapper/Services/TuitioService.cs | 12 ++++++------ 7 files changed, 18 insertions(+), 17 deletions(-) rename src/Tuitio.PublishedLanguage/Constants/{AuthenticationStatus.cs => EnvelopeError.cs} (89%) diff --git a/src/Tuitio.Application/CommandHandlers/AccountLoginHandler.cs b/src/Tuitio.Application/CommandHandlers/AccountLoginHandler.cs index cdf5916..4d6c9df 100644 --- a/src/Tuitio.Application/CommandHandlers/AccountLoginHandler.cs +++ b/src/Tuitio.Application/CommandHandlers/AccountLoginHandler.cs @@ -31,7 +31,7 @@ namespace Tuitio.Application.CommandHandlers if (loginResult == null) { _logger.LogDebug($"Login failed for user '{command.UserName}'."); - return Envelope.Error(EnvelopeStatus.BAD_CREDENTIALS); + return Envelope.Fail(EnvelopeError.BAD_CREDENTIALS); } _logger.LogDebug($"Login succeeded for user '{command.UserName}'."); diff --git a/src/Tuitio.Application/CommandHandlers/AccountLogoutHandler.cs b/src/Tuitio.Application/CommandHandlers/AccountLogoutHandler.cs index 044bfea..f07b672 100644 --- a/src/Tuitio.Application/CommandHandlers/AccountLogoutHandler.cs +++ b/src/Tuitio.Application/CommandHandlers/AccountLogoutHandler.cs @@ -34,7 +34,7 @@ namespace Tuitio.Application.CommandHandlers if (logoutResult == null) { _logger.LogDebug($"Logout failed for token '{command.Token}'."); - return Envelope.Error(EnvelopeStatus.UNAUTHENTICATED); + return Envelope.Fail(EnvelopeError.UNAUTHENTICATED); } _logger.LogDebug($"Logout succeeded for user '{logoutResult.UserName}'."); diff --git a/src/Tuitio.Application/CommandHandlers/AuthorizationHandler.cs b/src/Tuitio.Application/CommandHandlers/AuthorizationHandler.cs index 4aa5b4a..cdb4999 100644 --- a/src/Tuitio.Application/CommandHandlers/AuthorizationHandler.cs +++ b/src/Tuitio.Application/CommandHandlers/AuthorizationHandler.cs @@ -34,7 +34,7 @@ namespace Tuitio.Application.CommandHandlers if (token == null) { _logger.LogDebug($"Authorization failed for token '{command.Token}'."); - var result = Envelope.Error(EnvelopeStatus.UNAUTHORIZED); + var result = Envelope.Fail(EnvelopeError.UNAUTHORIZED); return Task.FromResult(result); } diff --git a/src/Tuitio.PublishedLanguage/Constants/AuthenticationStatus.cs b/src/Tuitio.PublishedLanguage/Constants/EnvelopeError.cs similarity index 89% rename from src/Tuitio.PublishedLanguage/Constants/AuthenticationStatus.cs rename to src/Tuitio.PublishedLanguage/Constants/EnvelopeError.cs index b89905e..40e7444 100644 --- a/src/Tuitio.PublishedLanguage/Constants/AuthenticationStatus.cs +++ b/src/Tuitio.PublishedLanguage/Constants/EnvelopeError.cs @@ -2,7 +2,7 @@ namespace Tuitio.PublishedLanguage.Constants { - public struct EnvelopeStatus + public struct EnvelopeError { public const string BAD_CREDENTIALS = "BAD_CREDENTIALS", diff --git a/src/Tuitio.PublishedLanguage/Dto/Envelope.cs b/src/Tuitio.PublishedLanguage/Dto/Envelope.cs index 2738288..18ba4dd 100644 --- a/src/Tuitio.PublishedLanguage/Dto/Envelope.cs +++ b/src/Tuitio.PublishedLanguage/Dto/Envelope.cs @@ -5,12 +5,12 @@ namespace Tuitio.PublishedLanguage.Dto public class Envelope where T : class { public T Result { get; } - public string Status { get; } + public string Error { get; } - public Envelope(T result, string status) + public Envelope(T result, string error) { Result=result; - Status=status; + Error=error; } public static Envelope Success(T result) @@ -18,7 +18,7 @@ namespace Tuitio.PublishedLanguage.Dto return new Envelope(result, null); } - public static Envelope Error(string message) + public static Envelope Fail(string message) { return new Envelope(null, message); } diff --git a/src/Tuitio.Wrapper/Services/ITuitioService.cs b/src/Tuitio.Wrapper/Services/ITuitioService.cs index ecc56cb..89fcb0f 100644 --- a/src/Tuitio.Wrapper/Services/ITuitioService.cs +++ b/src/Tuitio.Wrapper/Services/ITuitioService.cs @@ -7,7 +7,8 @@ namespace Tuitio.Wrapper.Services { public interface ITuitioService { - Task Login(string userName, string password); - Task Authorize(string token); + Task> Login(string userName, string password); + Task> Logout(string token); + Task> Authorize(string token); } -} +} \ No newline at end of file diff --git a/src/Tuitio.Wrapper/Services/TuitioService.cs b/src/Tuitio.Wrapper/Services/TuitioService.cs index ff687ed..93d4248 100644 --- a/src/Tuitio.Wrapper/Services/TuitioService.cs +++ b/src/Tuitio.Wrapper/Services/TuitioService.cs @@ -24,24 +24,24 @@ namespace Tuitio.Wrapper.Services _httpClient = httpClient; } - public async Task Login(string userName, string password) + public async Task> Login(string userName, string password) { var route = string.Format(ApiRoutes.AccountLogin, userName, password); - var result = await _httpClient.ExecutePostRequest(route); + var result = await _httpClient.ExecutePostRequest>(route); return result; } - public async Task Logout(string token) + public async Task> Logout(string token) { var route = string.Format(ApiRoutes.AccountLogout, token); - var result = await _httpClient.ExecutePostRequest(route); + var result = await _httpClient.ExecutePostRequest>(route); return result; } - public async Task Authorize(string token) + public async Task> Authorize(string token) { var route = string.Format(ApiRoutes.Authorization, token); - var result = await _httpClient.ExecutePostRequest(route); + var result = await _httpClient.ExecutePostRequest>(route); return result; } }