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 @@ -56,6 +56,8 @@ public class User {

private String firebaseToken;

@Lob
@Column(columnDefinition = "LONGTEXT")
private String socialLoginToken;

@OneToOne(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.ALL)
Expand Down Expand Up @@ -134,4 +136,4 @@ public void updateFirebaseToken(String firebaseToken) {
public void updateAccessToken(String accessToken) {
this.accessToken = accessToken;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import devkor.ontime_back.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.persister.entity.EntityNameUse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetails;
Expand Down Expand Up @@ -44,7 +43,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
userRepository.saveAndFlush(user);

log.info("로그인에 성공하였습니다. 이메일 : {}", email);
log.info("로그인에 성공하였습니다. AccessToken : {}", accessToken);
log.info("발급된 AccessToken 만료 기간 : {}", accessTokenExpiration);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ public class LoginService implements UserDetailsService {
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
User user = userRepository.findByEmail(email)
.orElseThrow(() -> new UsernameNotFoundException("해당 이메일이 존재하지 않습니다."));

System.out.println("유저임다: "+user);

return org.springframework.security.core.userdetails.User.builder()
.username(user.getEmail())
.password(user.getPassword())
.roles(user.getRole().name())
.build();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void sendAccessToken(HttpServletResponse response, String accessToken) {
response.setStatus(HttpServletResponse.SC_OK);

response.setHeader(accessHeader, accessToken);
log.info("발급된 Access Token : {}", accessToken);
log.info("Access Token 헤더 설정 완료");
}

// accessToken + refreshToken header에 넣어서 전송
Expand All @@ -88,7 +88,6 @@ public void sendAccessAndRefreshToken(HttpServletResponse response, String acces

setAccessTokenHeader(response, accessToken);
setRefreshTokenHeader(response, refreshToken);
log.info("accesstoken: " + accessToken + "refreshtoken" + refreshToken);
log.info("Access Token, Refresh Token 헤더 설정 완료");
}

Expand Down Expand Up @@ -199,4 +198,4 @@ public String createExpiredAccessToken(String email) {
.sign(Algorithm.HMAC512(secretKey));
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ public AppleTokenResponseDto getAppleAccessTokenAndRefreshToken(String authCode)
String clientSecret = generateClientSecret();
log.info("getAppleAccessTokenAndRefreshToken");
log.info("client_id: {}", clientId);
log.info("client_secret: {}", clientSecret);
MultiValueMap<String, String> requestBody = new LinkedMultiValueMap<>();
requestBody.add("grant_type", "authorization_code");
requestBody.add("code", authCode);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE `user`
MODIFY COLUMN `social_login_token` LONGTEXT NULL;