Skip to content

Commit

Permalink
[Fix]: merge conflict resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
dev-Crayon committed Apr 29, 2024
2 parents 620adeb + 2c20033 commit cfb8c9b
Showing 1 changed file with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ public SocialSignupResponse signup(SocialSignupRequest request, Platform platfor
Jwt jwt = jwtProvider.getUserJwt(signupUser.getSocialInfo().getSocialId());

return SocialSignupResponse.builder()
.id(signupUser.getId())
.username(signupUser.getUsername())
.socialId(signupUser.getSocialInfo().getSocialId())
.accessToken(jwt.accessToken())
.refreshToken(jwt.refreshToken())
.build();
.id(signupUser.getId())
.username(signupUser.getUsername())
.socialId(signupUser.getSocialInfo().getSocialId())
.accessToken(jwt.accessToken())
.refreshToken(jwt.refreshToken())
.build();
}

@Transactional
Expand Down

0 comments on commit cfb8c9b

Please sign in to comment.