Merge pull request #29 from gdsc-ssu/feat/#21

Author: daeun084

.github/workflows/google-cloudrun-docker.yml

@@ -65,6 +65,11 @@ jobs:
         env:
           GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
 
+      # 5-3) Apple OAuth P8 파일 생성 (Secrets → 실제파일)
+      - name: Create Apple OAuth P8 file
+        run: echo "$APPLE_P8_KEY" > AuthKey_HXCK973689.p8
+        env:
+          APPLE_P8_KEY: ${{ secrets.APPLE_P8_KEY }}
 
       # 6) Dockerfile 복호화 (Secrets에서 가져옴)
       - name: Decode Dockerfile from secret and save it
@@ -102,16 +107,17 @@ jobs:
             DB_PASSWORD=${{ secrets.DB_PASSWORD }},
             AI_GEMINI_API_KEY=${{ secrets.AI_GEMINI_API_KEY }},
             KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }},
-            GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }},
-            GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }},
             GOOGLE_APPLICATION_CREDENTIALS=${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }},
             AI_GEMINI_CHAT_PROMPT_LOCATION=${{ secrets.AI_GEMINI_CHAT_PROMPT_LOCATION }},
             AI_GEMINI_SUMMARY_PROMPT_LOCATION=${{ secrets.AI_GEMINI_SUMMARY_PROMPT_LOCATION }},
             MAIL_USERNAME=${{ secrets.MAIL_USERNAME }},
             MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }},
             JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }},
-            GOOGLE_REDIRECT=${{ secrets.GOOGLE_REDIRECT }},
-            KAKAO_REDIRECT=${{ secrets.KAKAO_REDIRECT }}
+            KAKAO_REDIRECT=${{ secrets.KAKAO_REDIRECT }},
+            APPLE_TEAM_ID=${{ secrets.APPLE_TEAM_ID }},
+            APPLE_CLIENT_ID=${{ secrets.APPLE_CLIENT_ID }},
+            APPLE_KEY_ID=${{ secrets.APPLE_KEY_ID }},
+            APPLE_REDIRECT_URI=${{ secrets.APPLE_REDIRECT_URI }}
 
       # 10) 배포 후 URL 출력
       - name: 'Show output'

build.gradle

@@ -27,10 +27,14 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
-	implementation 'com.auth0:java-jwt:4.5.0'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
+	// JWT 토큰 검증을 위한 의존성
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
 	// google api
 	implementation platform('com.google.cloud:libraries-bom:26.1.0')
 	implementation 'com.google.cloud:google-cloud-speech'

src/main/java/com/gdg/poppet/auth/application/dto/response/AppleProfileDTO.java

@@ -0,0 +1,56 @@
+package com.gdg.poppet.auth.application.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AppleProfileDTO {
+    @JsonProperty("sub")
+    private String sub; // 사용자 고유 식별자
+
+    @JsonProperty("email")
+    private String email; // 이메일 (첫 로그인시에만 제공)
+
+    @JsonProperty("email_verified")
+    private Boolean emailVerified;
+
+    @JsonProperty("is_private_email")
+    private Boolean isPrivateEmail;
+
+    @JsonProperty("real_user_status")
+    private Integer realUserStatus;
+
+    @JsonProperty("aud")
+    private String aud; // 앱 ID
+
+    @JsonProperty("iss")
+    private String iss; // 발급자 (https://appleid.apple.com)
+
+    @JsonProperty("iat")
+    private Long iat; // 발급 시간
+
+    @JsonProperty("exp")
+    private Long exp; // 만료 시간
+
+    @JsonProperty("auth_time")
+    private Long authTime; // 인증 시간
+
+    @JsonProperty("nonce_supported")
+    private Boolean nonceSupported;
+
+    // 사용자 식별을 위한 ID 반환
+    public String getId() {
+        return this.sub;
+    }
+
+    // 이메일이 있을 때만 반환
+    public String getValidEmail() {
+        return (email != null && !email.trim().isEmpty()) ? email : null;
+    }
+}

src/main/java/com/gdg/poppet/auth/application/dto/response/GoogleBasicProfileDTO.java

@@ -6,7 +6,6 @@
 
 public interface AuthService {
     OAuthResult kakaoOAuthLogin(String accessCode);
-    OAuthResult googleOAuthLogin(String accessCode);
     OAuthResult kakaoOAuthLoginWithTokens(String accessToken);
-    OAuthResult googleOAuthLoginWithTokens(String idToken, String accessToken);
+    OAuthResult appleOAuthLoginWithTokens(String identityToken);
 }