🔀 애플 로그인 화면 API 추가

✨ 애플 get 추가

Author: cheshireHYUN

.github/workflows/deploy.yml

@@ -36,8 +36,15 @@ jobs:
           REDIS_TERMS_KEY: ${{secrets.REDIS_TERMS_KEY}}
           GOOGLE_CLIENT: ${{secrets.GOOGLE_CLIENT}}
           GOOGLE_SECRET: ${{secrets.GOOGLE_SECRET}}
+          APPLE_AUD : ${{secrets.APPLE_AUD}}
+          APPLE_TEAM_ID : ${{secrets.APPLE_TEAM_ID}}
+          APPLE_KEY_ID : ${{secrets.APPLE_KEY_ID}}
 
-
+      # AuthKey.p8 파일 생성
+      - name: Create AuthKey.p8
+        run: |
+          echo "${{ secrets.APPLE_AUTH_KEY }}" > ./src/main/resources/key/AuthKey.p8
+          
       #프로젝트 빌드
       - name: Build with Gradle
         run: |

.gitignore

@@ -7,6 +7,7 @@ build/
 
 ###custom###
 application.properties
+AuthKey.p8
 
 ### STS ###
 .apt_generated

build.gradle

@@ -54,6 +54,10 @@ dependencies {
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 	implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.2'
 
+	// Apple login
+	implementation 'com.nimbusds:nimbus-jose-jwt:3.10'
+	implementation 'org.bouncycastle:bcpkix-jdk18on:1.72'
+
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
 	implementation 'org.projectlombok:lombok'

src/main/java/com/boggle_boggle/bbegok/config/openfeign/OpenFeignConfig.java

@@ -1,6 +1,5 @@
 package com.boggle_boggle.bbegok.config.openfeign;
 
-import com.nimbusds.jose.shaded.gson.GsonBuilder;
 import feign.gson.GsonDecoder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.EnableFeignClients;

src/main/java/com/boggle_boggle/bbegok/config/properties/AppleProperties.java

@@ -0,0 +1,30 @@
+package com.boggle_boggle.bbegok.config.properties;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "apple")
+public class AppleProperties {
+    @Getter
+    @Setter
+    public static class Auth {
+        private String tokenUrl;
+        private String publicKeyUrl;
+    }
+
+    private Auth auth = new Auth();
+    private String teamId;
+    private String keyId;
+    private String keyPath;
+    private String clientId;
+    private String redirectUri;
+    //private String authTokenUrl;
+    //private String authPublicKeyUrl;
+    private String iss;
+    private String aud;
+}

src/main/java/com/boggle_boggle/bbegok/config/security/SecurityConfig.java

@@ -92,11 +92,11 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 //OAuth2 로그인 요청 처리
                 .oauth2Login(oauth2 -> oauth2
                         .authorizationEndpoint(authorization -> authorization
-                                .baseUri("/oauth2/authorization")
+                                .baseUri("/oauth2/authorization") //이 엔드포인트 요청에 대해 아래에 쿠키로 요청데이터저장
                                 .authorizationRequestRepository(oAuth2AuthorizationRequestBasedOnCookieRepository()))
                         .redirectionEndpoint(redirection -> redirection
-                                .baseUri("/*/oauth2/code/*"))
-                        .userInfoEndpoint(userInfo -> userInfo
+                                .baseUri("/*/oauth2/code/*")) //각 인증페이지로 리디렉션된 요청을 처리, 액세스토큰 교환
+                        .userInfoEndpoint(userInfo -> userInfo //사용자 정보 획득
                                 .userService(oAuth2UserService))
                         .successHandler(oAuth2AuthenticationSuccessHandler())
                         .failureHandler(oAuth2AuthenticationFailureHandler()));

src/main/java/com/boggle_boggle/bbegok/controller/AppleController.java

@@ -0,0 +1,27 @@
+package com.boggle_boggle.bbegok.controller;
+
+import com.boggle_boggle.bbegok.service.AppleService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.web.DefaultRedirectStrategy;
+import org.springframework.security.web.RedirectStrategy;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+
+@RestController
+@RequiredArgsConstructor
+public class AppleController {
+
+    private final AppleService appleService;
+
+    @GetMapping("/oauth2/authorization/apple")
+    public void loginRequest(HttpServletResponse response,
+                             @RequestParam(value = "redirect_uri", required = true) String redirectUri) throws IOException {
+        response.sendRedirect(appleService.getAppleLoginUrl(redirectUri));
+    }
+}

src/main/java/com/boggle_boggle/bbegok/oauth/entity/ProviderType.java

@@ -5,5 +5,6 @@
 @Getter
 public enum ProviderType {
     KAKAO,
-    GOOGLE;
+    GOOGLE,
+    APPLE;
 }

src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/AppleOAuth2UserInfo.java

@@ -0,0 +1,15 @@
+package com.boggle_boggle.bbegok.oauth.info.impl;
+
+import com.boggle_boggle.bbegok.oauth.info.OAuth2UserInfo;
+
+import java.util.Map;
+
+public class AppleOAuth2UserInfo extends OAuth2UserInfo {
+
+    public AppleOAuth2UserInfo(Map<String, Object> attributes) { super(attributes); }
+
+    @Override
+    public String getId() {
+        return String.valueOf(attributes.get("sub"));
+    }
+}

src/main/java/com/boggle_boggle/bbegok/oauth/info/impl/GoogleOAuth2UserInfo.java

@@ -12,6 +12,6 @@ public GoogleOAuth2UserInfo(Map<String, Object> attributes) {
 
     @Override
     public String getId() {
-        return (String) attributes.get("sub");
+        return String.valueOf(attributes.get("sub"));
     }
 }