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.

Sign up for GitHub

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

Jump to bottom

Feat/#51 social #60

Merged
merged 14 commits into from
Nov 28, 2023
Merged

Feat/#51 social #60

merged 14 commits into from
Nov 28, 2023

Conversation

dong2ast
Copy link
Contributor

@dong2ast dong2ast commented Nov 16, 2023 •
edited by Sion99
Loading

✅ PR 타입(하나 이상의 PR 타입을 선택해주세요)

  • 기능 추가
  • 기능 변경
  • 기능 삭제
  • 버그 수정
  • 의존성, 환경 변수, 빌드 관련 코드 업데이트

📌 관련 이슈

ex) closed #Issue_number
closed #51

✨ 과제 내용

  • 소셜로그인 기능을 추가했습니다 (카카오, 구글)
  • 기존 아이디와 소셜로그인 연동 기능을 추가했습니다 (검증필요)

📸 스크린샷(선택)

📚 레퍼런스 (또는 새로 알게 된 내용) 혹은 궁금한 사항들

  • 프론트와 소셜 로그인 로직을 어떻게 나눠가질지 논의가 필요합니다.
  • yaml 파일 설정이 필요합니다.

@dong2ast dong2ast added 🛠️설정 빌드, 라이브러리, config 설정이 변경됐을 때 🚀개발 새로운 기능을 추가 했을 때 labels Nov 16, 2023
@dong2ast dong2ast linked an issue Nov 16, 2023 that may be closed by this pull request
[feat] 소셜로그인 #51
Closed
4 tasks
dong2ast and others added 3 commits November 16, 2023 11:13
@dong2ast
Merge branch 'main' into feat/#51-social
65db695
@baebae02 @dong2ast
refactor: tab and swagger tag
092fded 
(cherry picked from commit 7fd4b1a)
@dong2ast
Merge remote-tracking branch 'origin/feat/#51-social' into feat/#51-s…
028c9e0 
…ocial

# Conflicts:
#	src/main/java/com/uspray/uspray/controller/AuthController.java
@dong2ast dong2ast self-assigned this Nov 17, 2023
Sion99
Sion99 approved these changes Nov 18, 2023
View reviewed changes
Copy link
Member

@Sion99 Sion99 left a comment

Choose a reason for hiding this comment

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

소셜 로그인 기능이 복잡한데 구현하신다고 고생 많으셨습니다!
한 번 돌려보고 싶었는데 yml 내용을 몰라서 아쉽지만 나중에 한 번 확인해보고 싶네요 ㅎㅎ

baebae02
baebae02 approved these changes Nov 18, 2023
View reviewed changes
Copy link
Member

@baebae02 baebae02 left a comment

Choose a reason for hiding this comment

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

너무 작업도 많고 복잡한데 하시느라 수고하셨어요 ... ㅠ ㅠ
코드만 보고서는 제대로 이해되지 않는 것도 많아서 머지되고 난 이후에 혼자 돌려보며 더 공부하겠습니다! 수고하셨어요 !!

src/main/java/com/uspray/uspray/domain/Member.java Show resolved Hide resolved
src/main/java/com/uspray/uspray/external/client/oauth2/CustomOAuth2UserService.java Show resolved Hide resolved
@dong2ast
feat: 네이버 소셜로그인 추가
99942ab
@dong2ast
Merge branch 'main' into feat/#51-social
a4193f9 
# Conflicts:
#	src/main/java/com/uspray/uspray/domain/Member.java
#	src/main/java/com/uspray/uspray/exception/SuccessStatus.java
@dong2ast
fix: 빌드 에러 수정
2826391
@dong2ast dong2ast merged commit c0be1e2 into main Nov 28, 2023
1 check passed
@dong2ast dong2ast deleted the feat/#51-social branch November 28, 2023 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@baebae02 baebae02 baebae02 approved these changes

@Sion99 Sion99 Sion99 approved these changes

Assignees

@dong2ast dong2ast

Labels
🚀개발 새로운 기능을 추가 했을 때 🛠️설정 빌드, 라이브러리, config 설정이 변경됐을 때
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[feat] 소셜로그인
3 participants
@dong2ast @baebae02 @Sion99