diff --git a/application/src/main/java/com/pinback/application/auth/usecase/AuthUsecase.java b/application/src/main/java/com/pinback/application/auth/usecase/AuthUsecase.java index bd7a778..6724a14 100644 --- a/application/src/main/java/com/pinback/application/auth/usecase/AuthUsecase.java +++ b/application/src/main/java/com/pinback/application/auth/usecase/AuthUsecase.java @@ -167,8 +167,10 @@ public Mono getInfoAndTokenV3(String email, String pictur saveRefreshTokenToRedis(updatedUser.getId(), refreshToken); + String jobRole = updatedUser.hasJob() ? updatedUser.getJob().getValue() : null; + return Mono.just(GoogleLoginResponseV3.loggedIn( - updatedUser.hasJob(), updatedUser.getId(), updatedUser.getEmail(), accessToken, + updatedUser.hasJob(), jobRole, updatedUser.getId(), updatedUser.getEmail(), accessToken, refreshToken )); } else { diff --git a/application/src/main/java/com/pinback/application/google/dto/response/GoogleLoginResponseV3.java b/application/src/main/java/com/pinback/application/google/dto/response/GoogleLoginResponseV3.java index 59780c9..c556a4e 100644 --- a/application/src/main/java/com/pinback/application/google/dto/response/GoogleLoginResponseV3.java +++ b/application/src/main/java/com/pinback/application/google/dto/response/GoogleLoginResponseV3.java @@ -5,17 +5,19 @@ public record GoogleLoginResponseV3( boolean isUser, boolean hasJob, + String jobRole, UUID userId, String email, String accessToken, String refreshToken ) { - public static GoogleLoginResponseV3 loggedIn(boolean hasJob, UUID userId, String email, String accessToken, + public static GoogleLoginResponseV3 loggedIn(boolean hasJob, String jobRole, UUID userId, String email, + String accessToken, String refreshToken) { - return new GoogleLoginResponseV3(true, hasJob, userId, email, accessToken, refreshToken); + return new GoogleLoginResponseV3(true, hasJob, jobRole, userId, email, accessToken, refreshToken); } public static GoogleLoginResponseV3 tempLogin(UUID userId, String email) { - return new GoogleLoginResponseV3(false, false, userId, email, null, null); + return new GoogleLoginResponseV3(false, false, null, userId, email, null, null); } }