Skip to content

Dev #107

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

Merged
iubns merged 3 commits into from
Jul 26, 2026
Merged

Dev #107

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f0e6eb
fix: 잘못된 로그인 로직 수정
iubns Jul 26, 2026
326c591
Merge pull request #106 from nuon-dev/main
iubns Jul 26, 2026
bde750d
Merge branch 'deploy' into dev
iubns Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions client/src/app/common/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,33 @@ function Login() {

useEffect(() => {
const code = searchParams.get("code")
console.log("code", code)
console.log("isLogin", isLogin)
if (code) {
//카카오에서 리다이렉트된 경우
getKakaoTokenFromAuthCode(code).then((kakaoToken) => {
login(kakaoToken)
.then(() => {
const returnUrl = searchParams.get("state")
push(returnUrl || "/")
})
.catch((e) => {
const returnUrl = searchParams.get("state")
if (returnUrl === "/retreat/register") {
push(`/retreat/search`)
}
})
})
} else if (isLogin) {
const returnUrl = searchParams.get("returnUrl")
if (isLogin) {
const returnUrl =
searchParams.get("returnUrl") || searchParams.get("state")
push(returnUrl || "/")
} else if (code) {
//카카오에서 리다이렉트된 경우
getKakaoTokenFromAuthCode(code)
.then((kakaoToken) => {
console.log("kakaoToken", kakaoToken)
login(kakaoToken)
.then(() => {
const returnUrl = searchParams.get("state")
push(returnUrl || "/")
})
.catch((e) => {
const returnUrl = searchParams.get("state")
if (returnUrl === "/retreat/register") {
push(`/retreat/search`)
}
})
})
.catch((e) => {
const returnUrl = searchParams.get("state")
if (returnUrl === "/retreat/register") {
push(`/retreat/search`)
}
})
}
}, [searchParams.get("code"), isLogin])

Expand Down
Loading