Skip to content

Develop -> main merge #203

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
Merged
worhs02 merged 4 commits into from
Nov 5, 2025
Merged

Develop -> main merge #203

worhs02 merged 4 commits into from
Nov 5, 2025

Conversation

@worhs02
Copy link
Collaborator

@worhs02 worhs02 commented Nov 4, 2025

๐Ÿ”— ๊ด€๋ จ ์ด์Šˆ

์—ฐ๊ด€๋œ ์ด์Šˆ ๋ฒˆํ˜ธ๋ฅผ ์ ์–ด์ฃผ์„ธ์š”. (์˜ˆ: #123)

๐Ÿ“Œ PR ์š”์•ฝ

PR์— ๋Œ€ํ•œ ๊ฐ„๋žตํ•œ ์„ค๋ช…์„ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.
(์˜ˆ: ํ•ด๋‹น ๋ณ€๊ฒฝ ์‚ฌํ•ญ์˜ ๋ชฉ์ ์ด๋‚˜ ์ฃผ์š” ๋‚ด์šฉ)

๐Ÿ“‘ ์ž‘์—… ๋‚ด์šฉ

์ž‘์—…์˜ ์„ธ๋ถ€ ๋‚ด์šฉ์„ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.

  1. ์ž‘์—… ๋‚ด์šฉ 1
  2. ์ž‘์—… ๋‚ด์šฉ 2
  3. ์ž‘์—… ๋‚ด์šฉ 3

์Šคํฌ๋ฆฐ์ƒท (์„ ํƒ)

๐Ÿ’ก ์ถ”๊ฐ€ ์ฐธ๊ณ  ์‚ฌํ•ญ

PR์— ๋Œ€ํ•ด ์ถ”๊ฐ€์ ์œผ๋กœ ๋…ผ์˜ํ•˜๊ฑฐ๋‚˜ ์ฐธ๊ณ ํ•ด์•ผ ํ•  ๋‚ด์šฉ์„ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.
(์˜ˆ: ๋ณ€๊ฒฝ์‚ฌํ•ญ์ด ์ฝ”๋“œ๋ฒ ์ด์Šค์— ๋ฏธ์น˜๋Š” ์˜ํ–ฅ, ํ…Œ์ŠคํŠธ ๋ฐฉ๋ฒ• ๋“ฑ)

worhs02 and others added 4 commits November 4, 2025 15:59
@worhs02
fix/#198: ํƒˆํ‡ด ๋ณต๊ตฌ ํ”Œ๋กœ์šฐ ์ˆ˜์ • - ์†Œ์…œ ํ† ํฐ ๊ธฐ๋ฐ˜ ๋ณต๊ตฌ ๊ตฌํ˜„
bcf6a2f 
- ํƒˆํ‡ด ์‹ ์ฒญ ์‹œ ๋กœ๊ทธ์ธ ์ฐจ๋‹จ ๋กœ์ง ์ถ”๊ฐ€ (GoogleOauth, AppleOauth)
- JWT ๋Œ€์‹  ์†Œ์…œ access token์œผ๋กœ ๋ณต๊ตฌ ์š”์ฒญ ์ฒ˜๋ฆฌ
- ์†Œ์…œ ์ œ๊ณต์ž์—์„œ ์‚ฌ์šฉ์ž ์ •๋ณด ์žฌ๊ฒ€์ฆ ํ›„ ๋ณต๊ตฌ ์ฒ˜๋ฆฌ
- ๊ธฐ์กด JWT ๊ธฐ๋ฐ˜ ๋ณต๊ตฌ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ ์ œ๊ฑฐ (JwtAuthenticationFilter)
- ์ƒˆ๋กœ์šด ๋ณต๊ตฌ ์—”๋“œํฌ์ธํŠธ: POST /auth/{socialLoginType}/reactivate
- MEMBER_NOT_DEACTIVATED ์—๋Ÿฌ ์ฝ”๋“œ ์ถ”๊ฐ€
@worhs02
Merge pull request #199 from DivaryOfficial/fix/#198-withdrawal-recovโ€ฆ
379c1e3 
โ€ฆery-flow

fix/#198: ํƒˆํ‡ด ๋ณต๊ตฌ ํ”Œ๋กœ์šฐ ์ˆ˜์ • - ์†Œ์…œ ํ† ํฐ ๊ธฐ๋ฐ˜ ๋ณต๊ตฌ ๊ตฌํ˜„
@worhs02
fix/#200: Apple/Google ์†Œ์…œ ๋กœ๊ทธ์ธ์„ socialId ๊ธฐ๋ฐ˜์œผ๋กœ ๋ณ€๊ฒฝ
ba32375 
- Member ์—”ํ‹ฐํ‹ฐ์— socialId, socialType ํ•„๋“œ ์ถ”๊ฐ€ (๋ณตํ•ฉ ์œ ๋‹ˆํฌ ์ œ์•ฝ)
- Apple/Google ๋กœ๊ทธ์ธ ์‹œ sub/id๋ฅผ socialId๋กœ ์‚ฌ์šฉํ•˜์—ฌ ํšŒ์› ์กฐํšŒ
- ๊ธฐ์กด ํšŒ์› ์ž๋™ ๋งˆ์ด๊ทธ๋ ˆ์ด์…˜ ๋กœ์ง ์ถ”๊ฐ€ (socialId null์ธ ๊ฒฝ์šฐ ์—…๋ฐ์ดํŠธ)
- ๋‹ค๋ฅธ ์†Œ์…œ ํƒ€์ž… ์ค‘๋ณต ๊ฐ€์ž… ๋ฐฉ์ง€ ๋ฐ ์—๋Ÿฌ ์ฒ˜๋ฆฌ
@worhs02
Merge pull request #201 from DivaryOfficial/fix/#200-apple-recovery-wโ€ฆ
76a4e60 
โ€ฆith-sub

fix/#200: Apple/Google ์†Œ์…œ ๋กœ๊ทธ์ธ์„ socialId ๊ธฐ๋ฐ˜์œผ๋กœ ๋ณ€๊ฒฝ
@worhs02 worhs02 changed the title Develop -> main merger Develop -> main merge Nov 4, 2025
@worhs02 worhs02 requested a review from sereene November 5, 2025 02:09
sereene
sereene approved these changes Nov 5, 2025
View reviewed changes
Copy link
Collaborator

@sereene sereene left a comment

Choose a reason for hiding this comment

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

๊ณ ์ƒํ•˜์…จ์Šต๋‹ˆ๋‹ค!

@worhs02 worhs02 merged commit 97d9ec9 into main Nov 5, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sereene sereene sereene approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@worhs02 @sereene