Merge pull request #132 from bipproduction/cookies/fix

Fix: Middlerawe/1

src/app/api/auth/logout/route.ts

@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 
 export async function GET() {
   cookies().set({
-    name: "ssn",
+    name: "mySession",
     value: "",
     maxAge: 0,
   });

src/app/api/auth/register/route.ts

@@ -37,7 +37,7 @@ export async function POST(req: Request) {
       );
 
       cookies().set({
-        name: "ssn",
+        name: "mySession",
         value: seal,
         maxAge: 60 * 60 * 24 * 7,
       });

src/app/api/auth/validasi/route.ts

@@ -35,10 +35,9 @@ export async function POST(req: Request) {
       );
 
       cookies().set({
-        name: "ssn",
+        name: "mySession",
         value: res,
         maxAge: 60 * 60 * 24 * 7,
-        
       });
 
       revalidatePath("/dev/home");

src/app/api/check-cookies/route.ts

@@ -4,7 +4,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(req: Request) {
   const cekCookies = cookies();
-  const c = cekCookies.get("ssn");
+  const c = cekCookies.get("mySession");
 
   if (!c || !c?.value || _.isEmpty(c?.value) || _.isUndefined(c?.value)) {
     return NextResponse.json({ success: false });

src/app/layout.tsx

@@ -41,15 +41,15 @@ export default async function RootLayout({
 }: {
   children: React.ReactNode;
 }) {
-  // const userLoginId = await funGetUserIdByToken();
+  const userLoginId = await funGetUserIdByToken();
 
-  // if (!token) return <>Require Token Storage</>;
+  if (!token) return <>Require Token Storage</>;
 
   return (
     <RootStyleRegistry>
       {/* <MqttLoader />
       <TokenProvider token={token} envObject={envObject} /> */}
-      {/* <RealtimeProvider userLoginId={userLoginId as string} /> */}
+      <RealtimeProvider userLoginId={userLoginId as string} />
       {children}
     </RootStyleRegistry>
   );

src/app_modules/_global/fun/get/fun_cek_token.ts

@@ -5,7 +5,7 @@ import _ from "lodash";
 import { cookies } from "next/headers";
 
 export async function funCheckToken() {
-  const c = cookies().get("ssn");
+  const c = cookies().get("mySession");
   const cekToken = await prisma.userSession.findFirst({
     where: {
       token: c?.value,

src/app_modules/_global/fun/get/fun_get_user_id_by_token.ts

@@ -4,7 +4,7 @@ import prisma from "@/app/lib/prisma";
 import { cookies } from "next/headers";
 
 export async function funGetUserIdByToken() {
-  const c = cookies().get("ssn");
+  const c = cookies().get("mySession");
   const token = c?.value
   const cekToken = await prisma.userSession.findFirst({
     where: {

src/app_modules/auth/fun/fun_logout.ts

@@ -18,7 +18,7 @@ export async function auth_Logout() {
     if (!delToken) return { status: 400, message: "Gagal Hapus User Session" };
 
     cookies().delete({
-      name: "ssn",
+      name: "mySession",
     });
     return { status: 200, message: "Logout Berhasil" };
   } catch (error) {

src/app_modules/auth/fun/fun_register.ts

@@ -47,7 +47,7 @@ export async function Auth_funRegister({
   );
 
   cookies().set({
-    name: "ssn",
+    name: "mySession",
     value: sealToken,
     maxAge: 60 * 60 * 24 * 7,
   });

src/app_modules/auth/fun/fun_validasi.ts

@@ -42,7 +42,7 @@ export async function auth_funValidasi({
   );
 
   cookies().set({
-    name: "ssn",
+    name: "mySession",
     value: sealToken,
     maxAge: 60 * 60 * 24 * 30,
   });

src/app_modules/fun_global/get_user_token.ts

@@ -10,7 +10,7 @@ import { redirect } from "next/navigation";
 export async function user_funGetOneUserId(): Promise<string | null> {
   try {
     const kukis = cookies();
-    const c = kukis.get("ssn");
+    const c = kukis.get("mySession");
     if (!c || !c?.value || _.isEmpty(c?.value) || _.isUndefined(c?.value))
       return redirect(RouterAuth.login);
 

src/lib/middleware.ts

@@ -1,12 +1,27 @@
-import { NextResponse } from "next/server";
-import type { NextRequest } from "next/server";
+import _ from "lodash";
+import { NextRequest, NextResponse } from "next/server";
 
 // This function can be marked `async` if using `await` inside
 export function middleware(request: NextRequest) {
-  return NextResponse.redirect(new URL("/home", request.url));
+  let cookies = request.cookies.get("mySession");
+  console.log(cookies);
+
+  if (
+    !cookies ||
+    !cookies?.value ||
+    _.isEmpty(cookies?.value) ||
+    _.isUndefined(cookies?.value)
+  ) {
+    return NextResponse.redirect(new URL("/", request.url));
+  }
+
+  //   return NextResponse.redirect(new URL("/", request.url));
 }
 
 // See "Matching Paths" below to learn more
 export const config = {
-  matcher: "/about/:path*",
+  matcher: [
+
+    "/((?!_next|static|favicon.ico|manifest).*)",
+  ],
 };