refactor: 리다이렉트 유틸함수 생성

EveryUniv · Apr 15, 2024 · bd25f09 · bd25f09
1 parent b37d15e
commit bd25f09
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/src/components/reset/id.tsx b/src/components/reset/id.tsx
@@ -6,6 +6,8 @@ import { formatphoneNumber } from '@utils/tell';
 import React, { ChangeEvent } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 
+import { isOAuthFlow, redirectToClient } from '@/utils/oAuth';
+
 export default function IdForm() {
    const [phoneNumber, setPhoneNumber] = React.useState<string>('');
    //TODO) 인증번호 전송 여부 Toast 추가
@@ -36,11 +38,11 @@ export default function IdForm() {
    };
 
    const redirectLogin = () => {
-      if (searchParams.has('redirectUrl')) {
-         window.location.href = searchParams.get('redirectUrl') || '';
-         return;
+      if (isOAuthFlow(searchParams)) {
+         redirectToClient(searchParams);
+      } else {
+         navigate('/login');
       }
-      navigate('/login');
    };
 
    return (

diff --git a/src/components/reset/pw.tsx b/src/components/reset/pw.tsx
@@ -6,6 +6,8 @@ import { useAlert } from '@hooks/useAlert';
 import React, { ChangeEvent } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 
+import { isOAuthFlow, redirectToClient } from '@/utils/oAuth';
+
 export default function ResetPwForm({ token }: { token: string }) {
    const [password, setPassword] = React.useState<string>('');
    const [passwordConfirm, setPasswordConfirm] = React.useState<string>('');
@@ -44,8 +46,8 @@ export default function ResetPwForm({ token }: { token: string }) {
       if (resetSuccess) {
          alert('비밀번호가 변경되었습니다.');
 
-         if (searchParams.has('redirectUrl')) {
-            window.location.href = searchParams.get('redirectUrl') || '';
+         if (isOAuthFlow(searchParams)) {
+            redirectToClient(searchParams);
          } else {
             navigate('/login');
          }

diff --git a/src/hooks/api/signup/usePostSignup.ts b/src/hooks/api/signup/usePostSignup.ts
@@ -4,6 +4,8 @@ import { post } from '@libs/api';
 import { useMutation } from '@tanstack/react-query';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 
+import { isOAuthFlow, redirectToClient } from '@/utils/oAuth';
+
 export interface UserRegistrationInfo {
    nickname: string;
    password: string;
@@ -19,11 +21,11 @@ export const usePostSignup = (signupToken: string) => {
             password,
          }),
       onSuccess: () => {
-         if (searchParams.has('redirectUrl')) {
-            window.location.href = searchParams.get('redirectUrl') || '';
-            return;
+         if (isOAuthFlow(searchParams)) {
+            redirectToClient(searchParams);
+         } else {
+            navigate(ROUTES.LOGIN);
          }
-         navigate(ROUTES.LOGIN);
       },
    });
 };
diff --git a/src/utils/oAuth.ts b/src/utils/oAuth.ts
@@ -0,0 +1,9 @@
+const redirectToClient = (searchParams: URLSearchParams) => {
+   window.location.href = searchParams.get('redirectUri') || '';
+};
+
+const isOAuthFlow = (searchParams: URLSearchParams) => {
+   return searchParams.has('redirectUri');
+};
+
+export { redirectToClient, isOAuthFlow };