Skip to content

Commit 49943da

Browse files
authored
Merge pull request #161 from Pinback-Team/feat/#160
feat: 로그인 응답 필드 추가
2 parents ece587a + fb9b0a4 commit 49943da

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

application/src/main/java/com/pinback/application/auth/usecase/AuthUsecase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,10 @@ public Mono<GoogleLoginResponseV3> getInfoAndTokenV3(String email, String pictur
167167

168168
saveRefreshTokenToRedis(updatedUser.getId(), refreshToken);
169169

170+
String jobRole = updatedUser.hasJob() ? updatedUser.getJob().getValue() : null;
171+
170172
return Mono.just(GoogleLoginResponseV3.loggedIn(
171-
updatedUser.hasJob(), updatedUser.getId(), updatedUser.getEmail(), accessToken,
173+
updatedUser.hasJob(), jobRole, updatedUser.getId(), updatedUser.getEmail(), accessToken,
172174
refreshToken
173175
));
174176
} else {

application/src/main/java/com/pinback/application/google/dto/response/GoogleLoginResponseV3.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@
55
public record GoogleLoginResponseV3(
66
boolean isUser,
77
boolean hasJob,
8+
String jobRole,
89
UUID userId,
910
String email,
1011
String accessToken,
1112
String refreshToken
1213
) {
13-
public static GoogleLoginResponseV3 loggedIn(boolean hasJob, UUID userId, String email, String accessToken,
14+
public static GoogleLoginResponseV3 loggedIn(boolean hasJob, String jobRole, UUID userId, String email,
15+
String accessToken,
1416
String refreshToken) {
15-
return new GoogleLoginResponseV3(true, hasJob, userId, email, accessToken, refreshToken);
17+
return new GoogleLoginResponseV3(true, hasJob, jobRole, userId, email, accessToken, refreshToken);
1618
}
1719

1820
public static GoogleLoginResponseV3 tempLogin(UUID userId, String email) {
19-
return new GoogleLoginResponseV3(false, false, userId, email, null, null);
21+
return new GoogleLoginResponseV3(false, false, null, userId, email, null, null);
2022
}
2123
}

0 commit comments

Comments
 (0)