Skip to content

Commit 07e1ef9

Browse files
authored
Merge pull request #154 from wafflestudio/151-bug-auth-fix
인증 플로우 업데이트
2 parents 740a7a6 + 0351d0f commit 07e1ef9

File tree

5 files changed

+4
-18
lines changed

5 files changed

+4
-18
lines changed

src/components/auth/LoginCard.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ interface LoginResponse {
2020
message: string
2121
data: {
2222
accessToken: string
23-
refreshToken: string
2423
} | null
2524
}
2625

@@ -93,7 +92,6 @@ const LoginCard = () => {
9392

9493
if (res.isSuccess && res.data) {
9594
localStorage.setItem('accessToken', res.data.accessToken)
96-
localStorage.setItem('refreshToken', res.data.refreshToken)
9795
await invalidateCurrentUser()
9896
navigate({ to: '/', search: { page: 1 } })
9997
} else {

src/features/auth/verification/main/model.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ export function useVerification() {
3434
.json<{
3535
data: {
3636
accessToken: string
37-
refreshToken: string
3837
}
3938
isSuccess: boolean
4039
}>()
4140

4241
if (res.isSuccess) {
4342
localStorage.setItem('accessToken', res.data.accessToken)
44-
localStorage.setItem('refreshToken', res.data.refreshToken)
4543
await invalidateCurrentUser()
4644
navigate({
4745
to: '/',

src/shared/api/authApi.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,22 @@ type RefreshResponse = {
55
message: string
66
data: {
77
accessToken: string
8-
refreshToken: string
98
}
109
success: boolean
1110
}
1211

1312
const authInstance = ky.create({
1413
prefixUrl: import.meta.env.VITE_API_URL,
1514
timeout: 10000,
15+
credentials: 'include',
1616
headers: {
1717
'Content-Type': 'application/json',
1818
},
1919
retry: 0,
2020
})
2121

2222
export async function refreshAccessToken() {
23-
const refreshToken = localStorage.getItem('refreshToken')
24-
const response = await authInstance.post('api/v1/auth/refresh', {
25-
json: { refreshToken },
26-
})
23+
const response = await authInstance.post('api/v1/auth/refresh')
2724
const result = await response.json<RefreshResponse>()
2825
return result.data
2926
}

src/shared/api/ky.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ if (!import.meta.env.VITE_API_URL) {
1111
const DEV = import.meta.env.DEV
1212
const requestStartTimes = new WeakMap<NormalizedOptions, number>()
1313
let isRefreshing = false
14-
let refreshPromise: Promise<{
15-
accessToken: string
16-
refreshToken: string
17-
}> | null = null
14+
let refreshPromise: Promise<{ accessToken: string }> | null = null
1815

1916
function maskHeaders(headersInit: HeadersInit | undefined) {
2017
const headers = headersInit ? new Headers(headersInit) : undefined
@@ -48,6 +45,7 @@ function getDurationMs(options: NormalizedOptions) {
4845
export const instance = ky.create({
4946
prefixUrl: import.meta.env.VITE_API_URL,
5047
timeout: 10000,
48+
credentials: 'include',
5149
headers: {
5250
'Content-Type': 'application/json',
5351
},
@@ -135,13 +133,11 @@ export const instance = ky.create({
135133
try {
136134
const data = await refreshPromise
137135
localStorage.setItem('accessToken', data.accessToken)
138-
localStorage.setItem('refreshToken', data.refreshToken)
139136
void queryClient.invalidateQueries({
140137
queryKey: currentUserQueryKey,
141138
})
142139
} catch {
143140
localStorage.removeItem('accessToken')
144-
localStorage.removeItem('refreshToken')
145141
useAuthStore.getState().setSessionExpired()
146142
} finally {
147143
isRefreshing = false

src/shared/auth/useAuth.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ type LoginResponse = {
1313
success: boolean
1414
data: {
1515
accessToken: string
16-
refreshToken: string
1716
}
1817
}
1918

@@ -32,7 +31,6 @@ export function useAuth() {
3231

3332
if (response.success) {
3433
localStorage.setItem('accessToken', response.data.accessToken)
35-
localStorage.setItem('refreshToken', response.data.refreshToken)
3634
await invalidateCurrentUser()
3735
navigate({ to: '/', search: { page: 1 } })
3836
}
@@ -44,7 +42,6 @@ export function useAuth() {
4442
await instance.post('api/v1/auth/logout')
4543
} finally {
4644
localStorage.removeItem('accessToken')
47-
localStorage.removeItem('refreshToken')
4845
clearCurrentUser()
4946
reset()
5047
navigate({ to: '/login' })

0 commit comments

Comments
 (0)