修改User模块,同步原始代码
This commit is contained in:
1 parent
4a5fada435
commit
78b0c2bb2e
47 files changed
+2939
-193
No files matched your search
@@ -1,26 +1,27 @@
|
||||
using Asp.Versioning;
|
||||
using Asp.Versioning;
|
||||
using MAX.Framework.Dtos;
|
||||
using MAX.Framework.Security;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System.Security.Claims;
|
||||
using Store.Users.Contracts;
|
||||
|
||||
namespace Store.Api.Controllers
|
||||
{
|
||||
[ApiController]
|
||||
[ApiVersion("1.0")]
|
||||
[Route("api/v{version:apiVersion}/[controller]/[action]")]
|
||||
[Route("/v{version:apiVersion}/[controller]/[action]")]
|
||||
public class AuthController : ControllerBase
|
||||
{
|
||||
//private readonly IUserService _userService;
|
||||
private readonly IUserAuthenticationService _users;
|
||||
private readonly ITokenService _tokenService;
|
||||
private readonly ICurrentUser _currentUser;
|
||||
private readonly IOnlineUserStore _onlineUserStore;
|
||||
private readonly ILogger<AuthController> _logger;
|
||||
|
||||
public AuthController(ITokenService tokenService, ICurrentUser currentUser, IOnlineUserStore onlineUserStore, ILogger<AuthController> logger)
|
||||
public AuthController(ITokenService tokenService, ICurrentUser currentUser, IOnlineUserStore onlineUserStore, ILogger<AuthController> logger, IUserAuthenticationService users)
|
||||
{
|
||||
//_userService = userService;
|
||||
_users = users;
|
||||
_tokenService = tokenService;
|
||||
_currentUser = currentUser;
|
||||
_onlineUserStore = onlineUserStore;
|
||||
@@ -34,22 +35,19 @@ namespace Store.Api.Controllers
|
||||
[AllowAnonymous]
|
||||
public async Task<ApiResultBase> Login([FromBody] LoginRequest request)
|
||||
{
|
||||
_logger.LogError("login errr");
|
||||
_logger.LogInformation("login");
|
||||
if (request is null || string.IsNullOrWhiteSpace(request.UserName) || string.IsNullOrWhiteSpace(request.Password))
|
||||
{
|
||||
return ApiResult.Fail("用户名或密码不能为空", 400);
|
||||
}
|
||||
|
||||
//UserDto? user = await _userService.LoginAsync(request.UserName, request.Password);
|
||||
//if (user is null)
|
||||
//{
|
||||
// return ApiResult.Error("用户名或密码错误", 401);
|
||||
//}
|
||||
// 认证通过后才签发令牌,权限信息以用户模块中的数据库记录为准。
|
||||
var user = await _users.Authenticate(request.UserName, request.Password, HttpContext.RequestAborted);
|
||||
if (user is null) return ApiResult.Fail("用户名或密码错误", 401);
|
||||
|
||||
var claims = new List<Claim>
|
||||
{
|
||||
new(JwtClaimTypes.UserName, request.UserName),
|
||||
new(JwtClaimTypes.UserName, user.UserName),
|
||||
};
|
||||
|
||||
TokenResult token = _tokenService.CreateToken(claims);
|
||||
@@ -108,4 +106,3 @@ namespace Store.Api.Controllers
|
||||
public string Password { get; set; } = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user