Merge pull request FITIFITBANnerit#22 from day024/main

yujin24300 · web-flow · commit b75b8e9015b9 · 2025-04-10T14:26:17.000+09:00
refactor: 기존에 body로 jwt를 보내던걸 header로 전송
diff --git a/backend-submodule b/backend-submodule
@@ -1 +1 @@
-Subproject commit 583ad8fab87112d5be7277561ba7a7ad9d7f144a
+Subproject commit c2bf41d383437d46a4f2f3c94a4a274dc8f6fca3
diff --git a/build.gradle b/build.gradle
@@ -32,11 +32,14 @@ dependencies {
 
 	implementation 'io.jsonwebtoken:jjwt:0.9.1'
 	implementation 'io.jsonwebtoken:jjwt:0.12.6'
-	implementation 'mysql:mysql-connector-java:8.0.33'
 	implementation 'com.google.api-client:google-api-client:1.34.1'
 	implementation 'com.google.http-client:google-http-client-gson:1.41.0'
 	implementation 'com.google.http-client:google-http-client-jackson2:1.40.1'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+	implementation 'mysql:mysql-connector-java:8.0.33'
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+
+	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
 	compileOnly 'org.projectlombok:lombok'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
diff --git a/src/main/java/com/BANnerIt/server/api/Auth/controller/OAuthController.java b/src/main/java/com/BANnerIt/server/api/Auth/controller/OAuthController.java
@@ -16,26 +16,25 @@
 @RestController
 @RequestMapping("/oauth")
 public class OAuthController {
+
     private final OAuthService oAuthService;
 
     public OAuthController(OAuthService oAuthService) {
         this.oAuthService = oAuthService;
     }
 
     @PostMapping("/validate")
-    public ResponseEntity<ApiResponse<?>> validateIdToken(@RequestBody Map<String, String> request) {
+    public ResponseEntity<ApiResponse<UserData>> validateIdToken(@RequestBody Map<String, String> request) {
         String idToken = request.get("id_token");
-        try {
-            Map<String, Object> userDetails = oAuthService.authenticateUser(idToken);
 
-            String jwtToken = (String) userDetails.get("accessToken");
-            UserData userData = (UserData) userDetails.get("userData");
+        try {
+            AutoLoginResponse loginResponse = oAuthService.authenticateUser(idToken);
 
-            if (jwtToken == null || userData == null) {
-                throw new CustomException(ErrorCode.INTERNAL_SERVER_ERROR, "OAuth 인증 후 필요한 정보를 가져오지 못했습니다.");
-            }
+            return ResponseEntity
+                    .ok()
+                    .header("Authorization", "Bearer " + loginResponse.jwt())
+                    .body(ApiResponse.success(loginResponse.userData()));
 
-            return ResponseEntity.ok(ApiResponse.success(jwtToken, userData));
         } catch (IllegalArgumentException e) {
             throw new CustomException(ErrorCode.UNAUTHORIZED, "승인되지 않은 접근입니다.");
         } catch (Exception e) {
@@ -48,8 +47,9 @@ public ResponseEntity<ApiResponse<UserData>> refreshAccessToken(HttpServletReque
         final String accessToken = oAuthService.extractAccessTokenFromHeader(request);
         final AutoLoginResponse result = oAuthService.autoLogin(accessToken);
 
-        return ResponseEntity.ok(ApiResponse.success(result.jwt(), result.userData()));
+        return ResponseEntity
+                .ok()
+                .header("Authorization", "Bearer " + result.jwt())
+                .body(ApiResponse.success(result.userData()));
     }
-
-
-}
+}
diff --git a/src/main/java/com/BANnerIt/server/api/Auth/service/OAuthService.java b/src/main/java/com/BANnerIt/server/api/Auth/service/OAuthService.java
@@ -37,7 +37,7 @@ public OAuthService(JwtTokenUtil jwtTokenUtil, MemberRepository memberRepository
         this.idTokenVerify=idTokenVerify;
     }
 
-    public Map<String, Object> authenticateUser(String idToken) throws GeneralSecurityException, IOException {
+    public AutoLoginResponse authenticateUser(String idToken) throws GeneralSecurityException, IOException {
         GoogleIdToken.Payload payload = idTokenVerify.verifyIdToken(idToken);
         if (payload == null) {
             throw new CustomException(ErrorCode.UNAUTHORIZED, "유효하지 않은 ID 토큰입니다.");
@@ -55,14 +55,15 @@ public Map<String, Object> authenticateUser(String idToken) throws GeneralSecuri
 
         refreshTokenRepository.save(new RefreshToken(member.getUserId(), refreshToken));
 
-        UserData userData = new UserData(name, email, pictureUrl);
+        UserData userData = new UserData(
+                member.getUserId(),
+                member.getRole(),
+                member.getName(),
+                member.getEmail(),
+                member.getUserProfile()
+        );
 
-        Map<String, Object> response = new HashMap<>();
-        response.put("accessToken", accessToken);
-        response.put("refreshToken", refreshToken);
-        response.put("userData", userData);
-
-        return response;
+        return new AutoLoginResponse(accessToken, userData);
     }
 
     public AutoLoginResponse autoLogin(String accessToken) {
@@ -95,17 +96,31 @@ public AutoLoginResponse refreshAccessToken(Long userId) {
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER, "사용자를 찾을 수 없습니다."));
 
         String newAccessToken = jwtTokenUtil.generateAccessToken(userId);
-        return new AutoLoginResponse(newAccessToken,
-                new UserData(member.getName(), member.getEmail(), member.getUserProfile()));
 
+        UserData userData = new UserData(
+                member.getUserId(),
+                member.getRole(),
+                member.getName(),
+                member.getEmail(),
+                member.getUserProfile()
+        );
+
+        return new AutoLoginResponse(newAccessToken, userData);
     }
 
+
     private AutoLoginResponse getUserDataFromToken(String token) {
         Long userId = jwtTokenUtil.extractUserId(token);
         Member member = memberRepository.findById(userId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER, "사용자를 찾을 수 없습니다."));
 
-        UserData userData = new UserData(member.getName(), member.getEmail(), member.getUserProfile());
+        UserData userData = new UserData(
+                member.getUserId(),
+                member.getRole(),
+                member.getName(),
+                member.getEmail(),
+                member.getUserProfile()
+        );
 
         return new AutoLoginResponse(token, userData);
     }
diff --git a/src/main/java/com/BANnerIt/server/api/s3/controller/S3Controller.java b/src/main/java/com/BANnerIt/server/api/s3/controller/S3Controller.java
@@ -0,0 +1,24 @@
+package com.BANnerIt.server.api.s3.controller;
+
+import com.BANnerIt.server.api.s3.dto.PresignedUrlRequest;
+import com.BANnerIt.server.api.s3.dto.PresignedUrlResponse;
+import com.BANnerIt.server.api.s3.service.S3Service;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/presigned-urls")
+public class S3Controller {
+    private final S3Service s3Service;
+
+    @PostMapping
+    public PresignedUrlResponse createPresignedUrls(
+            @RequestBody PresignedUrlRequest request,
+            @RequestParam(defaultValue = "report") String folder
+    ) {
+        return s3Service.generatePresignedUrls(request, folder);
+    }
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/domain/Image.java b/src/main/java/com/BANnerIt/server/api/s3/domain/Image.java
@@ -0,0 +1,17 @@
+package com.BANnerIt.server.api.s3.domain;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Builder
+@Table(name = "images")
+public class Image {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long imageId;
+
+    private String imageKey;
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlDto.java b/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlDto.java
@@ -0,0 +1,4 @@
+package com.BANnerIt.server.api.s3.dto;
+
+public record PresignedUrlDto(String key, String url) {
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlRequest.java b/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlRequest.java
@@ -0,0 +1,5 @@
+package com.BANnerIt.server.api.s3.dto;
+
+import java.util.List;
+public record PresignedUrlRequest(List<String> files) {
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlResponse.java b/src/main/java/com/BANnerIt/server/api/s3/dto/PresignedUrlResponse.java
@@ -0,0 +1,5 @@
+package com.BANnerIt.server.api.s3.dto;
+
+import java.util.List;
+public record PresignedUrlResponse(List<PresignedUrlDto> key_urls) {
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/repository/ImageRepository.java b/src/main/java/com/BANnerIt/server/api/s3/repository/ImageRepository.java
@@ -0,0 +1,7 @@
+package com.BANnerIt.server.api.s3.repository;
+
+import com.BANnerIt.server.api.s3.domain.Image;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ImageRepository extends JpaRepository<Image, Long> {
+}
diff --git a/src/main/java/com/BANnerIt/server/api/s3/service/S3Service.java b/src/main/java/com/BANnerIt/server/api/s3/service/S3Service.java
@@ -0,0 +1,50 @@
+package com.BANnerIt.server.api.s3.service;
+
+import com.BANnerIt.server.api.s3.domain.Image;
+import com.BANnerIt.server.api.s3.dto.PresignedUrlDto;
+import com.BANnerIt.server.api.s3.dto.PresignedUrlRequest;
+import com.BANnerIt.server.api.s3.dto.PresignedUrlResponse;
+import com.BANnerIt.server.api.s3.repository.ImageRepository;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.net.URL;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class S3Service {
+    private final AmazonS3 amazonS3;
+    private final ImageRepository imageRepository;
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    public PresignedUrlResponse generatePresignedUrls(PresignedUrlRequest request, String folder) {
+        List<PresignedUrlDto> urls = new ArrayList<>();
+
+        for (String file : request.files()) {
+            String uuid = UUID.randomUUID().toString();
+            String key = folder + "/" + uuid + "." + file;
+
+            Date expiration = Date.from(Instant.now().plusSeconds(60 * 5)); // 5분 유효
+
+            GeneratePresignedUrlRequest s3UrlRequest = new GeneratePresignedUrlRequest(bucket, key)
+                    .withMethod(com.amazonaws.HttpMethod.PUT)
+                    .withExpiration(expiration);
+
+            URL url = amazonS3.generatePresignedUrl(s3UrlRequest);
+
+            urls.add(new PresignedUrlDto(key, url.toString()));
+        }
+
+        return new PresignedUrlResponse(urls);
+    }
+}
diff --git a/src/main/java/com/BANnerIt/server/api/user/controller/MemberController.java b/src/main/java/com/BANnerIt/server/api/user/controller/MemberController.java
@@ -20,67 +20,79 @@ public class MemberController {
     private final JwtTokenUtil jwtTokenUtil;
 
     @GetMapping("/userdetail")
-    public ResponseEntity<ApiResponse<MemberResponse>> getUserDetails(@RequestHeader("Authorization") String authorizationHeader) {
-        Long userId = memberService.extractUserId(authorizationHeader);
+    public ResponseEntity<ApiResponse<MemberResponse>> getUserDetails(
+            @RequestHeader("Authorization") final String authorizationHeader) {
+
+        final Long userId = memberService.extractUserId(authorizationHeader);
 
         if (userId == null) {
             return ResponseEntity.badRequest().body(ApiResponse.fail(ErrorCode.INVALID_TOKEN));
         }
 
-        MemberResponse userResponse = memberService.getUserDetails(userId);
+        final MemberResponse response = memberService.getUserDetails(userId);
 
-        if (userResponse == null) {
+        if (response == null) {
             return ResponseEntity.status(ErrorCode.NOT_FOUND_MEMBER.getHttpStatus())
                     .body(ApiResponse.fail(ErrorCode.NOT_FOUND_MEMBER));
         }
 
-        return ResponseEntity.ok(ApiResponse.success(null, userResponse));
+        return ResponseEntity.ok()
+                .header("Authorization", authorizationHeader)
+                .body(ApiResponse.success(response));
     }
 
     @PatchMapping("/update")
-    public ResponseEntity<ApiResponse<String>> updateUser(@Valid @RequestBody MemberUpdateRequest request,
-                                                          @RequestHeader("Authorization") String authorizationHeader) {
-        Long userId = memberService.extractUserId(authorizationHeader);
+    public ResponseEntity<ApiResponse<String>> updateUser(
+            @Valid @RequestBody MemberUpdateRequest request,
+            @RequestHeader("Authorization") String authorizationHeader) {
+
+        final Long userId = memberService.extractUserId(authorizationHeader);
 
         if (userId == null) {
             return ResponseEntity.badRequest().body(ApiResponse.fail(ErrorCode.INVALID_TOKEN));
         }
 
-        boolean isUpdated = memberService.updateUser(userId, request);
+        final boolean isUpdated = memberService.updateUser(userId, request);
 
         if (!isUpdated) {
             return ResponseEntity.status(ErrorCode.NOT_FOUND_MEMBER.getHttpStatus())
                     .body(ApiResponse.fail(ErrorCode.NOT_FOUND_MEMBER));
         }
 
-        return ResponseEntity.ok(ApiResponse.success(null, "회원정보가 수정되었습니다."));
+        return ResponseEntity.ok()
+                .header("Authorization", authorizationHeader)
+                .body(ApiResponse.success("회원정보가 수정되었습니다."));
     }
 
     @PostMapping("/logout")
-    public ResponseEntity<ApiResponse<String>> logout(@RequestHeader("Authorization") String authorizationHeader) {
-        String token = authorizationHeader.replace("Bearer ", "");
+    public ResponseEntity<ApiResponse<String>> logout(
+            @RequestHeader("Authorization") String authorizationHeader) {
 
-        boolean isLoggedOut = memberService.logout(token);
+        final String token = authorizationHeader.replace("Bearer ", "");
+
+        final boolean isLoggedOut = memberService.logout(token);
 
         if (!isLoggedOut) {
             return ResponseEntity.status(ErrorCode.NOT_FOUND_MEMBER.getHttpStatus())
                     .body(ApiResponse.fail(ErrorCode.NOT_FOUND_MEMBER));
         }
 
-        return ResponseEntity.ok(ApiResponse.success(null, "로그아웃 완료되었습니다."));
+        return ResponseEntity.ok(ApiResponse.success("로그아웃 완료되었습니다."));
     }
 
     @DeleteMapping("/delete")
-    public ResponseEntity<ApiResponse<String>> deleteUser(@RequestHeader("Authorization") String authorizationHeader) {
+    public ResponseEntity<ApiResponse<String>> deleteUser(
+            @RequestHeader("Authorization") String authorizationHeader) {
+
         final String token = authorizationHeader.replace("Bearer ", "");
 
-        boolean isDeleted = memberService.deleteMember(token);
+        final boolean isDeleted = memberService.deleteMember(token);
 
         if (!isDeleted) {
             return ResponseEntity.status(ErrorCode.NOT_FOUND_MEMBER.getHttpStatus())
                     .body(ApiResponse.fail(ErrorCode.NOT_FOUND_MEMBER));
         }
 
-        return ResponseEntity.ok(ApiResponse.success(null, "회원탈퇴가 완료되었습니다."));
+        return ResponseEntity.ok(ApiResponse.success("회원탈퇴가 완료되었습니다."));
     }
-}
+}
diff --git a/src/main/java/com/BANnerIt/server/api/user/dto/MemberResponse.java b/src/main/java/com/BANnerIt/server/api/user/dto/MemberResponse.java
@@ -1,10 +1,11 @@
 package com.BANnerIt.server.api.user.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public record MemberResponse(
-        Long userId,
+        Long id,
+        String role,
         String email,
         String name,
-        String role,
-        String userProfileUrl
-) {
-}
+        @JsonProperty("user_profile_url") String userProfileUrl
+) { }
diff --git a/src/main/java/com/BANnerIt/server/api/user/dto/UserData.java b/src/main/java/com/BANnerIt/server/api/user/dto/UserData.java
@@ -4,6 +4,12 @@
 
 public record UserData(
 
+        @JsonProperty("user_id")
+        Long userId,
+
+        @JsonProperty("role")
+        String role,
+
         @JsonProperty("name")
         String name,
 
@@ -12,4 +18,4 @@ public record UserData(
 
         @JsonProperty("profile_image_url")
         String userProfileUrl
-) { }
+) { }
diff --git a/src/main/java/com/BANnerIt/server/global/config/S3Config.java b/src/main/java/com/BANnerIt/server/global/config/S3Config.java
diff --git a/src/main/java/com/BANnerIt/server/global/exception/ApiResponse.java b/src/main/java/com/BANnerIt/server/global/exception/ApiResponse.java
diff --git a/src/main/java/com/BANnerIt/server/global/exception/ExceptionDto.java b/src/main/java/com/BANnerIt/server/global/exception/ExceptionDto.java
diff --git a/src/main/java/com/BANnerIt/server/global/exception/GlobalExceptionHandler.java b/src/main/java/com/BANnerIt/server/global/exception/GlobalExceptionHandler.java
diff --git a/src/test/java/com/BANnerIt/server/userTest/MemberControllerTest.java b/src/test/java/com/BANnerIt/server/userTest/MemberControllerTest.java
diff --git a/src/test/java/com/BANnerIt/server/userTest/OAuthControllerTest.java b/src/test/java/com/BANnerIt/server/userTest/OAuthControllerTest.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.BANnerIt.server.api.s3.dto;
++
 +public record PresignedUrlDto(String key, String url) {
 +}