prtsie/schengen-visa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed action parameters

Browse Source
This commit is contained in:
prtsie
2024-08-29 19:27:39 +03:00
parent 0d71ee9428
commit c631dc99d0
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SchengenVisaApi/ApplicationLayer/Services/Users/IUsersService.cs
View File

@@ -1,6 +1,5 @@
using ApplicationLayer.Services.Users.Models; using ApplicationLayer.Services.Users.Models;
using ApplicationLayer.Services.Users.Requests; using ApplicationLayer.Services.Users.Requests;
using Domains.Users;
namespace ApplicationLayer.Services.Users; namespace ApplicationLayer.Services.Users;

10
SchengenVisaApi/SchengenVisaApi/Controllers/UsersController.cs
View File

@@ -5,7 +5,6 @@ using ApplicationLayer.Services.AuthServices.Requests;
using ApplicationLayer.Services.Users; using ApplicationLayer.Services.Users;
using ApplicationLayer.Services.Users.Models; using ApplicationLayer.Services.Users.Models;
using ApplicationLayer.Services.Users.Requests; using ApplicationLayer.Services.Users.Requests;
using Domains.Users;
using FluentValidation; using FluentValidation;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
@@ -58,9 +57,14 @@ public class UsersController(
[HttpGet("login")] [HttpGet("login")]
[ProducesResponseType<string>(StatusCodes.Status200OK)] [ProducesResponseType<string>(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> Login([FromQuery] LoginRequest request, CancellationToken cancellationToken) public async Task<IActionResult> 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); return Ok(result);
} }

22
SchengenVisaApi/VisaApiClient/Client.cs
View File

@@ -413,9 +413,9 @@ namespace VisaApiClient
/// </summary> /// </summary>
/// <returns>Success</returns> /// <returns>Success</returns>
/// <exception cref="ApiException">A server side error occurred.</exception> /// <exception cref="ApiException">A server side error occurred.</exception>
public virtual System.Threading.Tasks.Task<string> LoginAsync(string authData_Email, string authData_Password) public virtual System.Threading.Tasks.Task<string> LoginAsync(string? email, string? password)
{ {
return LoginAsync(authData_Email, authData_Password, System.Threading.CancellationToken.None); return LoginAsync(email, password, System.Threading.CancellationToken.None);
} }
/// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param> /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
@@ -424,14 +424,8 @@ namespace VisaApiClient
/// </summary> /// </summary>
/// <returns>Success</returns> /// <returns>Success</returns>
/// <exception cref="ApiException">A server side error occurred.</exception> /// <exception cref="ApiException">A server side error occurred.</exception>
public virtual async System.Threading.Tasks.Task<string> LoginAsync(string authData_Email, string authData_Password, System.Threading.CancellationToken cancellationToken) public virtual async System.Threading.Tasks.Task<string> 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 client_ = _httpClient;
var disposeClient_ = false; var disposeClient_ = false;
try try
@@ -446,8 +440,14 @@ namespace VisaApiClient
// Operation Path: "users/login" // Operation Path: "users/login"
urlBuilder_.Append("users/login"); urlBuilder_.Append("users/login");
urlBuilder_.Append('?'); urlBuilder_.Append('?');
urlBuilder_.Append(System.Uri.EscapeDataString("AuthData.Email")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(authData_Email, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); if (email != null)
urlBuilder_.Append(System.Uri.EscapeDataString("AuthData.Password")).Append('=').Append(System.Uri.EscapeDataString(ConvertToString(authData_Password, System.Globalization.CultureInfo.InvariantCulture))).Append('&'); {
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--; urlBuilder_.Length--;
await PrepareRequestAsync(client_, request_, urlBuilder_, cancellationToken).ConfigureAwait(false); await PrepareRequestAsync(client_, request_, urlBuilder_, cancellationToken).ConfigureAwait(false);