Merge pull request #290 from codesquad-members-2023-team6/dev

Feat : 로그인 응답 메시지 통일
codesquad-members-2023-team6 · Jun 1, 2023 · b775f6d · b775f6d
2 parents 0b4af24 + 66e57ea
commit b775f6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/backend/src/main/java/com/team6/issue_tracker/global/auth/service/JwtService.java b/backend/src/main/java/com/team6/issue_tracker/global/auth/service/JwtService.java
@@ -4,6 +4,7 @@
 import com.auth0.jwt.algorithms.Algorithm;
 import com.team6.issue_tracker.domain.member.dto.MemberDetail;
 import com.team6.issue_tracker.global.auth.domain.GithubUser;
+import com.team6.issue_tracker.global.util.ResponseMessage;
 import io.jsonwebtoken.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,14 +38,17 @@ public String createToken(MemberDetail user) {
                 .compact();
     }
 
-    public ResponseEntity<?> createResponse(String jwtToken) {
+    public ResponseEntity<ResponseMessage<Map<String, String>>> createResponse(String jwtToken) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("Authorization", "Bearer " + jwtToken);
 
         Map<String, String> responseBody = new HashMap<>();
         responseBody.put("message", "login success");
         responseBody.put("token", jwtToken);
-        return new ResponseEntity<>(responseBody, headers, HttpStatus.OK);
+
+        ResponseMessage<Map<String, String>> responseMessage =
+                new ResponseMessage<>(HttpStatus.OK, "Login successful", responseBody);
+        return responseMessage.toResponseEntityWithHeaders(headers);
     }
 
     public Authentication getAuthentication(String token) {

diff --git a/backend/src/main/java/com/team6/issue_tracker/global/util/ResponseMessage.java b/backend/src/main/java/com/team6/issue_tracker/global/util/ResponseMessage.java
@@ -3,6 +3,7 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
@@ -17,4 +18,8 @@ public class ResponseMessage<T> {
     public static <T> ResponseEntity<ResponseMessage<T>> of(HttpStatus status, String message, T data) {
         return new ResponseEntity<>(new ResponseMessage<>(status, message, data), status);
     }
+
+    public ResponseEntity<ResponseMessage<T>> toResponseEntityWithHeaders(HttpHeaders headers) {
+        return new ResponseEntity<>(this, headers, this.status);
+    }
 }