Skip to content
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

Jump to bottom

[Test] 소셜 로그인 로그 확인 #250

Merged
merged 1 commit into from
May 18, 2024
+9 −1
Merged

[Test] 소셜 로그인 로그 확인 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/java/org/winey/server/service/auth/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.Random;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.winey.server.config.jwt.JwtService;
Expand All @@ -25,6 +26,7 @@
import org.winey.server.service.auth.apple.AppleSignInService;
import org.winey.server.service.auth.kakao.KakaoSignInService;

@Slf4j
@Service
@RequiredArgsConstructor
public class AuthService {
Expand All @@ -45,10 +47,12 @@ public class AuthService {
@Transactional
public SignInResponseDto signIn(String socialAccessToken, SignInRequestDto requestDto) {
SocialType socialType = SocialType.valueOf(requestDto.getSocialType());
log.info("after get social type");
String socialId = login(socialType, socialAccessToken);
log.info("after get social info");

Boolean isRegistered = userRepository.existsBySocialIdAndSocialType(socialId, socialType);

log.info("after check isRegistered");
if (!isRegistered) {
String randomString= new Random().ints(6, 0, 36).mapToObj(i -> Character.toString("abcdefghijklmnopqrstuvwxyz0123456789".charAt(i))).collect(Collectors.joining());
while (userRepository.existsByNickname("위니"+randomString)) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/winey/server/service/auth/kakao/KakaoSignInService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonArray;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
Expand All @@ -12,6 +13,7 @@

import java.util.Map;

@Slf4j
@Service
@RequiredArgsConstructor
public class KakaoSignInService {
Expand All @@ -24,7 +26,9 @@ public String getKaKaoId(String accessToken) {
headers.add("Authorization","Bearer "+ accessToken);
HttpEntity<JsonArray> httpEntity = new HttpEntity<>(headers);
ResponseEntity<Object> responseData;
log.info("before kakao post");
responseData = restTemplate.postForEntity(KAKAO_URL,httpEntity,Object.class);
log.info("after kakao post");
ObjectMapper objectMapper = new ObjectMapper();
return objectMapper.convertValue(responseData.getBody(), Map.class).get("id").toString(); //소셜 id만 가져오는듯.
}
Expand Down
Loading