Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@ public Mono<GoogleLoginResponseV3> 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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Loading