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
9 changes: 9 additions & 0 deletions src/main/java/com/example/SucceSS/domain/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.example.SucceSS.domain.common.BaseEntity;
import com.example.SucceSS.domain.common.Role;
import com.example.SucceSS.domain.enums.*;
import com.example.SucceSS.web.dto.KakaoAccountDto;
import jakarta.persistence.*;
import lombok.*;
import org.antlr.v4.runtime.misc.NotNull;
Expand All @@ -29,6 +30,9 @@ public class Member extends BaseEntity {
@Column(name = "nickname")
private String nickname;

@Column(name="profileImgUrl")
private String profileImgUrl;

@NotNull
@Enumerated(EnumType.STRING)
@Column(name="user_role")
Expand All @@ -48,4 +52,9 @@ public class Member extends BaseEntity {
@OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
private List<MemberHobby> memberHobbies = new ArrayList<>();

public void updateProfile(KakaoAccountDto userInfo) {
this.nickname = userInfo.getKakaoAccount().getProfile().getNickName();
this.profileImgUrl = userInfo.getKakaoAccount().getProfile().getProfileImgUrl();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.example.SucceSS.repository.MemberRepository;
import com.example.SucceSS.web.dto.KakaoAccountDto;
import com.example.SucceSS.web.dto.LoginResponseDto;
import com.example.SucceSS.web.dto.TokenDto;
import lombok.RequiredArgsConstructor;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
Expand All @@ -29,17 +30,18 @@ public class AuthService {
@Transactional
public LoginResponseDto signIn(String code) {
KakaoAccountDto userInfo = kakaoService.getUserInfo(code);
boolean[] isFirstLogin = { false };
Member member = findOrSaveMember(userInfo, isFirstLogin);
isFirstLogin[0] = !memberHobbyRepository.existsByMemberId(member.getId());
Member member = findOrSaveMember(userInfo);
// 첫 로그인이 아닌 경우에도 프로필의 변경사항 업데이트
member.updateProfile(userInfo);

Authentication authentication = setAuthentication(member.getSocialId(), "KAKAO");
boolean isFirstLogin = !memberHobbyRepository.existsByMemberId(member.getId());

LoginResponseDto loginResponseDto = isFirstLogin[0]
? new LoginResponseDto(true)
: new LoginResponseDto(false);
loginResponseDto.setTokens(jwtProvider.generateToken(authentication));
return loginResponseDto;
return LoginResponseDto.of(isFirstLogin, setAuthenticationAndGetTokens(member.getSocialId()), member);
}

private TokenDto setAuthenticationAndGetTokens(String socialId) {
Authentication authentication = setAuthentication(socialId, "KAKAO");
return jwtProvider.generateToken(authentication);
}

@Transactional
Expand All @@ -60,10 +62,9 @@ private Authentication setAuthentication(String socialId, String password) {
return authentication;
}

private Member findOrSaveMember(KakaoAccountDto userInfo, boolean[] isFirstLogin) {
private Member findOrSaveMember(KakaoAccountDto userInfo) {
return memberRepository.findBySocialId(userInfo.getId().toString())
.orElseGet(() -> {
isFirstLogin[0] = true;
return saveMember(userInfo);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public class Profile {
//닉네임
@JsonProperty("nickname")
public String nickName;

@JsonProperty("profile_image_url")
public String profileImgUrl;
}

}
Expand All @@ -47,6 +50,7 @@ public static Member toMemberEntity(KakaoAccountDto dto) {
return Member.builder()
.socialId(dto.getId().toString())
.nickname(dto.getKakaoAccount().getProfile().getNickName())
.profileImgUrl(dto.getKakaoAccount().getProfile().getProfileImgUrl())
.userRole(Role.ROLE_USER)
.build();
}
Expand Down
21 changes: 13 additions & 8 deletions src/main/java/com/example/SucceSS/web/dto/LoginResponseDto.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.SucceSS.web.dto;

import com.example.SucceSS.domain.Member;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -8,19 +9,23 @@
@Builder
@Getter
@AllArgsConstructor
@NoArgsConstructor
public class LoginResponseDto {
private String accessToken;
private String refreshToken;
private String grantType;
private boolean firstLogIn;
private String nickname;
private String profileImgUrl;

public LoginResponseDto(boolean firstLogIn) {
this.firstLogIn = firstLogIn;
}

public void setTokens(TokenDto dto) {
this.accessToken = dto.getAccessToken();
this.refreshToken = dto.getRefreshToken();
this.grantType = dto.getGrantType();
public static LoginResponseDto of(boolean isFirstLogin, TokenDto tokens, Member member) {
return LoginResponseDto.builder()
.firstLogIn(isFirstLogin)
.accessToken(tokens.getAccessToken())
.refreshToken(tokens.getRefreshToken())
.grantType(tokens.getGrantType())
.nickname(member.getNickname())
.profileImgUrl(member.getProfileImgUrl())
.build();
}
}