Skip to content

Commit

Permalink
Merge pull request #152 from eod940/058-FIX-OAUTH2
Browse files Browse the repository at this point in the history
hotfix: [058-FIX-OAUTH2] 카카오 로그인시 잘못된 경로로 가는 등 버그 수정
  • Loading branch information
eod940 committed Apr 24, 2024
2 parents 6c49fef + b1f6ff7 commit 59fa0a1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/main/java/com/valuewith/tweaver/member/entity/Member.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.valuewith.tweaver.member.entity;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.valuewith.tweaver.auditing.BaseEntity;
import com.valuewith.tweaver.constants.Provider;
import com.valuewith.tweaver.member.dto.MemberDto;
Expand Down Expand Up @@ -60,6 +61,7 @@ public class Member extends BaseEntity {

private String refreshToken; // refreshToken

@JsonIgnore
@OneToMany(mappedBy = "member")
@Builder.Default
private List<Message> messages = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.valuewith.tweaver.message.entity;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.valuewith.tweaver.auditing.BaseEntity;
import com.valuewith.tweaver.chat.entity.ChatRoom;
import com.valuewith.tweaver.member.entity.Member;
Expand Down Expand Up @@ -40,6 +41,7 @@ public class Message extends BaseEntity {
@JoinColumn(name = "chat_room_id")
private ChatRoom chatRoom;

@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "member_id")
private Member member;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ kakao-rest-api-key: ${kakao-rest-api-key}
app:
oauth2:
authorizedRedirectUris:
- https://tweaver.vercel.app/oauth2/kakao
- https://valuewith.site/oauth2/kakao

logging:
level:
Expand Down

0 comments on commit 59fa0a1

Please sign in to comment.