Merge pull request #286 from YAPP-Github/refactor/#280

[#280] Refactor: 트위터 로그인 api

Author: rong5026

clients/sns-client/src/main/java/org/snsclient/twitter/facade/TwitterApiService.java

@@ -3,6 +3,7 @@
 import org.snsclient.twitter.dto.response.TwitterToken;
 import org.snsclient.twitter.dto.response.TwitterUserInfoDto;
 import org.snsclient.twitter.service.Twitter4jService;
+import org.snsclient.twitter.service.TwitterAuthService;
 import org.snsclient.twitter.service.TwitterUserService;
 import org.snsclient.twitter.service.TwitterMediaUploadService;
 import org.springframework.stereotype.Service;
@@ -18,16 +19,13 @@ public class TwitterApiService {
 	private final TwitterUserService twitterUserService;
 	private final TwitterMediaUploadService twitterMediaUploadService;
 	private final Twitter4jService twitter4jService;
+	private final TwitterAuthService twitterAuthService;
 
 	/**
 	 * authorization url 생성 메서드
 	 */
 	public String getTwitterAuthorizationUrl(String userId) {
-		String url = twitter4jService.getTwitterAuthorizationUrl();
-		//TODO userID를 트위터 로그인 같이 감아보내는데 Base64인코딩해서 암호화하기
-
-		// 기존 state 값을 교체하여 하나만 유지
-		return url.replaceAll("&state=[^&]*", "") + "&state=" + userId + "&prompt=select_account";
+		return twitterAuthService.getTwitterAuthorizationUrl(userId);
 	}
 
 	/**

clients/sns-client/src/main/java/org/snsclient/twitter/service/Twitter4jService.java

@@ -23,21 +23,8 @@
 @RequiredArgsConstructor
 public class Twitter4jService {
 	private final Twitter4jConfig config;
-	private final String[] scopes = {"media.write", "tweet.read", "tweet.write", "users.read", "offline.access"};
 	private final OAuth2TokenProvider twitterOAuth2TokenProvider;
 
-	/**
-	 * authorization url 생성 메서드
-	 * @return authorization url
-	 */
-	public String getTwitterAuthorizationUrl() {
-		return twitterOAuth2TokenProvider.createAuthorizeUrl(
-			config.getClientId(),
-			config.getRedirectUri(),
-			scopes,
-			config.getChallenge());
-	}
-
 	/**
 	 * 발급받은 code를 가지고 access token(2시간 동안 유효)을 발급받는 메서드
 	 * @param code 발급받은 code (10분간 유효)

clients/sns-client/src/main/java/org/snsclient/twitter/service/TwitterAuthService.java

@@ -0,0 +1,46 @@
+package org.snsclient.twitter.service;
+
+import org.snsclient.twitter.config.Twitter4jConfig;
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class TwitterAuthService {
+	private final String[] scopes = {"media.write", "tweet.read", "tweet.write", "users.read", "offline.access"};
+	private final Twitter4jConfig config;
+
+	/**
+	 * authorization url 생성 메서드
+	 * @return authorization url
+	 */
+	public String getTwitterAuthorizationUrl(String userId) {
+		return createAuthorizeUrl(
+			userId,
+			config.getClientId(),
+			config.getRedirectUri(),
+			scopes,
+			config.getChallenge());
+	}
+
+	private String createAuthorizeUrl(String userId, String clientId, String redirectUri, String[] scopes, String challenge) {
+		if (challenge == null || challenge.isEmpty()) {
+			challenge = "challenge";
+		}
+
+		String scope = String.join("%20", scopes);
+
+		return "https://twitter.com/i/oauth2/authorize?response_type=code&" +
+			"client_id=" + clientId + "&" +
+			"redirect_uri=" + redirectUri + "&" +
+			"scope=" + scope + "&" +
+			"state=" + userId + "&" +
+			"code_challenge=" + challenge + "&" +
+			"code_challenge_method=plain"  + "&" +
+			"prompt=select_account";
+	}
+
+}

domain/domain-module/src/main/java/org/domainmodule/common/entity/BaseAuditEntity.java

@@ -7,6 +7,7 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PrePersist;
 import jakarta.persistence.PreUpdate;
 import jakarta.persistence.Transient;
 import lombok.Getter;
@@ -22,6 +23,11 @@ public class BaseAuditEntity extends BaseTimeEntity {
 	@Transient
 	private boolean preventUpdatedAt = false;
 
+	@PrePersist
+	public void prePersist() {
+		this.updatedAt = LocalDateTime.now(); // 초기 저장 시 updatedAt 설정
+	}
+
 	@PreUpdate
 	public void setPreventUpdatedAt() {
 		// 업데이트가 가능하면 현재시간으로 설정