Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

API - rename method Create -> Login, password based on base64 string

KrzysztofPajakadf08959eed6
diff --git a/src/API/Grand.Api/Controllers/TokenWebController.cs b/src/API/Grand.Api/Controllers/TokenWebController.cs
index 4208ead00..0d2691c30 100644
--- a/src/API/Grand.Api/Controllers/TokenWebController.cs
+++ b/src/API/Grand.Api/Controllers/TokenWebController.cs
@@ -63,17 +63,22 @@ namespace Grand.Api.Controllers
[AllowAnonymous]
[IgnoreAntiforgeryToken]
[HttpPost]
- public async Task<IActionResult> Create([FromBody] LoginModel model)
+ public async Task<IActionResult> Login([FromBody] LoginModel model)
{
- var result = await _customerManagerService.LoginCustomer(model.Email, model.Password);
- if (!result.Equals(CustomerLoginResults.Successful))
+ try
{
- return BadRequest(result.ToString());
- }
+ var base64EncodedBytes = Convert.FromBase64String(model.Password);
+ var password = System.Text.Encoding.UTF8.GetString(base64EncodedBytes);
+
+ var result = await _customerManagerService.LoginCustomer(model.Email, password);
+ if (!result.Equals(CustomerLoginResults.Successful))
+ {
+ return BadRequest(result.ToString());
+ }
- var customer = await _customerService.GetCustomerByEmail(model.Email);
+ var customer = await _customerService.GetCustomerByEmail(model.Email);
- var claims = new Dictionary<string, string> {
+ var claims = new Dictionary<string, string> {
{
"Email", model.Email
},
@@ -81,9 +86,14 @@ namespace Grand.Api.Controllers
"Token",
await _userFieldService.GetFieldsForEntity<string>(customer, SystemCustomerFieldNames.PasswordToken)
}
- };
- var tokenDto = await GetToken(claims, customer);
- return Ok(tokenDto);
+ };
+ var tokenDto = await GetToken(claims, customer);
+ return Ok(tokenDto);
+ }
+ catch (Exception ex)
+ {
+ return BadRequest(ex.Message);
+ }
}
[AllowAnonymous]
@@ -100,7 +110,7 @@ namespace Grand.Api.Controllers
principal = _refreshTokenService.GetPrincipalFromToken(tokenDto.AccessToken);
email = principal.Claims.ToList().FirstOrDefault(x => x.Type == "Email")?.Value;
}
- catch(Exception)
+ catch (Exception)
{
return BadRequest("Invalid access token");
}
@@ -137,7 +147,7 @@ namespace Grand.Api.Controllers
private async Task<TokenDto> GetToken(Dictionary<string, string> claims, Customer customer)
{
var refreshTokenValue = _refreshTokenService.GenerateRefreshToken();
- var refreshToken=await _refreshTokenService.SaveRefreshTokenToCustomer(customer, refreshTokenValue);
+ var refreshToken = await _refreshTokenService.SaveRefreshTokenToCustomer(customer, refreshTokenValue);
claims.Add("RefreshId", refreshToken.RefreshId);
var token = await _mediator.Send(new GenerateTokenWebCommand() { Claims = claims });
return new TokenDto() {