Merge pull request #37 from assu-org/fix/#33-login-out-fix

[Fix/#33] 로그인 / 로그아웃 / 리프레시 fix

Author: 2ghrms

src/main/java/com/assu/server/domain/auth/controller/AuthController.java

@@ -1,6 +1,6 @@
 package com.assu.server.domain.auth.controller;
 
-import com.assu.server.domain.auth.dto.login.LoginRequest;
+import com.assu.server.domain.auth.dto.login.CommonLoginRequest;
 import com.assu.server.domain.auth.dto.login.LoginResponse;
 import com.assu.server.domain.auth.dto.login.RefreshResponse;
 import com.assu.server.domain.auth.dto.login.StudentLoginRequest;
@@ -13,7 +13,6 @@
 import com.assu.server.domain.auth.service.LogoutService;
 import com.assu.server.domain.auth.service.PhoneAuthService;
 import com.assu.server.domain.auth.service.SignUpService;
-import com.assu.server.domain.common.enums.UserRole;
 import com.assu.server.global.apiPayload.BaseResponse;
 import com.assu.server.global.apiPayload.code.status.SuccessStatus;
 import io.swagger.v3.oas.annotations.Operation;
@@ -22,16 +21,12 @@
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 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 jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartRequest;
 
 @Tag(name = "Auth", description = "인증/회원가입 API")
 @RestController
@@ -50,12 +45,6 @@ public class AuthController {
                     "- 입력한 휴대폰 번호로 1회용 인증번호(OTP)를 발송합니다.\n" +
                     "- 유효시간/재요청 제한 정책은 서버 설정에 따릅니다."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "인증번호 발송 성공",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "400", description = "잘못된 요청 (형식/필수값 오류)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping("/phone-numbers/send")
     public BaseResponse<Void> sendAuthNumber(
             @RequestBody @Valid PhoneAuthRequestDTO.PhoneAuthSendRequest request
@@ -70,12 +59,6 @@ public BaseResponse<Void> sendAuthNumber(
                     "- 발송된 인증번호(OTP)를 검증합니다.\n" +
                     "- 성공 시 서버에 휴대폰 인증 상태가 기록됩니다."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "인증번호 검증 성공",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "400", description = "인증 실패/만료/형식 오류",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping("/phone-numbers/verify")
     public BaseResponse<Void> checkAuthNumber(
             @RequestBody @Valid PhoneAuthRequestDTO.PhoneAuthVerifyRequest request
@@ -94,14 +77,6 @@ public BaseResponse<Void> checkAuthNumber(
                     "- 처리: users + ssu_auth 등 가입 레코드 생성, 휴대폰 인증 여부 확인.\n" +
                     "- 성공 시 201(Created)과 생성된 memberId 반환."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "201", description = "회원가입 성공",
-                    content = @Content(schema = @Schema(implementation = SignUpResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "409", description = "중복(전화번호 등)으로 인한 충돌",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping(value = "/signup/student", consumes = MediaType.APPLICATION_JSON_VALUE)
     public BaseResponse<SignUpResponse> signupStudent(
             @Valid @RequestBody StudentSignUpRequest request) {
@@ -116,14 +91,6 @@ public BaseResponse<SignUpResponse> signupStudent(
                     "- 처리: users + common_auth 생성, 이메일 중복/비밀번호 규칙 검증.\n" +
                     "- 성공 시 201(Created)과 생성된 memberId 반환."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "201", description = "회원가입 성공",
-                    content = @Content(schema = @Schema(implementation = SignUpResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류(비밀번호 불일치 등)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "409", description = "중복(전화/이메일)으로 인한 충돌",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping(value = "/signup/partner", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public BaseResponse<SignUpResponse> signupPartner(
             @Valid @RequestPart("request")
@@ -155,14 +122,6 @@ public BaseResponse<SignUpResponse> signupPartner(
                     "- 처리: users + common_auth 생성, 이메일 중복/비밀번호 규칙 검증.\n" +
                     "- 성공 시 201(Created)과 생성된 memberId 반환."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "201", description = "회원가입 성공",
-                    content = @Content(schema = @Schema(implementation = SignUpResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류(비밀번호 불일치 등)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "409", description = "중복(전화/이메일)으로 인한 충돌",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping(value = "/signup/admin", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public BaseResponse<SignUpResponse> signupAdmin(
             @Valid @RequestPart("request")
@@ -187,7 +146,7 @@ public BaseResponse<SignUpResponse> signupAdmin(
 
     // 로그인 (파트너/관리자 공통)
     @Operation(
-            summary = "로그인 API",
+            summary = "공통 로그인 API",
             description = "# v1.0 (2025-08-15)\n" +
                     "- `application/json`로 호출합니다.\n" +
                     "- 바디: `LoginRequest(email, password)`.\n" +
@@ -196,47 +155,31 @@ public BaseResponse<SignUpResponse> signupAdmin(
     )
     @io.swagger.v3.oas.annotations.parameters.RequestBody(
             required = true,
-            content = @Content(schema = @Schema(implementation = LoginRequest.class))
+            content = @Content(schema = @Schema(implementation = CommonLoginRequest.class))
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "로그인 성공",
-                    content = @Content(schema = @Schema(implementation = LoginResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "401", description = "인증 실패(자격 증명 오류)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
-    @PostMapping(value = "/login", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public BaseResponse<LoginResponse> login(
-            @RequestBody @Valid LoginRequest request
+    @PostMapping(value = "/login/common", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public BaseResponse<LoginResponse> loginCommon(
+            @RequestBody @Valid CommonLoginRequest request
     ) {
-        return BaseResponse.onSuccess(SuccessStatus._OK, loginService.login(request));
+        return BaseResponse.onSuccess(SuccessStatus._OK, loginService.loginCommon(request));
     }
 
 
     // 학생 로그인
     @Operation(
             summary = "학생 로그인 API",
-            description = "# v1.0 (2025-08-15)\n" +
+            description = "# v1.1 (2025-08-18)\n" +
                     "- `application/json`로 호출합니다.\n" +
-                    "- 바디: `StudentLoginRequest(email, password)`.\n" +
+                    "- 바디: `바디: `StudentLoginRequest(studentNumber, studentPassword, school)`.\n" +
                     "- 처리: 자격 증명 검증 후 Access/Refresh 토큰 발급 및 저장.\n" +
                     "- 성공 시 200(OK)과 토큰/만료시각 반환."
     )
     @io.swagger.v3.oas.annotations.parameters.RequestBody(
             required = true,
             content = @Content(schema = @Schema(implementation = StudentLoginRequest.class))
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "로그인 성공",
-                    content = @Content(schema = @Schema(implementation = LoginResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "401", description = "인증 실패(자격 증명 오류)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping(value = "/login/student", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public BaseResponse<LoginResponse> login(
+    public BaseResponse<LoginResponse> loginStudent(
             @RequestBody @Valid StudentLoginRequest request
     ) {
         return BaseResponse.onSuccess(SuccessStatus._OK, loginService.loginStudent(request));
@@ -258,16 +201,6 @@ public BaseResponse<LoginResponse> login(
             @Parameter(name = "RefreshToken", description = "Refresh Token", required = true,
                     in = ParameterIn.HEADER, schema = @Schema(type = "string"))
     })
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "토큰 재발급 성공",
-                    content = @Content(schema = @Schema(implementation = RefreshResponse.class))),
-            @ApiResponse(responseCode = "400", description = "검증 실패/형식 오류",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "401", description = "인증 실패(토큰 오류/만료)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "403", description = "접근 거부",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @PostMapping("/refresh")
     public BaseResponse<RefreshResponse> refreshToken(
             @RequestHeader("RefreshToken") String refreshToken
@@ -285,20 +218,14 @@ public BaseResponse<RefreshResponse> refreshToken(
                     "- 처리: Refresh 무효화(선택), Access 블랙리스트 등록.\n" +
                     "- 성공 시 200(OK)."
     )
-    @ApiResponses({
-            @ApiResponse(responseCode = "200", description = "로그아웃 성공",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class))),
-            @ApiResponse(responseCode = "401", description = "인증 실패(토큰 오류/만료)",
-                    content = @Content(schema = @Schema(implementation = BaseResponse.class)))
-    })
     @DeleteMapping("/logout")
     public BaseResponse<Void> logout(
             @RequestHeader("Authorization")
             @Parameter(name = "Authorization", description = "Access Token. 형식: `Bearer <token>`", required = true,
                             in = ParameterIn.HEADER, schema = @Schema(type = "string"))
-            String accessToken
+            String authorization
     ) {
-        logoutService.logout(accessToken);
+        logoutService.logout(authorization);
         return BaseResponse.onSuccess(SuccessStatus._OK, null);
     }
 

…/domain/auth/dto/login/LoginRequest.java …n/auth/dto/login/CommonLoginRequest.javasrc/main/java/com/assu/server/domain/auth/dto/login/LoginRequest.java renamed to src/main/java/com/assu/server/domain/auth/dto/login/CommonLoginRequest.java src/main/java/com/assu/server/domain/auth/dto/login/LoginRequest.java renamed to src/main/java/com/assu/server/domain/auth/dto/login/CommonLoginRequest.java

@@ -13,7 +13,7 @@
 @AllArgsConstructor
 @Builder
 @Schema(description = "파트너/관리자 공통 로그인 요청")
-public class LoginRequest {
+public class CommonLoginRequest {
 
     @Schema(description = "로그인 이메일", example = "user@example.com")
     @NotBlank(message = "이메일은 필수입니다.")

src/main/java/com/assu/server/domain/auth/dto/login/StudentLoginRequest.java

@@ -1,7 +1,9 @@
 package com.assu.server.domain.auth.dto.login;
 
+import com.assu.server.domain.user.entity.enums.University;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.*;
 
@@ -14,14 +16,18 @@
 @Schema(description = "학생 로그인 요청")
 public class StudentLoginRequest {
 
-    @Schema(description = "학번", example = "student@example.com")
+    @Schema(description = "학번", example = "20001234")
     @NotBlank(message = "학번은 필수입니다.")
-    @Size(max = 10, message = "이메일은 10자를 넘을 수 없습니다.")
+    @Size(max = 10, message = "학번은 10자를 넘을 수 없습니다.")
     private String studentNumber;
 
     @Schema(description = "로그인 비밀번호(평문)", example = "P@ssw0rd!")
     @NotBlank(message = "비밀번호는 필수입니다.")
     @Size(min = 8, max = 64, message = "비밀번호는 8~64자여야 합니다.")
     private String studentPassword;
+
+    @Schema(description = "대학 이름", example = "SSU")
+    @NotNull(message = "대학 이름은 필수입니다.")
+    private University university;
 }
 

src/main/java/com/assu/server/domain/auth/entity/AuthRealm.java

@@ -0,0 +1,5 @@
+package com.assu.server.domain.auth.entity;
+
+public enum AuthRealm {
+    COMMON, SSU
+}

src/main/java/com/assu/server/domain/auth/exception/CustomAuthException.java

@@ -0,0 +1,12 @@
+package com.assu.server.domain.auth.exception;
+
+import com.assu.server.global.apiPayload.code.BaseErrorCode;
+import com.assu.server.global.exception.GeneralException;
+import org.springframework.http.HttpStatus;
+
+public class CustomAuthHandler extends GeneralException {
+
+    public CustomAuthHandler(BaseErrorCode errorCode) {
+        super(errorCode);
+    }
+}