From f6b3c90d0f06d71f8a597c4d94109dca36739b04 Mon Sep 17 00:00:00 2001 From: dong3058 Date: Sat, 2 Aug 2025 14:16:14 +0900 Subject: [PATCH 1/2] fix: jwtauth logic fix and swaager fx --- .../auth/controller/AdminLoginController.java | 27 +++++++++++++++++++ .../filter/JwtAuthenticationFilter.java | 4 +-- .../member/controller/AdminController.java | 4 +-- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/myteam/server/auth/controller/AdminLoginController.java diff --git a/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java b/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java new file mode 100644 index 00000000..9b859b74 --- /dev/null +++ b/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java @@ -0,0 +1,27 @@ +package org.myteam.server.auth.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.myteam.server.auth.dto.AuthResponse; +import org.myteam.server.global.exception.ErrorResponse; +import org.springframework.web.bind.annotation.PostMapping; + + + +@Tag(name = "인증 API", description = "회원가입 및 로그인 관련 API") +public class AdminLoginController { + @Operation(summary = "관리자 로그인", description = "관리자가 로그인을 하여 토큰을 받습니다." + + "계정은 username으로 비밀번호는 password를 프로퍼티로 보내주시면됩니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "로그인 성공", content = @Content(schema = @Schema(implementation = AuthResponse.class))), + @ApiResponse(responseCode = "404", description = "사용자를 찾을 수 없음", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), + @ApiResponse(responseCode = "500", description = "JSON 파싱 오류", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), + }) + @PostMapping("api/admin/login") + public void adminLoginController(){ + } +} diff --git a/src/main/java/org/myteam/server/global/security/filter/JwtAuthenticationFilter.java b/src/main/java/org/myteam/server/global/security/filter/JwtAuthenticationFilter.java index 5266b4d8..ec5bf657 100644 --- a/src/main/java/org/myteam/server/global/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/org/myteam/server/global/security/filter/JwtAuthenticationFilter.java @@ -147,10 +147,8 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR log.debug("print accessToken: {}", accessToken); log.debug("print refreshToken: {}", refreshToken); log.debug("print role: {}", role); - log.info("print role: {}", role); - - if(status.equals(MemberRole.ADMIN.name())){ + if(role.equals(MemberRole.ADMIN.name())){ redisService.resetRequestCount("LOGIN_ADMIN",username); } redisService.putRefreshToken(publicId, refreshToken); diff --git a/src/main/java/org/myteam/server/member/controller/AdminController.java b/src/main/java/org/myteam/server/member/controller/AdminController.java index c6c4522c..20fa0c6e 100644 --- a/src/main/java/org/myteam/server/member/controller/AdminController.java +++ b/src/main/java/org/myteam/server/member/controller/AdminController.java @@ -49,7 +49,7 @@ public class AdminController { private final MemberService memberService; private final AdminMemberSearchService adminMemberSearchService; - @Operation(summary = "이메일로 회원 조회", description = "관리자가 특정 이메일을 가진 회원을 조회합니다.") + /*@Operation(summary = "이메일로 회원 조회", description = "관리자가 특정 이메일을 가진 회원을 조회합니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "회원 정보 조회 성공"), @ApiResponse(responseCode = "400", description = "잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ErrorResponse.class))), @@ -99,7 +99,7 @@ public ResponseEntity> delete(@RequestBody MemberDeleteReque "회원 삭제 성공", null )); - } + }*/ @Operation(summary = "회원 정보들을 조회", description = "각종 조건을 바탕으로 회원 정보들을 조회합니다.") @ApiResponses(value = { From f86d154a85d930b6ab716e8092a063369abd0fbe Mon Sep 17 00:00:00 2001 From: dong3058 Date: Sat, 2 Aug 2025 14:19:43 +0900 Subject: [PATCH 2/2] fix: admin login controller tag fix --- .../myteam/server/auth/controller/AdminLoginController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java b/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java index 9b859b74..52eab335 100644 --- a/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java +++ b/src/main/java/org/myteam/server/auth/controller/AdminLoginController.java @@ -12,10 +12,11 @@ -@Tag(name = "인증 API", description = "회원가입 및 로그인 관련 API") +@Tag(name = "관리자 인증 api", description = "관리자 로그인 관련 api") public class AdminLoginController { @Operation(summary = "관리자 로그인", description = "관리자가 로그인을 하여 토큰을 받습니다." + - "계정은 username으로 비밀번호는 password를 프로퍼티로 보내주시면됩니다.") + "계정은 username으로 비밀번호는 password를 프로퍼티로 보내주시면됩니다. 사실상 기존의 일반 회원 로그인과" + + "같되 경로만 다르다고 보시면됩니다.") @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "로그인 성공", content = @Content(schema = @Schema(implementation = AuthResponse.class))), @ApiResponse(responseCode = "404", description = "사용자를 찾을 수 없음", content = @Content(schema = @Schema(implementation = ErrorResponse.class))),