diff --git a/SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs b/SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs index 3ad0ada..a0a1840 100644 --- a/SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs +++ b/SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs @@ -1,6 +1,5 @@ using ApplicationLayer.Services.Users.Models; using ApplicationLayer.Services.Users.Requests; -using Domains.Users; namespace ApplicationLayer.Services.Users; diff --git a/SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs b/SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs index b7e7294..8c6efeb 100644 --- a/SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs +++ b/SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs @@ -5,7 +5,6 @@ using ApplicationLayer.Services.AuthServices.Requests; using ApplicationLayer.Services.Users; using ApplicationLayer.Services.Users.Models; using ApplicationLayer.Services.Users.Requests; -using Domains.Users; using FluentValidation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -58,9 +57,14 @@ public class UsersController( [HttpGet("login")] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status403Forbidden)] - public async Task Login([FromQuery] LoginRequest request, CancellationToken cancellationToken) + public async Task Login(string email, string password, CancellationToken cancellationToken) { - var result = await loginService.LoginAsync(request, cancellationToken); + var loginRequest = new LoginRequest + { + AuthData = new AuthData { Email = email, Password = password } + }; + + var result = await loginService.LoginAsync(loginRequest, cancellationToken); return Ok(result); } diff --git a/SchengenVisaApi/VisaApiClient/Client.cs b/SchengenVisaApi/VisaApiClient/Client.cs index 5f8ab5a..f32ff24 100644 --- a/SchengenVisaApi/VisaApiClient/Client.cs +++ b/SchengenVisaApi/VisaApiClient/Client.cs @@ -413,9 +413,9 @@ namespace VisaApiClient /// /// Success /// A server side error occurred. - public virtual System.Threading.Tasks.Task LoginAsync(string authData_Email, string authData_Password) + public virtual System.Threading.Tasks.Task LoginAsync(string? email, string? password) { - return LoginAsync(authData_Email, authData_Password, System.Threading.CancellationToken.None); + return LoginAsync(email, password, System.Threading.CancellationToken.None); } /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. @@ -424,14 +424,8 @@ namespace VisaApiClient /// /// Success /// A server side error occurred. - public virtual async System.Threading.Tasks.Task LoginAsync(string authData_Email, string authData_Password, System.Threading.CancellationToken cancellationToken) + public virtual async System.Threading.Tasks.Task LoginAsync(string? email, string? password, System.Threading.CancellationToken cancellationToken) { - if (authData_Email == null) - throw new System.ArgumentNullException("authData_Email"); - - if (authData_Password == null) - throw new System.ArgumentNullException("authData_Password"); - var client_ = _httpClient; var disposeClient_ = false; try @@ -446,8 +440,14 @@ namespace VisaApiClient // Operation Path: "users/login" urlBuilder_.Append("users/login"); urlBuilder_.Append('?'); - urlBuilder_.Append(System.Uri.EscapeDataString("AuthData.Email")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(authData_Email, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); - urlBuilder_.Append(System.Uri.EscapeDataString("AuthData.Password")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(authData_Password, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); + if (email != null) + { + urlBuilder_.Append(System.Uri.EscapeDataString("email")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(email, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); + } + if (password != null) + { + urlBuilder_.Append(System.Uri.EscapeDataString("password")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(password, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); + } urlBuilder_.Length--; await PrepareRequestAsync(client_, request_, urlBuilder_, cancellationToken).ConfigureAwait(false);