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.

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

[Fix] 로그인 관련 버그 핫픽스 #44

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions apps/web/src/app/(afterLogin)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PropsWithChildren } from 'react'
import { userService, UserStatus } from '@vook-client/api'
import { cookies, headers } from 'next/headers'
import { UserInfoResponse, userService, UserStatus } from '@vook-client/api'
import { cookies } from 'next/headers'
import { redirect } from 'next/navigation'
import { dehydrate, HydrationBoundary } from '@tanstack/react-query'

Expand All @@ -15,24 +15,30 @@ import { mainArea } from './layout.css'

const Layout = async ({ children }: PropsWithChildren) => {
const cookieStore = cookies()
const isAuthorization = headers().get('X-AuthConfirm')

if (isAuthorization !== 'confirmed') {
redirect('/login')
}

const access = cookieStore.get('access')?.value || ''
const refresh = cookieStore.get('refresh')?.value || ''

if (!access && !refresh) {
if (!access || !refresh) {
redirect('/login')
}

const queryClient = getQueryClient()

queryClient.setQueryData(['access'], access)
queryClient.setQueryData(['refresh'], refresh)

const user = await userService.userInfo(queryClient)
let user: UserInfoResponse

try {
user = await userService.userInfo(queryClient)
} catch {
redirect('/login')
}

if (user.result.onboardingCompleted === false) {
redirect('/onboarding')
}

if (user.result.status !== UserStatus.Registered) {
redirect('/signup')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const termTitleContainer = style({
})

export const highlightHit = style({
backgroundColor: vars.colors['component-alternative'],
backgroundColor: vars.colors['semantic-line-alternative'],
})

export const highlight = style({
Expand Down
22 changes: 3 additions & 19 deletions apps/web/src/app/(afterLogin)/workspace/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,20 @@
import { PropsWithChildren } from 'react'
import { userService, UserStatus } from '@vook-client/api'
import { cookies, headers } from 'next/headers'
import { redirect } from 'next/navigation'
import { cookies } from 'next/headers'
import { dehydrate, HydrationBoundary } from '@tanstack/react-query'

import { getQueryClient } from '@/utils/react-query'

const Layout = async ({ children }: PropsWithChildren) => {
const Layout = ({ children }: PropsWithChildren) => {
const cookieStore = cookies()
const isAuthorization = headers().get('X-AuthConfirm')

if (isAuthorization !== 'confirmed') {
redirect('/login')
}

const access = cookieStore.get('access')?.value || ''
const refresh = cookieStore.get('refresh')?.value || ''

if (!access && !refresh) {
redirect('/login')
}

const queryClient = getQueryClient()

queryClient.setQueryData(['access'], access)
queryClient.setQueryData(['refresh'], refresh)

const user = await userService.userInfo(queryClient)

if (user.result.status !== UserStatus.Registered) {
redirect('/signup')
}

const dehydrateState = dehydrate(queryClient)

return (
Expand Down
7 changes: 7 additions & 0 deletions apps/web/src/app/(beforeLogin)/auth/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { redirect } from 'next/navigation'

const Page = () => {
return redirect('/login')
}

export default Page
8 changes: 0 additions & 8 deletions apps/web/src/app/(beforeLogin)/auth/token/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ const AuthCallbackPage = ({
secure: true,
expires: new Date('2038-01-19T03:14:07.000Z'),
})
window.postMessage(
{
from: 'vook-web',
access,
refresh,
},
'*',
)
queryClient.setQueryData(['access'], access)
queryClient.setQueryData(['refresh'], refresh)

Expand Down
47 changes: 25 additions & 22 deletions apps/web/src/app/(onboarding)/onboarding/job/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import {
SelectBox,
Text,
} from '@vook-client/design-system'
import React from 'react'
import React, { useEffect } from 'react'
import { OnboardingJob, useOnboardingMutation } from '@vook-client/api'
import { useRouter } from 'next/navigation'

import { Link } from '@/components/Link'

import { SelectBoxGroup } from '../_components/SelectBoxGroup'
import { useOnBoarding } from '../_context/useOnboarding'
import { OnboardingHeader } from '../_components/OnboardingHeader'
Expand Down Expand Up @@ -76,10 +74,17 @@ const OnboardingJobPage = () => {
},
)

const onSubmitFunnel = () => {
if (!mutation.isPending || !mutation.isSuccess) {
mutation.mutate()
useEffect(() => {
window.onpopstate = () => {
if (location.pathname === '/onboarding/job') {
alert('뒤로가기를 통한 접근을 감지하여 페이지를 이동합니다.')
router.push('/workspace')
}
}
}, [router])

const onSubmitFunnel = () => {
mutation.mutate()
}

const onClickJob = (job: OnboardingJob) => {
Expand Down Expand Up @@ -122,22 +127,20 @@ const OnboardingJobPage = () => {
<Text type="body-2" color="label-alternative" onClick={onSubmitFunnel}>
건너뛰기
</Text>
<Link href="/onboarding/job">
<Button
onClick={onSubmitFunnel}
size="middle"
disabled={
selectedJob === null || mutation.isPending || mutation.isSuccess
}
suffixIcon={
mutation.isPending || mutation.isSuccess
? 'spinner-medium'
: undefined
}
>
시작하기
</Button>
</Link>
<Button
onClick={onSubmitFunnel}
size="middle"
disabled={
selectedJob === null || mutation.isPending || mutation.isSuccess
}
suffixIcon={
mutation.isPending || mutation.isSuccess
? 'spinner-medium'
: undefined
}
>
시작하기
</Button>
</div>
</div>
)
Expand Down
14 changes: 11 additions & 3 deletions apps/web/src/app/(onboarding)/onboarding/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,29 @@ import { OnBoardingProvider } from './_context/useOnboarding'

const Layout = async ({ children }: PropsWithChildren) => {
const cookieStore = cookies()

const accessToken = cookieStore.get('access')?.value
const refreshToken = cookieStore.get('refresh')?.value

if (!accessToken && !refreshToken) {
if (!accessToken || !refreshToken) {
redirect('/login')
}

const queryClient = getQueryClient()

queryClient.setQueryData(['access'], accessToken)
queryClient.setQueryData(['refresh'], refreshToken)

const userInfo = await userService.userInfo(queryClient)
let userInfo

try {
userInfo = await userService.userInfo(queryClient)
} catch {
redirect('/login')
}

if (userInfo.result.onboardingCompleted) {
redirect('/')
redirect('/workspace')
}

return (
Expand Down
14 changes: 14 additions & 0 deletions apps/web/src/components/InitialSetting/InitialSetting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

import { baseFetcher } from '@vook-client/api'
import { useLayoutEffect } from 'react'
import Cookies from 'js-cookie'
import { useQueryClient } from '@tanstack/react-query'

import { useToast } from '@/hooks/useToast'

export const InitialSetting = () => {
const { addToast } = useToast()
const client = useQueryClient()

useLayoutEffect(() => {
// eslint-disable-next-line promise/prefer-await-to-callbacks
client.setQueryData(['access'], Cookies.get('access'))
client.setQueryData(['refresh'], Cookies.get('refresh'))

baseFetcher.setUnAuthorizedHandler(() => {
location.href = '/login'
})
Expand All @@ -19,6 +25,14 @@ export const InitialSetting = () => {
type: 'error',
})
})
baseFetcher.setTokenRefreshHandler((access, refresh) => {
Cookies.set('access', access, {
expires: new Date('2038-01-19T03:14:07.000Z'),
})
Cookies.set('refresh', refresh, {
expires: new Date('2038-01-19T03:14:07.000Z'),
})
})
}, [addToast])

return null
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/ProfileEditForm/ProfileEditForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const ProfileEditForm = () => {

const userEditMutation = useEditUserMutation(
{
nickname,
nickname: nickname.trim(),
},
{
onSuccess: () => {
Expand Down Expand Up @@ -56,7 +56,7 @@ export const ProfileEditForm = () => {

useEffect(
function checkValidateNickname() {
const isBlankNickname = nickname.length === 0
const isBlankNickname = nickname.trim().length === 0
const isSameNickname = nickname === user?.nickname

if (isBlankNickname || isSameNickname) {
Expand Down
12 changes: 5 additions & 7 deletions apps/web/src/components/SignUpForm/SignUpForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,11 @@ export const SignUpForm = () => {
[signUpMutation.isPending],
)

const canSubmit = useMemo(
() =>
!formState.isValid ||
signUpMutation.isPending ||
signUpMutation.isSuccess,
[formState.isValid, signUpMutation.isPending, signUpMutation.isSuccess],
)
const canSubmit =
watch('nickname').trim().length === 0 ||
!formState.isValid ||
signUpMutation.isPending ||
signUpMutation.isSuccess

if (!userInfoQuery.data) {
return null
Expand Down
Loading
Loading