Main 머지

.gitignore

@@ -39,3 +39,5 @@ out/
 .DS_Store
 
 application*.yml
+
+/src/main/generated/

build.gradle

@@ -40,9 +40,8 @@ dependencies {
 
     // image
     implementation 'software.amazon.awssdk:s3:2.30.18'
-    implementation 'org.imgscalr:imgscalr-lib:4.2'
-    implementation 'com.sksamuel.scrimage:scrimage-core:4.3.0'
-    implementation 'com.sksamuel.scrimage:scrimage-webp:4.3.0'
+    implementation 'software.amazon.awssdk:lambda:2.30.18'
+    implementation 'com.twelvemonkeys.imageio:imageio-webp:3.9.4'
 
     // gson
     implementation 'com.google.code.gson:gson:2.8.6'
@@ -62,6 +61,7 @@ dependencies {
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
+// rest docs
 ext {
     snippetsDir = file('build/generated-snippets')
 }
@@ -73,7 +73,7 @@ asciidoctor {
     dependsOn test
 }
 
-task copyDocument(type: Copy) {
+tasks.register('copyDocument', Copy) {
     dependsOn asciidoctor
     doFirst {
         delete file('src/main/resources/static/docs')

src/docs/asciidoc/auth.adoc

@@ -6,17 +6,34 @@
 
 operation::auth-controller-test/kakao-o-auth-sign-in[snippets='http-request,curl-request,request-fields,http-response,response-cookies,response-fields']
 
+[[게스트-로그인]]
+=== `POST` 게스트 로그인
+
+```
+1. 리프레시 토큰이 있는 경우
+
+토큰 재발급 시도 (토큰이 잘못된 경우 400에러 발생)
+
+2. 리프레시 토큰이 없는 경우
+
+게스트 계정 생성
+```
+
+operation::auth-controller-test/guest-sign-in[snippets='http-request,curl-request,request-cookies,http-response,response-cookies,response-fields']
+
+[[로그인]]
+
 [[토큰-재발급]]
 === `POST` 토큰 재발급
 
 operation::auth-controller-test/reissue[snippets='http-request,curl-request,request-cookies,http-response,response-cookies,response-fields']
 
-[[게스트-토큰-발급]]
-=== `POST` 게스트 토큰 발급
-
-operation::auth-controller-test/guest-token[snippets='http-request,curl-request,http-response,response-fields']
-
 [[로그아웃]]
 === `POST` 로그아웃
 
 operation::auth-controller-test/sign-out[snippets='http-request,curl-request,request-cookies,request-headers,http-response,response-cookies']
+
+[[회원탈퇴]]
+=== `POST` 회원탈퇴 (미구현)
+
+operation::auth-controller-test/withdraw[snippets='http-request,curl-request,request-cookies,request-headers,http-response']

src/docs/asciidoc/comments.adoc

@@ -11,7 +11,12 @@ operation::comment-controller-test/create-comment[snippets='http-request,curl-re
 
 operation::comment-controller-test/find-comments[snippets='http-request,curl-request,path-parameters,http-response,response-fields']
 
+[[댓글-수정]]
+=== `POST` 댓글 수정
+
+operation::comment-controller-test/update-comment[snippets='http-request,curl-request,path-parameters,request-headers,request-fields,http-response']
+
 [[댓글-삭제]]
-=== 댓글 삭제 (미구현)
+=== `DELETE` 댓글 삭제
 
 operation::comment-controller-test/delete-comment[snippets='http-request,curl-request,path-parameters,request-headers,http-response']

src/docs/asciidoc/index.adoc

@@ -28,6 +28,7 @@ HTTP 상태 코드 본 REST API에서 사용하는 HTTP 상태 코드는 가능
 | `200 OK`| 요청을 성공적으로 처리함
 | `400 Bad Request`| 잘못된 요청을 보낸 경우. 응답 본문에 더 오류에 대한 정보가 담겨있음
 | `401 Unauthorization`| 인증에 실패한 경우. 응답 본문에 더 오류에 대한 정보가 담겨있음
+| `403 Forbidden`| 권한이 없는 경우. 응답 본문에 더 오류에 대한 정보가 담겨있음
 | `404 Not Found`| 요청한 리소스가 없음.
 | `500 Internal Server Error`| 서버 내부 오류가 발생한 경우.
 | `503 Service Unavailable`| 서버가 요청을 처리할 준비가 되지 않은 경우.
@@ -67,25 +68,26 @@ Authorization: Bearer accessToken
 
 ```
 user1
-eyJhbGciOiJIUzI1NiJ9.eyJpZCI6IjEiLCJpYXQiOjE3NDAyOTQyMzEsImlzcyI6InN3eXA4dGVhbTIiLCJleHAiOjMzMjc2Mjk0MjMxfQ.gqA245tRiBQB9owKRWIpX1we1T362R-xDTt4YT9AhRY
+eyJhbGciOiJIUzI1NiJ9.eyJpZCI6IjEiLCJyb2xlIjoiVVNFUiIsImlhdCI6MTc0MTA2MTc2NSwiaXNzIjoic3d5cDh0ZWFtMiIsImV4cCI6MzMyNzcwNjE3NjV9.3o2uNN3IuGZ-uLrAPdkHBBHF9kk9KALlP373eF27HI4
 
 user2
-eyJhbGciOiJIUzI1NiJ9.eyJpZCI6IjIiLCJpYXQiOjE3NDA0NDM0ODIsImlzcyI6InN3eXA4dGVhbTIiLCJleHAiOjMzMjc2NDQzNDgyfQ.2sTlCtSHb4eGzhlL6WlRT6xvJLtvipnHp6EAmC4j1UQ
+eyJhbGciOiJIUzI1NiJ9.eyJpZCI6IjIiLCJyb2xlIjoiVVNFUiIsImlhdCI6MTc0MTA2MjkxMiwiaXNzIjoic3d5cDh0ZWFtMiIsImV4cCI6MzMyNzcwNjI5MTJ9.eC4oUp9ROb6udMarevZQcImTWojcL_3kkY1YgatpuJg
 ```
 
 [[인증-예외]]
 === 인증 예외
 
 ```
-인증 토큰관련 예외가 발생하면 다음과 같은 에러 코드와 함께 401 상태 코드를 응답함
+인증 토큰관련 예외가 발생하면 다음과 같은 에러 코드와 함께 상태 코드를 응답함
 ```
 
 |===
 
-| 에러 코드 | 용례
-|`EXPIRED_TOKEN`| 토큰이 만료되었을 경우
-|`INVALID_TOKEN`| 잘못된 형식의 토큰인 경우
-|`INVALID_AUTH_HEADER`| Authorization 헤더가 존재하지 않거나 Bearer 형식이 아닌 경우
+| 에러 코드 | 상태 코드 | 용례
+|`EXPIRED_TOKEN`| 401 | 토큰이 만료되었을 경우
+|`INVALID_TOKEN`| 401 | 잘못된 형식의 토큰인 경우
+|`INVALID_AUTH_HEADER`| 401 | Authorization 헤더가 존재하지 않거나 Bearer 형식이 아닌 경우
+|`FORBIDDEN`| 403 | 권한이 없는 경우 (ex, 게스트가 투표 생성)
 |===
 
 예시

src/docs/asciidoc/posts.adoc

@@ -16,14 +16,6 @@ operation::post-controller-test/find-post[snippets='http-request,curl-request,pa
 
 operation::post-controller-test/find-post_share-url[snippets='http-request,curl-request,path-parameters,http-response,response-fields']
 
-[[게시글-목록-조회]]
-
-[[사진-투표-현황-조회]]
-=== `GET` 사진 투표 현황 조회
-
-operation::post-controller-test/find-vote-status[snippets='http-request,curl-request,request-headers,path-parameters,http-response,response-fields']
-
-
 [[유저가-작성한-게시글-조회]]
 === `GET` 유저가 작성한 게시글 조회
 
@@ -34,6 +26,16 @@ operation::post-controller-test/find-my-post[snippets='http-request,curl-request
 
 operation::post-controller-test/find-voted-post[snippets='http-request,curl-request,query-parameters,request-headers,http-response,response-fields']
 
+[[게시글-투표-수정]]
+=== `POST` 게시글 노출 변경
+
+operation::post-controller-test/toggle-status-post[snippets='http-request,curl-request,path-parameters,request-headers,http-response']
+
+[[게시글-투표-수정]]
+=== `POST` 게시글 투표 수정 (미구현)
+
+operation::post-controller-test/update-post[snippets='http-request,curl-request,path-parameters,request-headers,http-response']
+
 [[게시글-투표-마감]]
 === `POST` 게시글 투표 마감
 
@@ -43,3 +45,8 @@ operation::post-controller-test/close-post[snippets='http-request,curl-request,p
 === `DELETE` 게시글 삭제
 
 operation::post-controller-test/delete-post[snippets='http-request,curl-request,path-parameters,request-headers,http-response']
+
+[[피드-조회]]
+=== `GET` 피드 조회
+
+operation::post-controller-test/find-feed[snippets='http-request,curl-request,query-parameters,request-headers,http-response,response-fields']

src/docs/asciidoc/votes.adoc

@@ -1,22 +1,17 @@
 [[투표-API]]
 == 투표 API
 
+[[투표-현황-조회]]
+=== `GET` 투표 현황 조회
+
+operation::vote-controller-test/find-vote-status[snippets='http-request,curl-request,request-headers,path-parameters,http-response,response-fields']
+
 [[투표]]
 === `POST` 투표
 
 operation::vote-controller-test/vote[snippets='http-request,curl-request,request-headers,request-fields,http-response']
 
-[[게스트-투표]]
-=== `POST` 게스트 투표
-
-operation::vote-controller-test/guest-vote[snippets='http-request,curl-request,request-headers,request-fields,http-response']
-
-[[투표-변경]]
-=== 투표 변경 (투표 API로 통일)
-
-// operation::vote-controller-test/change-vote[snippets='http-request,curl-request,request-headers,request-fields,http-response']
-
-[[게스트-투표-변경]]
-=== 게스트 투표 변경 (미구현, 게스트 투표 API로 통일)
+[[투표-취소]]
+=== `DELETE` 투표 취소
 
-// operation::vote-controller-test/guest-change-vote[snippets='http-request,curl-request,request-headers,request-fields,http-response']
+operation::vote-controller-test/cancel-vote[snippets='http-request,curl-request,path-parameters,request-headers,http-response']

src/main/java/com/swyp8team2/auth/application/AuthService.java

@@ -1,68 +1,74 @@
 package com.swyp8team2.auth.application;
 
+import com.swyp8team2.auth.application.jwt.JwtClaim;
 import com.swyp8team2.auth.application.jwt.JwtService;
 import com.swyp8team2.auth.application.oauth.OAuthService;
 import com.swyp8team2.auth.application.oauth.dto.OAuthUserInfo;
 import com.swyp8team2.auth.domain.Provider;
 import com.swyp8team2.auth.domain.SocialAccount;
 import com.swyp8team2.auth.domain.SocialAccountRepository;
 import com.swyp8team2.auth.presentation.dto.TokenResponse;
-import com.swyp8team2.common.annotation.GuestTokenCryptoService;
-import com.swyp8team2.crypto.application.CryptoService;
 import com.swyp8team2.user.application.UserService;
+import com.swyp8team2.user.domain.Role;
+import com.swyp8team2.user.domain.User;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Objects;
+
+@Slf4j
 @Service
+@Transactional
+@RequiredArgsConstructor
 public class AuthService {
 
     private final JwtService jwtService;
     private final OAuthService oAuthService;
     private final SocialAccountRepository socialAccountRepository;
     private final UserService userService;
-    private final CryptoService cryptoService;
-
-    public AuthService(
-            JwtService jwtService,
-            OAuthService oAuthService,
-            SocialAccountRepository socialAccountRepository,
-            UserService userService,
-            @GuestTokenCryptoService CryptoService cryptoService) {
-        this.jwtService = jwtService;
-        this.oAuthService = oAuthService;
-        this.socialAccountRepository = socialAccountRepository;
-        this.userService = userService;
-        this.cryptoService = cryptoService;
-    }
 
-    @Transactional
     public TokenResponse oauthSignIn(String code, String redirectUri) {
         OAuthUserInfo oAuthUserInfo = oAuthService.getUserInfo(code, redirectUri);
-        SocialAccount socialAccount = socialAccountRepository.findBySocialIdAndProvider(
+        SocialAccount socialAccount = getSocialAccount(oAuthUserInfo);
+
+        TokenResponse response = jwtService.createToken(new JwtClaim(socialAccount.getUserId(), Role.USER));
+        log.debug("oauthSignIn userId: {} tokenPair: {}", response.userId(), response.tokenPair());
+        return response;
+    }
+
+    private SocialAccount getSocialAccount(OAuthUserInfo oAuthUserInfo) {
+        return socialAccountRepository.findBySocialIdAndProvider(
                         oAuthUserInfo.socialId(),
                         Provider.KAKAO
                 ).orElseGet(() -> createUser(oAuthUserInfo));
-        return jwtService.createToken(socialAccount.getUserId());
     }
 
     private SocialAccount createUser(OAuthUserInfo oAuthUserInfo) {
         Long userId = userService.createUser(oAuthUserInfo.nickname(), oAuthUserInfo.profileImageUrl());
         return socialAccountRepository.save(SocialAccount.create(userId, oAuthUserInfo));
     }
 
-    @Transactional
     public TokenResponse reissue(String refreshToken) {
-        return jwtService.reissue(refreshToken);
-    }
-
-    @Transactional
-    public String createGuestToken() {
-        Long guestId = userService.createGuest();
-        return cryptoService.encrypt(String.valueOf(guestId));
+        TokenResponse response = jwtService.reissue(refreshToken);
+        log.debug("reissue userId: {} tokenPair: {}", response.userId(), response.tokenPair());
+        return response;
     }
 
-    @Transactional
     public void signOut(Long userId, String refreshToken) {
         jwtService.signOut(userId, refreshToken);
     }
+
+    public TokenResponse guestSignIn(String refreshToken) {
+        TokenResponse response;
+        if (Objects.isNull(refreshToken)) {
+            User user = userService.createGuest();
+            response = jwtService.createToken(new JwtClaim(user.getId(), user.getRole()));
+        } else {
+            response = jwtService.reissue(refreshToken);
+        }
+        log.debug("guestSignIn userId: {} tokenPair: {}", response.userId(), response.tokenPair());
+        return response;
+    }
 }

src/main/java/com/swyp8team2/auth/application/jwt/JwtClaim.java

@@ -1,17 +1,22 @@
 package com.swyp8team2.auth.application.jwt;
 
+import com.swyp8team2.user.domain.Role;
+
 public class JwtClaim {
 
     public static final String ID = "id";
+    public static final String ROLE = "role";
 
     private final String id;
+    private final Role role;
 
-    public JwtClaim(long id) {
+    public JwtClaim(long id, Role role) {
         this.id = String.valueOf(id);
+        this.role = role;
     }
 
-    public static JwtClaim from(long id) {
-        return new JwtClaim(id);
+    public static JwtClaim from(long id, Role role) {
+        return new JwtClaim(id, role);
     }
 
     public Long idAsLong() {
@@ -21,4 +26,8 @@ public Long idAsLong() {
     public String id() {
         return id;
     }
+
+    public Role role() {
+        return role;
+    }
 }

src/main/java/com/swyp8team2/auth/application/jwt/JwtProvider.java

@@ -3,6 +3,7 @@
 import com.swyp8team2.common.exception.ErrorCode;
 import com.swyp8team2.common.exception.InternalServerException;
 import com.swyp8team2.common.exception.UnauthorizedException;
+import com.swyp8team2.user.domain.Role;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.JwtException;
@@ -63,6 +64,7 @@ private String createToken(JwtClaim claim, long expiration) {
 
         return Jwts.builder()
                 .claim(JwtClaim.ID, claim.id())
+                .claim(JwtClaim.ROLE, claim.role())
                 .setIssuedAt(Date.from(now))
                 .setIssuer(issuer)
                 .setExpiration(Date.from(expiredAt))
@@ -80,15 +82,14 @@ public JwtClaim parseToken(String token) {
             Claims claims = parser.parseClaimsJws(token)
                     .getBody();
             String userId = (String) claims.get(JwtClaim.ID);
-            return new JwtClaim(Long.parseLong(userId));
+            Role role = Role.valueOf((String) claims.get(JwtClaim.ROLE));
+            return new JwtClaim(Long.parseLong(userId), role);
         } catch (ExpiredJwtException e) {
             log.trace("Expired Jwt Token: {}", e.getMessage());
             throw new UnauthorizedException(ErrorCode.EXPIRED_TOKEN);
-        } catch (JwtException e) {
+        } catch (Exception e) {
             log.trace("Invalid Jwt Token: {}", e.getMessage());
             throw new UnauthorizedException(ErrorCode.INVALID_TOKEN);
-        } catch (Exception e) {
-            throw new InternalServerException(e);
         }
     }
 }