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.

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

[LIME-122] 카카오 소셜 로그인 처리 방식 수정 #63

Merged
merged 16 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8695497
chore : 소셜로그인 사용 방식 변경으로 인한 oauth2의존성 제거
HandmadeCloud Mar 7, 2024
285f2a4
feat : 카카오 소셜로그인 code를 받아 처리하는 비즈니스 로직 구현
HandmadeCloud Mar 7, 2024
17d4d60
refactor : 소셜 id long타입으로 변경
HandmadeCloud Mar 7, 2024
098c363
feat : 카카오 전용 토큰 요청 및 수신 dto 생성
HandmadeCloud Mar 7, 2024
71911d1
refactor: 카카오 소셜로그인 방식 변경으로 인한 security 설정 변경
HandmadeCloud Mar 7, 2024
e145506
refactor : property 추가로 인한 스캔 범위 수정
HandmadeCloud Mar 7, 2024
5d9ba7d
chore : 개행 수정
HandmadeCloud Mar 7, 2024
9c935dd
fix : gradle 소셜로그인 의존성 제거 및 프로퍼티 적용 의존성 추가
HandmadeCloud Mar 7, 2024
79aa60c
chore : 각종 handler, entrypoint 시도중
HandmadeCloud Mar 7, 2024
9dd6d04
chore : 파일 이동
HandmadeCloud Mar 8, 2024
68683b6
refactor : 인가처리 단계에서 권한 확인 후 인증처리 전 프로필 업데이트 양식으로 리다이렉트 처리
HandmadeCloud Mar 8, 2024
f2332eb
chore : 사용하지 않는 코드 정리
HandmadeCloud Mar 8, 2024
188a92a
refactor : join페이지로 리다이렉트, 해당 권한 승인 처리
HandmadeCloud Mar 8, 2024
05d9cf0
refactor : refreshToken전달방식 변경
HandmadeCloud Mar 9, 2024
2f94280
chore : 컨벤션 및 사용 문법 수정
HandmadeCloud Mar 9, 2024
852f50e
refactor : 레이어 역참조 문제 해결
HandmadeCloud Mar 9, 2024
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 @@ -5,16 +5,19 @@
public record MemberLoginResponse(
Long memberId,
String nickname,
String accessToken
String accessToken,
String refreshToken
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

p1;
refresh token을 이전에 사용하던 방식인 쿠키로 안보내고 요청 바디에 담아서 보내는 이유가 있을까요??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

05d9cf0 반영 완료

) {
public static MemberLoginResponse from(
final Member member,
final String accessToken
final String accessToken,
final String refreshToken
) {
return new MemberLoginResponse(
member.getId(),
member.getNickname(),
accessToken
accessToken,
refreshToken
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

Expand Down Expand Up @@ -60,7 +61,7 @@ public Member(
this.status = MemberStatus.ACTIVE;
}

public String getSocialId() {
public Long getSocialId() {
return socialInfo.getSocialId();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
public class SocialInfo {

@Column(name = "social_id")
private String socialId;
private Long socialId;

@Column(name = "email", nullable = false)
private String email;
Expand All @@ -33,7 +33,7 @@ public class SocialInfo {

@Builder
public SocialInfo(
final String socialId,
final Long socialId,
final String email,
final String profileImage,
final SocialType socialType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import com.programmers.lime.error.ErrorCode;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

@Slf4j
@Component
@RequiredArgsConstructor
@Transactional(readOnly = true)
Expand Down Expand Up @@ -58,7 +60,10 @@ public MyPage readMyPage(final Member member) {
return new MyPage(memberProfile, bucketProfiles, inventoryProfiles);
}

public Optional<Member> readBySocialIdAndSocialType(String socialId, SocialType socialType) {
public Optional<Member> readBySocialIdAndSocialType(
final Long socialId,
final SocialType socialType
) {
return memberRepository.findBySocialInfoSocialIdAndSocialInfoSocialType(socialId, socialType);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
Optional<Member> findByNicknameNickname(final String nickname);

Optional<Member> findBySocialInfoSocialIdAndSocialInfoSocialType(
final String socialId,
final Long socialId,
final SocialType socialType
);
}