Merge branch 'dev_add_auth_1029' into 'master'

Dev add auth 1029 See merge request ql/apismnagaer_backend!8
2024-11-07 23:23:49 +08:00
parent 06a2a72485 b3c53398cb
commit 5d407e7225
34 changed files with 1547 additions and 191 deletions
@@ -0,0 +1,133 @@
+using Apimanager_backend.Dtos;
+using Apimanager_backend.Exceptions;
+using Apimanager_backend.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using StackExchange.Redis;
+
+namespace Apimanager_backend.Controllers
+{
+    [Route("api/[controller]/[action]")]
+    [ApiController]
+    public class AdminController : ControllerBase
+    {
+        private readonly IAdminService adminService;
+        private readonly IUserService userService;
+        public AdminController(IAdminService service,IUserService userService)
+        {
+            this.adminService = service;
+            this.userService = userService;
+        }
+        #region 获取用户列表
+        [HttpGet]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<List<UserInfoDto>>>> UserList(int pageIndex,int pageSize,bool desc)
+        {
+            var users = await adminService.GetUsersAsync(pageIndex,pageSize,desc);
+            var res = new ResponseBase<List<UserInfoDto>>(
+                    code:1000,
+                    message:"Success",
+                    data:users
+                );
+            return Ok(res);
+        }
+        #endregion
+        #region 获取用户信息
+        [HttpGet]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<UserInfoDto?>>> UserInfo(int userId)
+        {
+            var userInfo = await userService.GetUserAsync(userId);
+            var res = new ResponseBase<UserInfoDto?>(
+                code: 1000,
+                message: "Success",
+                data: userInfo
+                );
+            return Ok(res);
+        }
+        #endregion
+        #region 删除用户
+        [HttpDelete]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<object?>>> DeleteUser(int userId)
+        {
+            await adminService.DeleteUserAsync(userId);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data: null
+                );
+            return Ok(res);
+        }
+        #endregion
+        #region 添加用户
+        [HttpPost]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<UserInfoDto?>>> AddUser([FromBody]CreateUserDto dto)
+        {
+            var userInfo = await adminService.CreateUserAsync(dto);
+            var res = new ResponseBase<UserInfoDto?>(
+                    code:1000,
+                    message:"Success",
+                    data: userInfo
+                );
+            return Ok(res);
+        }
+        #endregion
+        #region 禁用用户
+        [HttpPost]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<object?>>> Ban(int userId)
+        {
+            await adminService.BanUserAsync(userId);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data: null
+                );
+            return Ok(res);
+        }
+        #endregion
+        #region 取消禁用用户
+        [HttpPost]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<object?>>> UnBan(int userId)
+        {
+            await adminService.UnbanUserAsync(userId);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data:null
+                );
+        }
+        #endregion
+        #region 更新用户信息
+        [HttpPost]
+        [Authorize(Roles = "Admin")]
+        public async Task<ActionResult<ResponseBase<UserInfoDto?>>> UpdateUser([FromQuery]int userId,[FromBody]AdminUpdateUserDto dto)
+        {
+            try
+            {
+                var userInfo = await adminService.UpdateUserAsync(userId, dto);
+                var res = new ResponseBase<UserInfoDto?>(
+                        code: 1000,
+                        message: "Success",
+                        data: userInfo
+                    );
+            }
+            catch(BaseException e)
+            {
+                var res = new ResponseBase<UserInfoDto?>(
+                        code: e.code,
+                        message:e.message,
+                        data:null
+                    );
+                return NotFound(res);
+            }
+            
+
+        }
+        #endregion
+    }
+}
@@ -5,6 +5,7 @@ using Apimanager_backend.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.VisualBasic;

 namespace Apimanager_backend.Controllers
 {
@@ -31,52 +32,35 @@ namespace Apimanager_backend.Controllers
        [HttpPost]
        public async Task<ActionResult<ResponseBase<UserInfoDto>>> Login([FromBody] UserLoginDto dto)
        {
-            try
-            {
-                UserInfoDto user = await authService.LoginAsync(dto.UserName, dto.Password);
-                //生成token
-                string token = tokenService.GenerateAccessToken(user.Id.ToString(),user.Roles);
-                //生成refreshtoken
-                string refreshToken = await refreshTokenService.CreateRefereshTokenAsync(user.Id.ToString());
-                var responseInfo = new ResponseBase<LoginResponseDto>(
-                        code: 2000,
-                        message: "Login successful",
-                        data: new LoginResponseDto
-                        {
-                            UserInfo = user,
-                            Token = token,
-                            RefreshToken = refreshToken
-                        }
-                    );
-                return Ok(responseInfo);
-            }
-            catch (BaseException e)
-            {
+            UserInfoDto user = await authService.LoginAsync(dto.UserName, dto.Password);
+            //生成token
+            string token = tokenService.GenerateAccessToken(user.Id.ToString(), user.Roles);
+            //生成refreshtoken
+            string refreshToken = await refreshTokenService.CreateRefereshTokenAsync(user.Id.ToString());
+            var responseInfo = new ResponseBase<LoginResponseDto>(
+                    code: 2000,
+                    message: "Login successful",
+                    data: new LoginResponseDto
+                    {
+                        UserInfo = user,
+                        Token = token,
+                        RefreshToken = refreshToken
+                    }
+                );
+            return Ok(responseInfo);

-                //错误时，构建错误信息对象
-                var responseInfo = new ResponseBase<object?>(
-                        code: e.code,
-                        message: e.message,
-                        data: null
-                    );
-
-                return e.code switch
-                {
-                    2001 => Unauthorized(responseInfo),
-                    2002 => Unauthorized(responseInfo),
-                    _ => StatusCode(503)
-                };
-            }
        }
-        
+        /// <summary>
+        /// 令牌刷新
+        /// </summary>
+        /// <param name="dto">传入用户令牌</param>
+        /// <returns>返回新令牌</returns>
        [HttpPost]
        public async Task<ActionResult<ResponseBase<RefreshResponseDto?>>> Refresh([FromBody]RefreshResponseDto dto)
        {
-            try
-            {
-                var userId = await refreshTokenService.ValidateRefreshTokenAsync(dto.RefreshToken);
+            var IsRefreshToken = await refreshTokenService.ValidateRefreshTokenAsync(dto.UserId.ToString(),dto.RefreshToken);
                //刷新令牌无效
-                if (userId == null)
+            if (!IsRefreshToken)
                {
                    var ret = new ResponseBase<RefreshResponseDto?>(
                            code: 2008,
@@ -86,27 +70,103 @@ namespace Apimanager_backend.Controllers
                    return Unauthorized(ret);
                }
                //获取刷新令牌对应用户信息
-                var userInfo = await userService.GetUserAsync(int.Parse(userId));
+            var userInfo = await userService.GetUserAsync(dto.UserId);
                //重新生成令牌
                var token = tokenService.GenerateAccessToken(userInfo.Id.ToString(), userInfo.Roles);
                //刷新刷新令牌有效期（小于三天才会刷新）
-                await refreshTokenService.UpdateRefreshTokenAsync(dto.RefreshToken);
+            await refreshTokenService.UpdateRefreshTokenAsync(userInfo.Id.ToString());
                var result = new ResponseBase<RefreshResponseDto?>(
                        code: 1000,
                        message: "Success",
                        data: new RefreshResponseDto
                        {
+                        UserId = dto.UserId,
                            Token = token,
                            RefreshToken = dto.RefreshToken
                        }

                    );
                return Ok(result);
-            }catch(BaseException e)
+        }
+        /// <summary>
+        /// 用户注册
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        [HttpPost]
+        public async Task<ActionResult<ResponseBase<UserInfoDto?>>> Register(RegisterRequestDto requestDto)
+        {
+            var isUsernameExist = await userService.IsUsernameExist(requestDto.Username);
+            if (isUsernameExist)
            {
-
+                var errorRes = new ResponseBase<UserInfoDto?>(
+                        code: 2003,
+                        message: "用户名已存在",
+                        data: null
+                    );
+                return StatusCode(409, errorRes);
            }
-            
+            try
+            {
+                var userInfo = await authService.RegisterAsync(requestDto);
+                var res = new ResponseBase<UserInfoDto?>(
+                        code: 1000,
+                        message: "Success",
+                        data: userInfo
+                    );
+                return Ok(res);
+            }
+            catch (BaseException e)
+            {
+                var res = new ResponseBase<UserInfoDto?>(
+                        code: e.code,
+                        message: e.message,
+                        data: null
+                    );
+                return StatusCode(500, res);
+            }
+        }
+        /// <summary>
+        /// 发送邮箱校验码
+        /// </summary>
+        /// <param name="registerRequestDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ActionResult<ResponseBase<object?>>> SendValidateCode([FromQuery]string email)
+        {
+            //检测邮箱是否被使用
+            var emailIsUse = await userService.IsEmailExist(email);
+            if (emailIsUse)
+            {
+                var errorRes = new ResponseBase<object?>(
+                        code:2005,
+                        message: "邮箱已存在",
+                        data:null
+                    );
+                return StatusCode(409,errorRes);
+            }
+            //发送注册验证码
+            await authService.SendRegisterCodeAsync(email);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data: null
+                );
+            return Ok(res);
+        }
+
+        [HttpDelete]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<ResponseBase<object?>>> Logout()
+        {
+            var userId = User.Claims.First(x => x.ValueType == "userId").Value;
+            await refreshTokenService.DeleterRefreshTokenAsync(userId);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data: null
+                );
+            return Ok(res);
        }
    }
 }
@@ -4,6 +4,9 @@ using Apimanager_backend.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Apimanager_backend.Filters;
+using Microsoft.AspNetCore.Authorization;
+using Apimanager_backend.Models;
+using System.Security.Claims;

 namespace Apimanager_backend.Controllers
 {
@@ -16,6 +19,73 @@ namespace Apimanager_backend.Controllers
        {
            this.userService = userService;
        }
-        
+        /// <summary>
+        /// 获取用户个人信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<ResponseBase<UserInfoDto>>> UserInfo()
+        {
+            var userId = User.Claims.First(x => x.Type == "userId").Value;
+            var userInfo = await userService.GetUserAsync(int.Parse(userId));
+            var res = new ResponseBase<UserInfoDto>(
+                    code:1000,
+                    message:"Success",
+                    data:userInfo
+                );
+            return Ok(res);
+        }
+        /// <summary>
+        /// 重置用户密码
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ActionResult<ResponseBase<object?>>> Resetpassword([FromBody]ResetPasswordDto dto)
+        {
+            try
+            {
+                await userService.ResetPasswordAsync(dto.Email, dto.Code, dto.NewPassword);
+                var res = new ResponseBase<object?>(
+                        code:1000,
+                        message:"Success",
+                        data: null
+                    );
+                return Ok(res);
+            }catch(BaseException e)
+            {
+                var res = new ResponseBase<object?>(
+                        code:e.code,
+                        message:e.message,
+                        data:null
+                    );
+                return StatusCode(400,res);
+            }
+        }
+        [HttpPost]
+        public async Task<ActionResult<ResponseBase<object?>>> SendResetEmail([FromQuery]string email)
+        {
+            await userService.SendResetPasswordEmailAsync(email);
+            var res = new ResponseBase<object?>(
+                    code: 1000,
+                    message: "Success",
+                    data: null
+                );
+            return Ok(res);
+        }
+        [HttpPost]
+        [Authorize(Roles = "User")]
+        public async Task<ActionResult<ResponseBase<UserInfoDto?>>> Update([FromBody]UpdateUserDto dto)
+        {
+            var userId = User.Claims.First(x => x.ValueType == "userId").Value;
+            var userInfo = await userService.UpdateUserAsync(int.Parse(userId),dto);
+            var res = new ResponseBase<object?>(
+                    code:1000,
+                    message:"Success",
+                    data:userInfo
+                );
+            return Ok(res);
+        }
    }
 }