Merge pull request #192 from DevKor-github/mod/googlelogin

[Mod] google login clientid 설정 수정 및 docker container 한국시간대 설정

Author: JunbeomKoreaUniv

.github/workflows/test.yml

@@ -80,7 +80,8 @@ jobs:
           echo "jwt.refresh.expiration=${{ secrets.JWT_REFRESH_EXPIRATION }}" >> ontime-back/src/main/resources/application.properties
           echo "jwt.access.header=${{ secrets.JWT_ACCESS_HEADER }}" >> ontime-back/src/main/resources/application.properties
           echo "jwt.refresh.header=${{ secrets.JWT_REFRESH_HEADER }}" >> ontime-back/src/main/resources/application.properties
-          echo "spring.security.oauth2.client.registration.google.client-id=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID }}" >> ontime-back/src/main/resources/application.properties
+          echo "google.web.client-id = ${{ secrets.GOOGLE_WEB_CLIENT_ID }}" >> ontime-back/src/main/resources/application.properties
+          echo "google.app.client-id = ${{ secrets.GOOGLE_APP_CLIENT_ID }}" >> ontime-back/src/main/resources/application.properties
           echo "spring.security.oauth2.client.registration.google.client-secret=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET }}" >> ontime-back/src/main/resources/application.properties
           echo "spring.security.oauth2.client.registration.google.scope=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_SCOPE }}" >> ontime-back/src/main/resources/application.properties
           echo "spring.security.oauth2.client.registration.google.redirect-uri=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_REDIRECT_URI }}" >> ontime-back/src/main/resources/application.properties

ontime-back/Dockerfile

@@ -1,4 +1,7 @@
 FROM openjdk:17
+RUN apk add --no-cache tzdata && \
+    ln -snf /usr/share/zoneinfo/Asia/Seoul /etc/localtime && \
+    echo "Asia/Seoul" > /etc/timezone
 WORKDIR /app
 COPY project.jar app.jar
 ENTRYPOINT ["java", "-jar", "/app/app.jar"]

ontime-back/build.gradle

@@ -49,7 +49,7 @@ dependencies {
 	implementation 'com.auth0:java-jwt:4.4.0'
 
 	// oauth
-	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+//	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
 	// Swagger
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'

ontime-back/src/main/java/devkor/ontime_back/controller/SocialAuthController.java

@@ -38,7 +38,7 @@ public class SocialAuthController {
                     content = @Content(
                             schema = @Schema(
                                     type = "object",
-                                    example = "{\n \"accessToken\": \"ya29.xxxxxxx\" }"
+                                    example = "{\n \"idToken\": \"eyJhbGxxxxxxx\" ,\n  \"refreshToken\": \"\"}}"
                             )
                     )
             )

ontime-back/src/main/java/devkor/ontime_back/dto/SocialUserSignupDto.java

@@ -29,21 +29,32 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 @Slf4j
 @Service
-@RequiredArgsConstructor
 public class GoogleLoginService {
 
     private final JwtTokenProvider jwtTokenProvider;
     private final UserRepository userRepository;
     private static final String GOOGLE_USER_INFO_URL = "https://www.googleapis.com/userinfo/v2/me";
     private static final String GOOGLE_REVOKE_URL = "https://oauth2.googleapis.com/revoke?token=";
 
-    @Value("${spring.security.oauth2.client.registration.google.client-id}")
-    private String clientId;
+    private final List<String> validClientIds;
+
+    public GoogleLoginService(
+            JwtTokenProvider jwtTokenProvider,
+            UserRepository userRepository,
+            @Value("${google.web.client-id}") String webClientId,
+            @Value("${google.app.client-id}") String appClientId
+    ) {
+        this.jwtTokenProvider = jwtTokenProvider;
+        this.userRepository = userRepository;
+        this.validClientIds = List.of(webClientId, appClientId);
+    }
+
 
     public Authentication handleLogin(OAuthGoogleRequestDto oAuthGoogleRequestDto, User user, HttpServletResponse response) throws IOException {
         user.updateSocialLoginToken(oAuthGoogleRequestDto.getRefreshToken());
@@ -111,10 +122,14 @@ public Authentication handleRegister(OAuthGoogleRequestDto oAuthGoogleRequestDto
         response.setContentType("application/json");
         response.setCharacterEncoding("UTF-8");
 
+        String msg = savedUser.getRole().name().equals("GUEST") ? "유저의 ROLE이 GUEST이므로 온보딩API를 호출해 온보딩을 진행해야합니다." : "로그인에 성공하였습니다.";
+        // JSON 응답 생성
         String responseBody = String.format(
-                "{\"message\": \"%s\", \"role\": \"%s\"}",
-                "회원가입이 완료되었습니다. ROLE이 GUEST이므로 온보딩이 필요합니다.",
-                savedUser.getRole().name()
+                "{ \"status\": \"success\", \"code\": \"200\", \"message\": \"%s\", \"data\": { " +
+                        "\"userId\": %d, \"email\": \"%s\", \"name\": \"%s\", " +
+                        "\"spareTime\": %d, \"note\": %s, \"punctualityScore\": %f, \"role\": \"%s\" } }",
+                msg, savedUser.getId(), savedUser.getEmail(), savedUser.getName(),
+                savedUser.getSpareTime(), savedUser.getNote() != null ? "\"" + savedUser.getNote() + "\"" : null, savedUser.getPunctualityScore(), savedUser.getRole().name()
         );
 
         response.getWriter().write(responseBody);
@@ -127,7 +142,7 @@ public GoogleIdToken.Payload verifyIdentityToken(String identityToken) throws Ex
         GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(
                 new NetHttpTransport(),
                 GsonFactory.getDefaultInstance())
-                .setAudience(Collections.singletonList(clientId)) // aud 확인
+                .setAudience(validClientIds) // aud 확인
                 .build();
 
         GoogleIdToken idToken = verifier.verify(identityToken); // Google의 공개 키를 사용하여 idToken 서명을 검증