Skip to content

Commit d78af6c

Browse files
committed
[FIX] 카카오 로그인 로직 수정
1 parent 723a914 commit d78af6c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

api/routes/user.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ async def kakao_callback(code: str):
4141
# 프론트에서 code 보냄
4242
@router.patch("/login")
4343
async def kakao_login(request: KakaoLoginRequest, db: Session = Depends(get_db)):
44-
# 프론트에서 받은 데이터를 바로 사용
4544
kakao_id = request.kakao_id
4645
nickname = request.nickname
4746
profile_image = request.profile_img
@@ -50,11 +49,13 @@ async def kakao_login(request: KakaoLoginRequest, db: Session = Depends(get_db))
5049
user = get_user_by_kakao_id(db, kakao_id)
5150

5251
if user:
52+
# 기존 유저: 로그인 처리
5353
update_kakao_login(db, user.user_id, None, nickname, profile_image)
5454
return {"message": "카카오 로그인 성공", "user_id": user.user_id, "nickname": nickname}
5555

5656
# 신규 유저: 회원가입 후 로그인 처리
5757
new_user = create_user(db, kakao_id, nickname, profile_image, None)
58+
5859
return {"message": "회원가입 및 로그인 성공", "user_id": new_user.user_id, "nickname": nickname}
5960

6061
# 카카오 로그아웃

crud/user.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,16 @@ def create_user(db: Session, kakao_id: int, nickname: str, profile_image: str, a
5454
def update_kakao_login(db: Session, user_id: int, access_token: str, nickname: str, profile_image: str):
5555
db_user = db.query(User).filter(User.user_id == user_id).first()
5656

57-
print("db 업데이트 전 access token: ", access_token)
58-
db_user.social_token = access_token if access_token else "INVALID TOKEN"
57+
if access_token: # 액세스 토큰이 있을 경우에만 업데이트
58+
db_user.social_token = access_token
59+
5960
db_user.login_channel = "KAKAO"
6061
db_user.nickname = nickname
6162
db_user.profile_image = profile_image
6263
db_user.updated_date = datetime.utcnow()
6364

6465
db.commit()
6566
db.refresh(db_user)
66-
67-
print("db에 저장된 social_token:", db_user.social_token)
6867
return db_user
6968

7069
# 카카오 로그아웃

models/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ class User(Base):
1818
login_channel = Column(Enum(LoginChannel), nullable=True)
1919
kakao_id = Column(BigInteger, unique=True, nullable=False)
2020
score = Column(Integer, nullable=False)
21-
social_token = Column(String(255), nullable=False)
21+
social_token = Column(String(255), nullable=True)
2222
created_date = Column(DateTime, server_default=func.now())
2323
updated_date = Column(DateTime, onupdate=func.now())

0 commit comments

Comments
 (0)