Skip to content

[Merge] 운영서버에 변경사항 반영 #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junggyo1020 merged 3 commits into from
Aug 18, 2025
Merged

[Merge] 운영서버에 변경사항 반영 #304

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a64707
fix(auth): 회원가입 시 authId의 Bearer 접두사 처리
jsoonworld Aug 12, 2025
7a75cc4
merge : 회원가입 시 authId의 Bearer 접두사 처리
jsoonworld Aug 12, 2025
ba9ad74
merge : 회원가입 시 authId의 Bearer 접두사 처리
jsoonworld Aug 12, 2025
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
11 changes: 9 additions & 2 deletions src/main/java/org/terning/terningserver/auth/application/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ public class AuthService {
private final ApplicationEventPublisher eventPublisher;
private final NotificationUserClient notificationUserClient;
private final FilterRepository filterRepository;
private static final String TOKEN_PREFIX = "Bearer ";


@Transactional
public SignInResponse signIn(String socialAccessToken, SignInRequest request) {
Expand All @@ -61,11 +63,16 @@ public SignInResponse signIn(String socialAccessToken, SignInRequest request) {

@Transactional
public SignUpResponse signUp(String authId, SignUpRequest request) {
if (userRepository.existsByAuthIdAndAuthType(authId, request.authType())) {
String resolvedAuthId = authId;
if (resolvedAuthId != null && resolvedAuthId.startsWith(TOKEN_PREFIX)) {
resolvedAuthId = resolvedAuthId.substring(TOKEN_PREFIX.length());
}

if (userRepository.existsByAuthIdAndAuthType(resolvedAuthId, request.authType())) {
throw new AuthException(AuthErrorCode.USER_ALREADY_EXIST);
}

User userToSave = User.from(authId, request);
User userToSave = User.from(resolvedAuthId, request);
userRepository.save(userToSave);

Token token = jwtProvider.generateTokens(userToSave.getId());
Expand Down
Loading