Skip to content

Commit

Permalink
[#4] OAuthId Integer 초과 Exception 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
jun108059 committed Oct 18, 2021
1 parent 18d9ec5 commit 6fd6faa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@Getter
public class OAuthAttributes {
private final Map<String, Object> attributes; // OAuth2 반환하는 유저 정보 Map
private final Integer oauthId;
private final String oauthId;
private final String nameAttributeKey;
private final String name;
private final String email;
Expand All @@ -40,7 +40,7 @@ public static OAuthAttributes of(String provider, String userNameAttributeName,

private static OAuthAttributes ofGoogle(String userNameAttributeName, Map<String, Object> attributes) {
return OAuthAttributes.builder()
.oauthId((Integer) attributes.get("id"))
.oauthId((String) attributes.get("sub"))
.name((String) attributes.get("name"))
.email((String) attributes.get("email"))
.picture((String) attributes.get("picture"))
Expand All @@ -57,7 +57,7 @@ private static OAuthAttributes ofKakao(Map<String, Object> attributes) {
Map<String, Object> kakaoProfile = (Map<String, Object>) kakaoAccount.get("profile");

return OAuthAttributes.builder()
.oauthId((Integer) attributes.get("id"))
.oauthId(String.valueOf(attributes.get("id")))
.name((String) kakaoProfile.get("nickname"))
.email((String) kakaoAccount.get("email"))
.picture((String) kakaoProfile.get("profile_image_url"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public Member getOneMember(Long memIdx) {
*/
@Transactional(readOnly = true)
public boolean isExistedNickName(String nickName) {
return memberRepository.findByNickName(nickName).orElseGet(null) != null;
return memberRepository.findByNickName(nickName).orElse(null) != null;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class Member extends BaseTimeEntity {
private Long memIdx;

@Column(name = "oauth_id")
private Integer oauthId;
private String oauthId;

@Column(name = "password")
private String password;
Expand All @@ -45,7 +45,7 @@ public class Member extends BaseTimeEntity {
private Provider provider; // OAuth2 Provider

@Builder
public Member(Integer oauthId, String password, String name, String nickName, String email, String picture, Role role, Provider provider) {
public Member(String oauthId, String password, String name, String nickName, String email, String picture, Role role, Provider provider) {
this.oauthId = oauthId;
this.password = password;
this.name = name;
Expand Down

0 comments on commit 6fd6faa

Please sign in to comment.