fix: 회원가입 체크를 토큰 확인 안에서 수행

Qfeed-Dev · Oct 15, 2023 · 6625ba0 · 6625ba0
1 parent 3a9b18a
commit 6625ba0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/apis/auth/checkSignIn.ts b/src/apis/auth/checkSignIn.ts
@@ -1,12 +1,17 @@
 import { NextResponse } from "next/server";
 import type { NextRequest } from "next/server";
+import { checkSignUp } from "./checkSignUp";
 
 export async function checkSignIn(request: NextRequest) {
     const token = request.cookies.get("accessToken")?.value;
     const url = request.nextUrl.clone();
 
     if (token) {
-        return NextResponse.next();
+        if ("/((?!auth).*)") {
+            return checkSignUp(request);
+        } else {
+            return NextResponse.next();
+        }
     } else {
         url.pathname = "/account";
         return NextResponse.redirect(url);

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -1,6 +1,5 @@
 import { NextResponse } from "next/server";
 import type { NextRequest } from "next/server";
-import { checkSignUp } from "./apis/auth/checkSignUp";
 import { checkSignIn } from "./apis/auth/checkSignIn";
 import { qFeedAxios } from "./apis/axios";
 
@@ -12,8 +11,6 @@ export async function middleware(request: NextRequest) {
     requestHeaders.set("Authorization", `Bearer ${token}`);
 
     if (pathname.match("/((?!account).*)")) {
-        return await checkSignUp(request);
-    } else if (pathname.match("/((?!account|auth).*)")) {
         return await checkSignIn(request);
     }