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

회원가입 api 리팩토링 #84

Merged
merged 6 commits into from
Aug 13, 2024
Merged
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
9 changes: 9 additions & 0 deletions src/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
'use client';

import { useJoinEmailStore } from '@/features/account/model/useJoinEmailStore';
import ChangePassword from '@/features/account/ui/ChangePassword';
import GoToJoin from '@/features/account/ui/GoToJoin';
import LoginForm from '@/features/account/ui/LoginForm';
import Image from 'next/image';
import { useEffect } from 'react';

const page = () => {
const { resetVerificationComplete } = useJoinEmailStore();
useEffect(() => {
resetVerificationComplete();
}, []);

return (
<>
<div className="flex flex-col justify-center items-center mt-14 ">
Expand Down
13 changes: 11 additions & 2 deletions src/features/account/model/useChangePwEmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { z } from 'zod';
import { useChangePwEmailStore } from './useChangePwEmailStore';
import { useGetVerification } from '../api/queries';
import { useEffect, useState } from 'react';
import { toast } from '@/shared/ui/ui/use-toast';

export const useChangePwEmail = () => {
const { setIsEmailValid, setIsSubmitted } = useChangePwEmailStore();
Expand Down Expand Up @@ -32,10 +33,18 @@ export const useChangePwEmail = () => {
setIsSubmitted(true);
setIsLoading(true);

const { isError } = await refetchGetVerification();
const { isError, error } = await refetchGetVerification();

if (isError) {
setIsEmailValid(true);
if (error.response?.status === 400) {
setIsEmailValid(true);
} else {
toast({
variant: 'destructive',
description:
'가입한 이메일 검증에 실패했습니다. 관리자에게 문의하세요.',
});
}
} else {
setIsEmailValid(false);
}
Expand Down
3 changes: 1 addition & 2 deletions src/features/account/model/useJoin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { PostJoinProps } from '../api/types';
import { toast } from '@/shared/ui/ui/use-toast';

export const useJoin = () => {
const { resetVerificationComplete, email } = useJoinEmailStore();
const { email } = useJoinEmailStore();

const userNameRegex = /^[가-힣]+$/;
const passwordRegex =
Expand Down Expand Up @@ -70,7 +70,6 @@ export const useJoin = () => {
description: '회원 가입에 성공했습니다. 로그인 화면으로 이동합니다.',
});
router.push('/login');
resetVerificationComplete();
} catch (error) {
toast({
variant: 'destructive',
Expand Down
27 changes: 21 additions & 6 deletions src/features/account/model/useJoinEmail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,19 @@ export const useJoinEmail = () => {
setOtpInput('');
setIsEmailValid(true);

const { isError } = await refetchGetVerification();
const { isError, error } = await refetchGetVerification();

if (isError) {
setIsEmailDuplicated(true);
setIsDuplicationChecked(true);
if (error.response?.status === 400) {
setIsEmailDuplicated(true);
setIsDuplicationChecked(true);
} else {
toast({
variant: 'destructive',
description:
'이메일 중복 확인에 실패했습니다. 관리자에게 문의하세요.',
});
}
} else {
setIsEmailDuplicated(false);
setIsDuplicationChecked(true);
Expand Down Expand Up @@ -105,10 +113,17 @@ export const useJoinEmail = () => {
useGetEmailCodeVerification(email, otpInput);

const handleVerifyOtp = async () => {
const { isError } = await refetchGetEmailCodeVerification();
const { isError, error } = await refetchGetEmailCodeVerification();
if (isError) {
setVerificationComplete(false);
setOtpError(true);
if (error.response?.status === 404) {
setVerificationComplete(false);
setOtpError(true);
} else {
toast({
variant: 'destructive',
description: '인증 번호 검증에 실패했습니다. 관리자에게 문의하세요.',
});
}
} else {
setVerificationComplete(true);
setOtpError(false);
Expand Down
61 changes: 0 additions & 61 deletions src/shared/api/authInstance.ts

This file was deleted.

42 changes: 38 additions & 4 deletions src/shared/api/instance.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import axios from 'axios';
import { deleteCookie, getCookie } from 'cookies-next';

const baseUrl = process.env.NEXT_PUBLIC_BASE_URL;

Expand All @@ -11,22 +12,55 @@ export const instance = axios.create({
withCredentials: true,
});

const reqInterceptor = instance.interceptors.request.use(
instance.interceptors.request.use(
(config) => {
console.log('Request Interceptor', config);
const accessToken = getCookie('accessToken');
if (accessToken) {
config.headers['Authorization'] = `Bearer ${accessToken}`;
}
return config;
},
(error) => {
return Promise.reject(error);
},
);

const resInterceptor = instance.interceptors.response.use(
const handleUnauthorized = () => {
deleteCookie('accessToken');
deleteCookie('refreshToken');
alert('세션이 만료되었습니다. 다시 로그인해주세요.');
window.location.replace('/login');
};

instance.interceptors.response.use(
(response) => {
console.log('Response Interceptor', response);
return response;
},
(error) => {
//에러코드 임시로 달아둠
if (error.response?.status === 401) {
if (error.response?.data && 'code' in error.response.data) {
// 리프레시 토큰이 유효하지 않을 때 (에러코드 임시)
if (error.response.data.code === 1001) {
handleUnauthorized();
}
} else {
const accessToken = getCookie('accessToken');
if (accessToken) {
//refresh 토큰 재요청하는 api
/*const res = await REFRESH_API.refreshToken({
accessToken: accessToken,
refreshToken: getCookie('refreshToken') as string,
});
setCookie('accessToken', res.data.accessToken);
setCookie('refreshToken', res.data.refreshToken);*/
} else {
deleteCookie('accessToken');
deleteCookie('refreshToken');
window.location.replace('/login');
}
}
}
return Promise.reject(error);
},
);
4 changes: 2 additions & 2 deletions src/shared/lib/assets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export const collageItems = [
'건축대학',
'방목기초교육대학',
];
//임시 '융소' => 백엔드 학과코드 더미로 올라가 있음
export const departmentItems = ['융소', '법학과', '경영학과'];
//임시 '응용소프트웨어전공' => 백엔드 학과코드 더미로 올라가 있음
export const departmentItems = ['응용소프트웨어전공', '법학과', '경영학과'];