fix: support native iOS Apple login

Author: jjoonleo

ontime-back/src/main/java/devkor/ontime_back/global/oauth/apple/AppleLoginFilter.java

@@ -97,8 +97,8 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
             }
 
         } catch (Exception e) {
-            log.error("Apple login failed: {}", e.getClass().getSimpleName());
-            throw new AuthenticationException("Apple 로그인 실패") {};
+            log.error("Apple login failed", e);
+            throw new AppleLoginException();
         }
     }
 
@@ -109,7 +109,9 @@ protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServle
             return;
         }
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-        response.getWriter().write("{\"status\":\"error\", \"message\":\"Authentication failed\"}");
+        response.setContentType("application/json");
+        response.setCharacterEncoding("UTF-8");
+        response.getWriter().write("{\"status\":\"error\", \"message\":\"Apple 로그인 실패\"}");
     }
 
     private static class RequestValidationException extends AuthenticationException {
@@ -118,4 +120,10 @@ private RequestValidationException() {
         }
     }
 
+    private static class AppleLoginException extends AuthenticationException {
+        private AppleLoginException() {
+            super("Apple login failed");
+        }
+    }
+
 }

ontime-back/src/main/java/devkor/ontime_back/global/oauth/apple/AppleLoginService.java

@@ -51,7 +51,6 @@ public class AppleLoginService {
 
     private static final String APPLE_KEYS_URL = "https://appleid.apple.com/auth/keys";
     private static final String APPLE_TOKEN_URL = "https://appleid.apple.com/auth/token";
-    private static final String REDIRECT_URI = "https://ontime-back.duckdns.org/oauth2/apple/callback";
     private String issuer = "https://appleid.apple.com";
     @Value("${apple.client.id}")
     private String clientId;
@@ -198,12 +197,7 @@ public AppleTokenResponseDto getAppleAccessTokenAndRefreshToken(String authCode)
         // clientSecret
         String clientSecret = generateClientSecret();
         log.info("Exchange Apple credential");
-        MultiValueMap<String, String> requestBody = new LinkedMultiValueMap<>();
-        requestBody.add("grant_type", "authorization_code");
-        requestBody.add("code", authCode);
-        requestBody.add("client_id", clientId);
-        requestBody.add("client_secret", clientSecret);
-        requestBody.add("redirect_uri", REDIRECT_URI);
+        MultiValueMap<String, String> requestBody = buildAppleTokenRequestBody(authCode, clientSecret);
 
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
@@ -219,6 +213,15 @@ public AppleTokenResponseDto getAppleAccessTokenAndRefreshToken(String authCode)
         return objectMapper.treeToValue(response, AppleTokenResponseDto.class);
     }
 
+    MultiValueMap<String, String> buildAppleTokenRequestBody(String authCode, String clientSecret) {
+        MultiValueMap<String, String> requestBody = new LinkedMultiValueMap<>();
+        requestBody.add("grant_type", "authorization_code");
+        requestBody.add("code", authCode);
+        requestBody.add("client_id", clientId);
+        requestBody.add("client_secret", clientSecret);
+        return requestBody;
+    }
+
     // clientsecret 생성
     private String generateClientSecret() throws Exception {
         log.info("Generate Apple client credential");

ontime-back/src/test/java/devkor/ontime_back/global/oauth/apple/AppleLoginServiceTest.java

@@ -28,6 +28,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
@@ -223,6 +224,21 @@ void getAppleAccessTokenAndRefreshTokenExchangesAuthCodeWithClientSecret() throw
         assertThat(response.getIdToken()).isEqualTo("identity-token");
     }
 
+    @Test
+    void nativeAppleTokenRequestDoesNotIncludeRedirectUri() {
+        ReflectionTestUtils.setField(appleLoginService, "clientId", "club.devkor.ontime.ios");
+
+        MultiValueMap<String, String> body = appleLoginService.buildAppleTokenRequestBody(
+                "apple-auth-code",
+                "apple-client-secret");
+
+        assertThat(body).containsEntry("grant_type", java.util.List.of("authorization_code"));
+        assertThat(body).containsEntry("code", java.util.List.of("apple-auth-code"));
+        assertThat(body).containsEntry("client_id", java.util.List.of("club.devkor.ontime.ios"));
+        assertThat(body).containsEntry("client_secret", java.util.List.of("apple-client-secret"));
+        assertThat(body).doesNotContainKey("redirect_uri");
+    }
+
     @Test
     void revokeTokenReturnsFalseWhenAppleAcceptsCurrentRefreshToken() throws Exception {
         RestTemplate restTemplate = mockRestTemplate();