hotfix: 베포환경 로그인 문제

gloddy-dev · Apr 8, 2024 · 830c80e · 830c80e
1 parent f3c4986
commit 830c80e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/web/src/apis/auth/mutations.ts b/packages/web/src/apis/auth/mutations.ts
@@ -20,11 +20,13 @@ export const useLoginMutation = () => {
  return useMutation({
  mutationFn: postLogin,
  onSuccess: async (response: LoginResponse) => {
- await login({
- accessToken: response.token.accessToken,
- refreshToken: response.token.refreshToken,
- userId: response.userId,
- });
+ if (response.existUser) {
+ await login({
+ accessToken: response.token.accessToken,
+ refreshToken: response.token.refreshToken,
+ userId: response.userId,
+ });
+ }
  },
  });
 };

diff --git a/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.tsx b/packages/web/src/app/[lng]/(sub)/join/funnels/step1/components/NumberVerifyForm.tsx
@@ -12,7 +12,6 @@ import { LayerLoading } from '@/components/Loading';
 import { useTimerContext } from '@/components/Provider';
 import { TextFieldController } from '@/components/TextField';
 import { regexr } from '@/constants/regexr';
-import useLogin from '@/hooks/token/useLogin';
 
 interface NumberVerifyFormProps {
  setInputStatus: React.Dispatch<React.SetStateAction<'beforeSend' | 'afterSend'>>;
@@ -23,11 +22,10 @@ export default function NumberVerifyForm({ setInputStatus }: NumberVerifyFormPro
  const hookForm = useJoinContext();
  const { handleSubmit, setError, register, watch, resetField } = hookForm;
  const { time, reset, start } = useTimerContext();
- const { login } = useLogin();
 
  const { nextStep } = useFunnelContext();
  const { mutate: mutateSMSVerify } = useSMSVerifyMutation();
- const { mutate: mutateLogin, status } = useLoginMutation();
+ const { mutateAsync: mutateLogin, status } = useLoginMutation();
  const { mutate: mutateSMS } = useSMSMutation();
 
  const handleResend = () => {
@@ -62,8 +60,13 @@ export default function NumberVerifyForm({ setInputStatus }: NumberVerifyFormPro
  code: '' + data.verifyNumber,
  },
  {
- onSuccess: () => {
- mutateLogin({ phoneNumber: data.phoneNumber });
+ onSuccess: async () => {
+ const response = await mutateLogin({ phoneNumber: data.phoneNumber });
+
+ if (!response.existUser) {
+ nextStep();
+ return;
+ }
  },
  onError: () => {
  setError('verifyNumber', {