Support comma-separated Google client IDs

Author: jjoonleo

ontime-back/docs/deployment/ec2.md

@@ -30,7 +30,7 @@ The workflow builds a Docker image, pushes it to GHCR, uploads `docker-compose.y
 - `JWT_ACCESS_HEADER`
 - `JWT_REFRESH_HEADER`
 - `GOOGLE_WEB_CLIENT_ID`
-- `GOOGLE_APP_CLIENT_ID`
+- `GOOGLE_APP_CLIENT_ID` (comma-separated iOS and Android client IDs when both platforms are enabled)
 - `APPLE_CLIENT_ID`
 - `APPLE_LOGIN_KEY`
 - `APPLE_TEAM_ID`

ontime-back/src/main/java/devkor/ontime_back/global/oauth/google/GoogleLoginService.java

@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 @Slf4j
 @Service
@@ -58,7 +59,13 @@ public GoogleLoginService(
         this.jwtTokenProvider = jwtTokenProvider;
         this.userRepository = userRepository;
         this.userAlarmSettingRepository = userAlarmSettingRepository;
-        this.validClientIds = List.of(webClientId, appClientId);
+        this.validClientIds = Stream.concat(
+                        Stream.of(webClientId),
+                        Stream.of(appClientId.split(","))
+                )
+                .map(String::trim)
+                .filter(clientId -> !clientId.isBlank())
+                .toList();
     }
 
 

ontime-back/src/main/resources/application-prod.properties

@@ -19,6 +19,10 @@ spring.flyway.baseline-on-migrate=false
 logging.level.root=INFO
 logging.level.devkor.ontime_back=INFO
 
+# Google OAuth
+google.web.client-id=${GOOGLE_WEB_CLIENT_ID}
+google.app.client-id=${GOOGLE_APP_CLIENT_ID}
+
 # Actuator
 management.endpoint.health.probes.enabled=true
 management.endpoints.web.exposure.include=health