Test Hapus Auth

Fix Infinite reload di page ikm dan landing page

package.json

@@ -54,6 +54,7 @@
     "chart.js": "^4.4.8",
     "classnames": "^2.5.1",
     "colors": "^1.4.0",
+    "date-fns": "^4.1.0",
     "dayjs": "^1.11.13",
     "dotenv": "^17.2.3",
     "elysia": "^1.3.5",

prisma/data/user/roles.json

@@ -1,24 +1,30 @@
 [
   {
     "id": "0",
+    "name": "DEVELOPER",
+    "description": "Developer",
+    "isActive": true
+  },
+  {
+    "id": "1",
     "name": "SUPER ADMIN",
     "description": "Administrator",
     "isActive": true
   },
   {
-    "id": "1",
+    "id": "2",
     "name": "ADMIN DESA",
     "description": "Administrator Desa",
     "isActive": true
   },
   {
-    "id": "2",
+    "id": "3",
     "name": "ADMIN KESEHATAN",
     "description": "Administrator Bidang Kesehatan",
     "isActive": true
   },
   {
-    "id": "3",
+    "id": "4",
     "name": "ADMIN PENDIDIKAN",
     "description": "Administrator Bidang Pendidikan",
     "isActive": true

prisma/data/user/users.json

@@ -0,0 +1,10 @@
+[
+  {
+    "id": "cmie1o0zh0002vn132vtzg7hh",
+    "username": "SuperAdmin-Nico",
+    "nomor": "6289647037426",
+    "roleId": 0,
+    "isActive": true,
+    "sessionInvalid": false
+  }
+]

prisma/schema.prisma

@@ -2164,25 +2164,27 @@ enum StatusPeminjaman {
 
 model User {
   id             String           @id @default(cuid())
-  username       String           @unique
+  username       String
   nomor          String           @unique
-  role           Role             @relation(fields: [roleId], references: [id])
-  roleId         String           @default("1")
-  instansi       String?
-  UserSession    UserSession? // Nama instansi (Puskesmas, Sekolah, dll)
-  isActive       Boolean          @default(true)
+  roleId         String           @default("2")
+  isActive       Boolean          @default(false)
+  sessionInvalid Boolean          @default(false)
   lastLogin      DateTime?
   createdAt      DateTime         @default(now())
-  updatedAt      DateTime         @updatedAt
-  deletedAt      DateTime?
-  sessionInvalid Boolean          @default(false)
-  UserMenuAccess UserMenuAccess[]
+  updatedAt      DateTime         @default(now()) @updatedAt
+  permissions    Json?
+  sessions       UserSession[] // ✅ Relasi one-to-many
+  role           Role             @relation(fields: [roleId], references: [id])
+  menuAccesses   UserMenuAccess[]
+
+  @@map("users")
 }
 
 model Role {
   id          String    @id @default(cuid())
   name        String    @unique // ADMIN_DESA, ADMIN_KESEHATAN, ADMIN_SEKOLAH
   description String?
+  permissions Json?
   isActive    Boolean   @default(true)
   createdAt   DateTime  @default(now())
   updatedAt   DateTime  @updatedAt
@@ -2202,14 +2204,19 @@ model KodeOtp {
 }
 
 model UserSession {
-  id        String    @id @default(cuid())
-  token     String
-  expires   DateTime?
-  active    Boolean   @default(true)
-  createdAt DateTime  @default(now())
-  updatedAt DateTime  @default(now()) @updatedAt
-  User      User      @relation(fields: [userId], references: [id])
-  userId    String    @unique
+  id        String   @id @default(cuid())
+  token     String   @db.Text // ✅ JWT bisa panjang
+  expiresAt DateTime // ✅ Ubah jadi expiresAt (konsisten)
+  active    Boolean  @default(true)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now()) @updatedAt
+
+  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId String // ✅ HAPUS @unique - user bisa punya multiple sessions
+
+  @@index([userId]) // ✅ Index untuk query cepat
+  @@index([token]) // ✅ Index untuk verify cepat
+  @@map("user_sessions")
 }
 
 model UserMenuAccess {

prisma/seed.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import prisma from "@/lib/prisma";
 import profilePejabatDesa from "./data/landing-page/profile/profile.json";
@@ -57,46 +58,107 @@ import roles from "./data/user/roles.json";
 import fileStorage from "./data/file-storage.json";
 import jenjangPendidikan from "./data/pendidikan/info-sekolah/jenjang-pendidikan.json";
 import seedAssets from "./seed_assets";
+import users from "./data/user/users.json";
 import { safeSeedUnique } from "./safeseedUnique";
 
 (async () => {
-  // =========== ROLE ===========
-  // In your seed.ts
-  // =========== ROLES ===========
   console.log("🔄 Seeding roles...");
-  for (const r of roles) {
-    await safeSeedUnique("role", { id: r.id }, {
-      name: r.name,
-      description: r.description,
-      isActive: r.isActive,
-    });
-  }
 
-  console.log("✅ Roles seeded");
+  for (const r of roles) {
+    try {
+      // ✅ Destructure to remove permissions if exists
+      const { permissions, ...roleData } = r as any;
+
+      await safeSeedUnique(
+        "role",
+        { name: roleData.name },
+        {
+          id: roleData.id,
+          name: roleData.name,
+          description: roleData.description,
+          permissions: roleData.permissions || {}, // ✅ Include permissions
+          isActive: roleData.isActive,
+        }
+      );
+      console.log(`✅ Seeded role -> ${roleData.name}`);
+    } catch (error: any) {
+      if (error.code === "P2002") {
+        console.warn(`⚠️ Role already exists (skipping): ${r.name}`);
+      } else {
+        console.error(`❌ Failed to seed role ${r.name}:`, error.message);
+      }
+    }
+  }
+  console.log("✅ Roles seeding completed");
+
+  // =========== USER ===========
+  console.log("🔄 Seeding users...");
+  for (const u of users) {
+    try {
+      // Verify role exists first
+      const roleExists = await prisma.role.findUnique({
+        where: { id: u.roleId.toString() },
+        select: { id: true }, // Only select id to minimize query
+      });
+
+      if (!roleExists) {
+        console.error(
+          `❌ Role with id ${u.roleId} not found for user ${u.username}`
+        );
+        continue;
+      }
+
+      await safeSeedUnique(
+        "user",
+        { id: u.id },
+        {
+          username: u.username,
+          nomor: u.nomor,
+          roleId: u.roleId.toString(),
+          isActive: u.isActive,
+          sessionInvalid: false,
+        }
+      );
+      console.log(`✅ Seeded user -> ${u.username}`);
+    } catch (error: any) {
+      if (error.code === "P2003") {
+        console.error(
+          `❌ Foreign key constraint failed for user ${u.username}: Role ${u.roleId} does not exist`
+        );
+      } else {
+        console.error(`❌ Failed to seed user ${u.username}:`, error.message);
+      }
+    }
+  }
+  console.log("✅ Users seeding completed");
 
   // =========== FILE STORAGE ===========
   console.log("🔄 Seeding file storage...");
   for (const f of fileStorage) {
-    await prisma.fileStorage.upsert({
-      where: { id: f.id },
-      update: {
-        name: f.name,
-        realName: f.realName,
-        path: f.path,
-        mimeType: f.mimeType,
-        link: f.link,
-        category: f.category,
-      },
-      create: {
-        id: f.id,
-        name: f.name,
-        realName: f.realName,
-        path: f.path,
-        mimeType: f.mimeType,
-        link: f.link,
-        category: f.category,
-      },
-    });
+    try {
+      await prisma.fileStorage.upsert({
+        where: { id: f.id },
+        update: {
+          name: f.name,
+          realName: f.realName,
+          path: f.path,
+          mimeType: f.mimeType,
+          link: f.link,
+          category: f.category,
+        },
+        create: {
+          id: f.id,
+          name: f.name,
+          realName: f.realName,
+          path: f.path,
+          mimeType: f.mimeType,
+          link: f.link,
+          category: f.category,
+        },
+      });
+    } catch (error: any) {
+      console.error(`❌ Failed to seed file storage ${f.name}:`, error.message);
+    }
   }
   console.log("✅ File storage seeded");
   // =========== LANDING PAGE ===========
@@ -515,15 +577,40 @@ import { safeSeedUnique } from "./safeseedUnique";
   console.log("posisi organisasi berhasil");
 
   // =========== PEGAWAI PPID ===========
+  console.log("🔄 Seeding pegawai PPID...");
   const flattenedPegawai = pegawaiPPID.flat();
+
+  // Check for duplicate emails
+  const emails = new Set();
   for (const p of flattenedPegawai) {
-    await prisma.pegawaiPPID.upsert({
-      where: { id: p.id },
-      update: p,
-      create: p,
-    });
+    if (emails.has(p.email)) {
+      console.warn(`⚠️ Duplicate email found in pegawaiPPID: ${p.email}`);
+    }
+    emails.add(p.email);
   }
-  console.log("pegawai berhasil");
+
+  for (const p of flattenedPegawai) {
+    try {
+      await prisma.pegawaiPPID.upsert({
+        where: { id: p.id },
+        update: p,
+        create: p,
+      });
+      console.log(`✅ Seeded pegawai PPID -> ${p.namaLengkap}`);
+    } catch (error: any) {
+      if (error.code === "P2002") {
+        console.warn(
+          `⚠️ Pegawai PPID with duplicate email (skipping): ${p.email}`
+        );
+      } else {
+        console.error(
+          `❌ Failed to seed pegawai PPID ${p.namaLengkap}:`,
+          error.message
+        );
+      }
+    }
+  }
+  console.log("✅ pegawai PPID seeding completed");
 
   // =========== SUBMENU VISI MISI PPID ===========
 
@@ -787,7 +874,9 @@ import { safeSeedUnique } from "./safeseedUnique";
   const flattenedPosisiBumdes = posisiOrganisasi.flat();
 
   // ✅ Urutkan berdasarkan hierarki
-  const sortedPosisiBumdes = flattenedPosisiBumdes.sort((a, b) => a.hierarki - b.hierarki);
+  const sortedPosisiBumdes = flattenedPosisiBumdes.sort(
+    (a, b) => a.hierarki - b.hierarki
+  );
 
   for (const p of sortedPosisiBumdes) {
     console.log(`Seeding: ${p.nama} (id: ${p.id}, parent: ${p.parentId})`);
@@ -867,7 +956,7 @@ import { safeSeedUnique } from "./safeseedUnique";
   // Add IDs to the kategoriKegiatan data
   const kategoriKegiatan = kategoriKegiatanData.map((k, index) => ({
     ...k,
-    id: `kategori-${index + 1}`
+    id: `kategori-${index + 1}`,
   }));
 
   for (const k of kategoriKegiatan) {
@@ -1159,7 +1248,6 @@ import { safeSeedUnique } from "./safeseedUnique";
 
   // seed assets
   await seedAssets();
-
 })()
   .then(() => prisma.$disconnect())
   .catch((e) => {

src/app/admin/(dashboard)/_state/user/user-state.ts

@@ -118,7 +118,7 @@ const userState = proxy({
         console.error("Gagal delete user:", error);
         toast.error("Terjadi kesalahan saat menghapus user");
       } finally {
-        userState.delete.loading = false;
+        userState.deleteUser.loading = false;
       }
     },
   },  

src/app/admin/(dashboard)/auth/login-admin/page.tsx

@@ -1,5 +1,6 @@
 'use client';
-import { apiFetchLogin } from '@/app/api/auth/_lib/api_fetch_auth';
+
+import { apiFetchLogin } from '@/app/api/[auth]/_lib/api_fetch_auth';
 import colors from '@/con/colors';
 import { Box, Button, Center, Image, Paper, Stack, Title } from '@mantine/core';
 import { useRouter } from 'next/navigation';
@@ -15,7 +16,9 @@ function Login() {
 
   // Login.tsx
   async function onLogin() {
+
     const cleanPhone = phone.replace(/\D/g, '');
+    console.log(cleanPhone);
     if (cleanPhone.length < 10) {
       toast.error('Nomor telepon tidak valid');
       return;
@@ -25,6 +28,8 @@ function Login() {
       setLoading(true);
       const response = await apiFetchLogin({ nomor: cleanPhone });
 
+      console.log(response);
+
       if (!response.success) {
         toast.error(response.message || 'Gagal memproses login');
         return;
@@ -32,11 +37,12 @@ function Login() {
 
       // Simpan nomor untuk register
       localStorage.setItem('auth_nomor', cleanPhone);
-
       if (response.isRegistered) {
-        // ✅ User lama: simpan kodeId & ke validasi
+        // ✅ User lama: simpan kodeId
         localStorage.setItem('auth_kodeId', response.kodeId);
-        router.push('/validasi');
+
+        // ✅ Cookie sudah di-set oleh API, langsung redirect
+        router.push('/validasi'); // Clean URL
       } else {
         // ❌ User baru: langsung ke registrasi (tanpa kodeId)
         router.push('/registrasi');

src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx

@@ -1,7 +1,7 @@
 // app/registrasi/page.tsx
 'use client';
 
-import { apiFetchRegister } from '@/app/api/auth/_lib/api_fetch_auth';
+import { apiFetchRegister } from '@/app/api/[auth]/_lib/api_fetch_auth';
 import BackButton from '@/app/darmasaba/(pages)/desa/layanan/_com/BackButto';
 import colors from '@/con/colors';
 import {

src/app/admin/(dashboard)/auth/validasi-admin/page.tsx

@@ -1,10 +1,17 @@
-// 
-
 'use client';
 
-import { apiFetchOtpData, apiFetchVerifyOtp } from '@/app/api/auth/_lib/api_fetch_auth';
 import colors from '@/con/colors';
-import { Box, Button, Center, Loader, Paper, PinInput, Stack, Text, Title } from '@mantine/core';
+import {
+  Box,
+  Button,
+  Center,
+  Loader,
+  Paper,
+  PinInput,
+  Stack,
+  Text,
+  Title,
+} from '@mantine/core';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
@@ -12,13 +19,36 @@ import { authStore } from '@/store/authStore';
 
 export default function Validasi() {
   const router = useRouter();
+  
   const [nomor, setNomor] = useState<string | null>(null);
   const [otp, setOtp] = useState('');
   const [loading, setLoading] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [kodeId, setKodeId] = useState<string | null>(null);
+  const [isRegistrationFlow, setIsRegistrationFlow] = useState(false);
+
+  // ✅ Deteksi flow dari cookie via API
+  useEffect(() => {
+    const checkFlow = async () => {
+      try {
+        const res = await fetch('/api/get-flow', {
+          credentials: 'include'
+        });
+        const data = await res.json();
+        
+        if (data.success) {
+          setIsRegistrationFlow(data.flow === 'register');
+          console.log('🔍 Flow detected from cookie:', data.flow);
+        }
+      } catch (error) {
+        console.error('❌ Error getting flow:', error);
+        setIsRegistrationFlow(false);
+      }
+    };
+    
+    checkFlow();
+  }, []);
 
-  // Inisialisasi data OTP
   useEffect(() => {
     const storedKodeId = localStorage.getItem('auth_kodeId');
     if (!storedKodeId) {
@@ -28,11 +58,12 @@ export default function Validasi() {
     }
 
     setKodeId(storedKodeId);
-
     const loadOtpData = async () => {
       try {
-        const result = await apiFetchOtpData({ kodeId: storedKodeId });
-        if (result.success && result.data?.nomor) {
+        const res = await fetch(`/api/otp-data?kodeId=${encodeURIComponent(storedKodeId)}`);
+        const result = await res.json();
+
+        if (res.ok && result.data?.nomor) {
           setNomor(result.data.nomor);
         } else {
           throw new Error('Data OTP tidak valid');
@@ -45,82 +76,19 @@ export default function Validasi() {
         setIsLoading(false);
       }
     };
-
     loadOtpData();
   }, [router]);
 
-  // Verifikasi OTP
   const handleVerify = async () => {
     if (!kodeId || !nomor || otp.length < 4) return;
 
     setLoading(true);
     try {
-      const verifyResult = await apiFetchVerifyOtp({ nomor, otp, kodeId });
-
-      if (!verifyResult.success) {
-        // Registrasi baru?
-        if (
-          verifyResult.status === 404 &&
-          verifyResult.message?.includes('Akun tidak ditemukan')
-        ) {
-          await handleNewRegistration();
-          return;
-        }
-
-        // Error lain
-        toast.error(verifyResult.message || 'Verifikasi gagal');
-        return;
+      if (isRegistrationFlow) {
+        await handleRegistrationVerification();
+      } else {
+        await handleLoginVerification();
       }
-
-      // ✅ Verifikasi sukses → simpan user ke store
-      const user = verifyResult.user;
-      console.log('=== DEBUG USER ===');
-      console.log('Full user object:', user);
-
-      if (!user || !user.id) {
-        toast.error('Data pengguna tidak lengkap');
-        return;
-      }
-
-      const roleId = Number(user.roleId);
-      authStore.setUser({
-        id: user.id,
-        name: user.name || user.username || 'User',
-        roleId: roleId,
-      });
-
-      cleanupStorage();
-
-      const isUserActive = user.isActive ?? user.is_active ?? true;
-
-      // Redirect berdasarkan status approval
-      if (!isUserActive) {
-        router.replace('/waiting-room');
-        return;
-      }
-
-      // ✅ Switch statement lebih clean
-      let redirectPath: string;
-
-      switch (roleId) {
-        case 0:
-        case 1:
-          redirectPath = '/admin/landing-page/profil/program-inovasi';
-          break;
-        case 2:
-          redirectPath = '/admin/kesehatan/posyandu';
-          break;
-        case 3:
-          redirectPath = '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
-          break;
-        default:
-          redirectPath = '/admin';
-          console.warn('Unknown roleId:', roleId);
-      }
-
-      console.log('Redirecting to:', redirectPath);
-      router.replace(redirectPath);
-
     } catch (error) {
       console.error('Error saat verifikasi:', error);
       toast.error('Terjadi kesalahan sistem');
@@ -129,51 +97,122 @@ export default function Validasi() {
     }
   };
 
-  // Registrasi baru
-  const handleNewRegistration = async () => {
+  const handleRegistrationVerification = async () => {
     const username = localStorage.getItem('auth_username');
     if (!username) {
-      toast.error('Data registrasi tidak ditemukan');
+      toast.error('Data registrasi tidak ditemukan.');
       return;
     }
 
-    try {
-      const res = await fetch('/api/auth/finalize-registration', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ nomor, username, otp, kodeId }),
-      });
+    const cleanNomor = nomor?.replace(/\D/g, '') ?? '';
+    if (cleanNomor.length < 10 || username.trim().length < 5) {
+      toast.error('Data tidak valid');
+      return;
+    }
 
-      const data = await res.json();
+    const verifyRes = await fetch('/api/verify-otp-register', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ nomor: cleanNomor, otp, kodeId }),
+      credentials: 'include'
+    });
 
-      if (data.success) {
-        // Set user sementara (tanpa roleId, akan diisi saat approve)
-        authStore.setUser({
-          id: 'pending',
-          name: username,
-          roleId: 1,
-        });
-        cleanupStorage();
-        router.replace('/waiting-room');
-      } else {
-        toast.error(data.message || 'Registrasi gagal');
-      }
-    } catch (error) {
-      console.error('Error registrasi:', error);
-      toast.error('Gagal menyelesaikan registrasi');
+    const verifyData = await verifyRes.json();
+    if (!verifyRes.ok) {
+      toast.error(verifyData.message || 'Verifikasi OTP gagal');
+      return;
+    }
+
+    const finalizeRes = await fetch('/api/finalize-registration', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ nomor, username, kodeId }),
+      credentials: 'include'
+    });
+
+    const data = await finalizeRes.json();
+    
+    if (data.success || finalizeRes.redirected) {
+      // ✅ Cleanup setelah registrasi sukses
+      await cleanupStorage();
+      window.location.href = '/waiting-room';
+    } else {
+      toast.error(data.message || 'Registrasi gagal');
     }
   };
 
-  const cleanupStorage = () => {
+  const handleLoginVerification = async () => {
+    const loginRes = await fetch('/api/verify-otp-login', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ nomor, otp, kodeId }),
+      credentials: 'include'
+    });
+
+    const loginData = await loginRes.json();
+
+    if (!loginRes.ok) {
+      toast.error(loginData.message || 'Verifikasi gagal');
+      return;
+    }
+
+    const { id, name, roleId, isActive } = loginData.user;
+
+    authStore.setUser({
+      id,
+      name: name || 'User',
+      roleId: Number(roleId),
+    });
+
+    // ✅ Cleanup setelah login sukses
+    await cleanupStorage();
+
+    if (!isActive) {
+      window.location.href = '/waiting-room';
+      return;
+    }
+
+    const redirectPath = getRedirectPath(Number(roleId));
+    router.replace(redirectPath);
+  };
+
+  const getRedirectPath = (roleId: number): string => {
+    switch (roleId) {
+      case 0:
+      case 1:
+      case 2:
+        return '/admin/landing-page/profil/program-inovasi';
+      case 3:
+        return '/admin/kesehatan/posyandu';
+      case 4:
+        return '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
+      default:
+        return '/admin';
+    }
+  };
+
+  // ✅ CLEANUP FUNCTION - Hapus localStorage + Cookie
+  const cleanupStorage = async () => {
+    // Clear localStorage
     localStorage.removeItem('auth_kodeId');
     localStorage.removeItem('auth_nomor');
     localStorage.removeItem('auth_username');
+    
+    // Clear cookie
+    try {
+      await fetch('/api/clear-flow', {
+        method: 'POST',
+        credentials: 'include'
+      });
+    } catch (error) {
+      console.error('Error clearing flow cookie:', error);
+    }
   };
 
   const handleResend = async () => {
     if (!nomor) return;
     try {
-      const res = await fetch('/api/auth/resend-otp', {
+      const res = await fetch('/api/resend', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ nomor }),
@@ -190,7 +229,6 @@ export default function Validasi() {
     }
   };
 
-  // Loading
   if (isLoading) {
     return (
       <Stack pos="relative" bg={colors.Bg} align="center" justify="center" h="100vh">
@@ -209,7 +247,7 @@ export default function Validasi() {
             <Stack align="center" gap="lg">
               <Box>
                 <Title ta="center" order={2} fw="bold" c={colors['blue-button']}>
-                  Kode Verifikasi
+                  {isRegistrationFlow ? 'Verifikasi Registrasi' : 'Verifikasi Login'}
                 </Title>
                 <Text ta="center" size="sm" c="dimmed" mt="xs">
                   Kami telah mengirim kode ke nomor <strong>{nomor}</strong>

src/app/admin/(dashboard)/user&role/_com/dynamicNavbar.ts

@@ -1,22 +1,34 @@
 // src/app/admin/(dashboard)/user&role/_com/dynamicNavbar.ts
-import { navBar, role1, role2, role3 } from '@/app/admin/_com/list_PageAdmin';
+import { devBar, navBar, role1, role2, role3 } from '@/app/admin/_com/list_PageAdmin';
+
+// ✅ Helper: normalisasi ID menu agar konsisten
+const normalizeMenuId = (id: string): string => {
+  return id.trim().toLowerCase();
+};
 
 export function getNavbar({
   roleId,
   menuIds,
 }: {
-  roleId: number;           // pastikan number
-  menuIds?: string[] | null; // opsional
+  roleId: number;
+  menuIds?: string[] | null;
 }) {
-  // Prioritas: menuIds > roleId
+  // ✅ Jika menuIds tersedia, gunakan untuk filter — dengan normalisasi
   if (menuIds && menuIds.length > 0) {
-    return navBar.filter(section => menuIds.includes(section.id));
+    // Normalisasi semua menuIds dari DB/state
+    const normalizedMenuSet = new Set(menuIds.map(id => normalizeMenuId(id)));
+
+    return navBar.filter(section => {
+      const normalizedSectionId = normalizeMenuId(section.id);
+      return normalizedMenuSet.has(normalizedSectionId);
+    });
   }
 
-  // Fallback ke role-based
-  if (roleId === 0) return navBar;
-  if (roleId === 1) return role1;
-  if (roleId === 2) return role2;
-  if (roleId === 3) return role3;
+  // 🔁 Fallback ke role-based navigation
+  if (roleId === 0) return devBar;
+  if (roleId === 1) return navBar;
+  if (roleId === 2) return role1;
+  if (roleId === 3) return role2;
+  if (roleId === 4) return role3;
   return [];
 }

src/app/admin/(dashboard)/user&role/menu-access/page.tsx

@@ -8,6 +8,7 @@ import { Button, Checkbox, Group, Paper, Select, Stack, Text, Title } from '@man
 import { useEffect, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import user from '../../_state/user/user-state'
+import { useShallowEffect } from '@mantine/hooks'
 
 
 // ✅ Helper: ekstrak semua menu ID dari struktur navBar
@@ -23,6 +24,10 @@ function MenuAccessPage() {
   const [selectedUserId, setSelectedUserId] = useState<string | null>(null)
   const [userMenus, setUserMenus] = useState<string[]>([])
 
+  useShallowEffect(() => {
+    stateUser.findMany.load()
+  }, [])
+
   // ✅ Gunakan helper untuk ekstrak menu
   const availableMenus = extractMenuIds(navBar);
 

src/app/admin/(dashboard)/user&role/user/page.tsx

@@ -8,6 +8,7 @@ import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../_com/header';
 import { ModalKonfirmasiHapus } from '../../_com/modalKonfirmasiHapus';
 import user from '../../_state/user/user-state';
+import { authStore } from '@/store/authStore';
 
 function User() {
   const [search, setSearch] = useState("");
@@ -95,24 +96,17 @@ function ListUser({ search }: { search: string }) {
     });
 
     if (success) {
-      // Cek apakah role berubah
-      const res = await fetch('/api/user/updt', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          id: userId,
-          roleId: newRoleId,
-        }),
-      });
-      const data = await res.json();
-
-      if (data.roleChanged) {
-        // Tampilkan notifikasi
-        alert(`User ${username} akan logout otomatis!`);
+      // ✅ Logout user jika sedang mengedit diri sendiri
+      const currentUserId = authStore.user?.id;
+      if (currentUserId === userId) {
+        authStore.setUser(null);
+        document.cookie = `${process.env.BASE_SESSION_KEY}=; Max-Age=0; path=/;`;
+        alert("Perubahan memerlukan login ulang");
+        window.location.href = "/login";
+        return;
       }
 
+      // Reload data
       stateUser.findMany.load(page, 10, search);
     }
 
@@ -127,6 +121,17 @@ function ListUser({ search }: { search: string }) {
     });
 
     if (success) {
+      // ✅ Logout user jika sedang mengedit diri sendiri
+      const currentUserId = authStore.user?.id;
+      if (currentUserId === userId) {
+        authStore.setUser(null);
+        document.cookie = `${process.env.BASE_SESSION_KEY}=; Max-Age=0; path=/;`;
+        alert("Perubahan memerlukan login ulang");
+        window.location.href = "/login";
+        return;
+      }
+
+      // Reload data
       stateUser.findMany.load(page, 10, search);
     }
   };

src/app/admin/_com/list_PageAdmin.tsx

@@ -1,3 +1,407 @@
+export const devBar = [
+  {
+    id: "Landing Page",
+    name: "Landing Page",
+    path: "",
+    children: [
+      {
+        id: "Landing_Page_1",
+        name: "Profil",
+        path: "/admin/landing-page/profil/program-inovasi"
+      },
+      {
+        id: "Landing_Page_2",
+        name: "Desa Anti Korupsi",
+        path: "/admin/landing-page/desa-anti-korupsi/list-desa-anti-korupsi"
+      },
+      {
+        id: "Landing_Page_3",
+        name: "Indeks Kepuasan Masyarakat",
+        path: "/admin/landing-page/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat"
+      },
+      {
+        id: "Landing_Page_4",
+        name: "SDGs",
+        path: "/admin/landing-page/SDGs"
+      },
+      {
+        id: "Landing_Page_5",
+        name: "APBDes",
+        path: "/admin/landing-page/apbdes"
+      },
+      {
+        id: "Landing_Page_6",
+        name: "Prestasi Desa",
+        path: "/admin/landing-page/prestasi-desa/list-prestasi-desa"
+      }
+    ]
+  },
+  {
+    id: "PPID",
+    name: "PPID",
+    path: "",
+    children: [
+      {
+        id: "PPID_1",
+        name: "Profil PPID",
+        path: "/admin/ppid/profil-ppid"
+      },
+      {
+        id: "PPID_2",
+        name: "Struktur PPID",
+        path: "/admin/ppid/struktur-ppid/pegawai"
+      },
+      {
+        id: "PPID_3",
+        name: "Visi Misi PPID",
+        path: "/admin/ppid/visi-misi-ppid"
+      },
+      {
+        id: "PPID_4",
+        name: "Dasar Hukum",
+        path: "/admin/ppid/dasar-hukum"
+      },
+      {
+        id: "PPID_5",
+        name: "Permohonan Informasi Publik",
+        path: "/admin/ppid/permohonan-informasi-publik"
+      },
+      {
+        id: "PPID_6",
+        name: "Permohonan Keberatan Informasi Publik",
+        path: "/admin/ppid/permohonan-keberatan-informasi-publik"
+      },
+      {
+        id: "PPID_7",
+        name: "Daftar Informasi Publik",
+        path: "/admin/ppid/daftar-informasi-publik"
+      },
+      {
+        id: "PPID_8",
+        name: "Indeks Kepuasan Masyarakat",
+        path: "/admin/ppid/indeks-kepuasan-masyarakat/grafik-kepuasan-masyarakat"
+      },
+
+    ]
+  },
+  {
+    id: "Desa",
+    name: "Desa",
+    path: "",
+    children: [
+      {
+        id: "Desa_1",
+        name: "Profile",
+        path: "/admin/desa/profile/profile-desa"
+      },
+      {
+        id: "Desa_2",
+        name: "Potensi",
+        path: "/admin/desa/potensi/list-potensi"
+      },
+      {
+        id: "Desa_3",
+        name: "Berita",
+        path: "/admin/desa/berita/list-berita"
+      },
+      {
+        id: "Desa_4",
+        name: "Pengumuman",
+        path: "/admin/desa/pengumuman/list-pengumuman"
+      },
+      {
+        id: "Desa_5",
+        name: "Gallery",
+        path: "/admin/desa/gallery/foto"
+      },
+      {
+        id: "Desa_6",
+        name: "Layanan",
+        path: "/admin/desa/layanan/pelayanan_surat_keterangan"
+      },
+      {
+        id: "Desa_7",
+        name: "Penghargaan",
+        path: "/admin/desa/penghargaan"
+      }
+
+    ]
+  },
+  {
+    id: "Kesehatan",
+    name: "Kesehatan",
+    path: "",
+    children: [
+      {
+        id: "Kesehatan_1",
+        name: "Posyandu",
+        path: "/admin/kesehatan/posyandu"
+      },
+      {
+        id: "Kesehatan_2",
+        name: "Data Kesehatan Warga",
+        path: "/admin/kesehatan/data-kesehatan-warga/persentase_data_kelahiran_kematian"
+      },
+      {
+        id: "Kesehatan_3",
+        name: "Puskesmas",
+        path: "/admin/kesehatan/puskesmas"
+      },
+      {
+        id: "Kesehatan_4",
+        name: "Program Kesehatan",
+        path: "/admin/kesehatan/program-kesehatan"
+      },
+      {
+        id: "Kesehatan_5",
+        name: "Penanganan Darurat",
+        path: "/admin/kesehatan/penanganan-darurat"
+      },
+      {
+        id: "Kesehatan_6",
+        name: "Kontak Darurat",
+        path: "/admin/kesehatan/kontak-darurat"
+      },
+      {
+        id: "Kesehatan_7",
+        name: "Info Wabah/Penyakit",
+        path: "/admin/kesehatan/info-wabah-penyakit"
+      }
+    ]
+  },
+  {
+    id: "Keamanan",
+    name: "Keamanan",
+    path: "",
+    children: [
+      {
+        id: "Keamanan_1",
+        name: "Keamanan Lingkungan (Pecalang/Patwal)",
+        path: "/admin/keamanan/keamanan-lingkungan-pecalang-patwal"
+      },
+      {
+        id: "Keamanan_2",
+        name: "Polsek Terdekat",
+        path: "/admin/keamanan/polsek-terdekat"
+      },
+      {
+        id: "Keamanan_3",
+        name: "Kontak Darurat",
+        path: "/admin/keamanan/kontak-darurat/kontak-darurat-keamanan"
+      },
+      {
+        id: "Keamanan_4",
+        name: "Pencegahan Kriminalitas",
+        path: "/admin/keamanan/pencegahan-kriminalitas"
+      },
+      {
+        id: "Keamanan_5",
+        name: "Laporan Publik",
+        path: "/admin/keamanan/laporan-publik"
+      },
+      {
+        id: "Keamanan_6",
+        name: "Tips Keamanan",
+        path: "/admin/keamanan/tips-keamanan"
+      }
+    ]
+  },
+  {
+    id: "Ekonomi",
+    name: "Ekonomi",
+    path: "",
+    children: [
+      {
+        id: "Ekonomi_1",
+        name: "Pasar Desa",
+        path: "/admin/ekonomi/pasar-desa/produk-pasar-desa"
+      },
+      {
+        id: "Ekonomi_2",
+        name: "Lowongan Kerja Lokal",
+        path: "/admin/ekonomi/lowongan-kerja-lokal"
+      },
+      {
+        id: "Ekonomi_3",
+        name: "Struktur Organisasi Dan Sk Pengurus Bumdesa",
+        path: "/admin/ekonomi/struktur-organisasi-dan-sk-pengurus-bumdesa/pegawai"
+      },
+      {
+        id: "Ekonomi_4",
+        name: "PADesa (Pendapatan Asli Desa)",
+        path: "/admin/ekonomi/PADesa-pendapatan-asli-desa/apbdesa"
+      },
+      {
+        id: "Ekonomi_5",
+        name: "Jumlah Pengangguran",
+        path: "/admin/ekonomi/jumlah-pengangguran"
+      },
+      {
+        id: "Ekonomi_6",
+        name: "Jumlah penduduk usia kerja yang menganggur",
+        path: "/admin/ekonomi/jumlah-penduduk-usia-kerja-yang-menganggur/pengangguran_berdasarkan_usia"
+      },
+      {
+        id: "Ekonomi_7",
+        name: "Jumlah Penduduk Miskin",
+        path: "/admin/ekonomi/jumlah-penduduk-miskin"
+      },
+      {
+        id: "Ekonomi_8",
+        name: "Program Kemiskinan",
+        path: "/admin/ekonomi/program-kemiskinan"
+      },
+      {
+        id: "Ekonomi_9",
+        name: "Sektor Unggulan Desa",
+        path: "/admin/ekonomi/sektor-unggulan-desa"
+      },
+      {
+        id: "Ekonomi_10",
+        name: "Demografi Pekerjaan",
+        path: "/admin/ekonomi/demografi-pekerjaan"
+      }
+    ]
+  }, {
+    id: "Inovasi",
+    name: "Inovasi",
+    path: "",
+    children: [
+      {
+        id: "Inovasi_1",
+        name: "Desa Digital/Smart Village",
+        path: "/admin/inovasi/desa-digital-smart-village"
+      },
+      {
+        id: "Inovasi_2",
+        name: "Layanan Online Desa",
+        path: "/admin/inovasi/layanan-online-desa/administrasi-online"
+      },
+      {
+        id: "Inovasi_3",
+        name: "Program Kreatif Desa",
+        path: "/admin/inovasi/program-kreatif-desa"
+      },
+      {
+        id: "Inovasi_4",
+        name: "Kolaborasi Inovasi",
+        path: "/admin/inovasi/kolaborasi-inovasi/list-kolaborasi-inovasi"
+      },
+      {
+        id: "Inovasi_5",
+        name: "Info Teknologi Tepat Guna",
+        path: "/admin/inovasi/info-teknologi-tepat-guna"
+      },
+      {
+        id: "Inovasi_6",
+        name: "Ajukan Ide Inovatif",
+        path: "/admin/inovasi/ajukan-ide-inovatif"
+      }
+
+    ]
+  }, {
+    id: "Lingkungan",
+    name: "Lingkungan",
+    path: "",
+    children: [
+      {
+        id: "Lingkungan_1",
+        name: "Pengelolaan Sampah (Bank Sampah)",
+        path: "/admin/lingkungan/pengelolaan-sampah-bank-sampah/list-pengelolaan-sampah-bank-sampah"
+      },
+      {
+        id: "Lingkungan_2",
+        name: "Program Penghijauan",
+        path: "/admin/lingkungan/program-penghijauan"
+      },
+      {
+        id: "Lingkungan_3",
+        name: "Data Lingkungan Desa",
+        path: "/admin/lingkungan/data-lingkungan-desa"
+      },
+      {
+        id: "Lingkungan_4",
+        name: "Gotong Royong",
+        path: "/admin/lingkungan/gotong-royong/kegiatan-desa"
+      },
+      {
+        id: "Lingkungan_5",
+        name: "Edukasi Lingkungan",
+        path: "/admin/lingkungan/edukasi-lingkungan/tujuan-edukasi-lingkungan"
+      },
+      {
+        id: "Lingkungan_6",
+        name: "Konservasi Adat Bali",
+        path: "/admin/lingkungan/konservasi-adat-bali/filosofi-tri-hita-karana"
+      }
+    ]
+  }, 
+  {
+    id: "Pendidikan",
+    name: "Pendidikan",
+    path: "",
+    children: [
+      {
+        id: "Pendidikan_1",
+        name: "Info Sekolah",
+        path: "/admin/pendidikan/info-sekolah/jenjang-pendidikan"
+      },
+      {
+        id: "Pendidikan_2",
+        name: "Beasiswa Desa",
+        path: "/admin/pendidikan/beasiswa-desa/beasiswa-pendaftar"
+      },
+      {
+        id: "Pendidikan_3",
+        name: "Program Pendidikan Anak",
+        path: "/admin/pendidikan/program-pendidikan-anak/program-unggulan"
+      },
+      {
+        id: "Pendidikan_4",
+        name: "Bimbingan Belajar Desa",
+        path: "/admin/pendidikan/bimbingan-belajar-desa/tujuan-program"
+      },
+      {
+        id: "Pendidikan_5",
+        name: "Pendidikan Non Formal",
+        path: "/admin/pendidikan/pendidikan-non-formal/tujuan-program"
+      },
+      {
+        id: "Pendidikan_6",
+        name: "Perpustakaan Digital",
+        path: "/admin/pendidikan/perpustakaan-digital/data-perpustakaan"
+      },
+      {
+        id: "Pendidikan_7",
+        name: "Data Pendidikan",
+        path: "/admin/pendidikan/data-pendidikan"
+      }
+    ]
+  },
+  {
+    id: "User & Role",
+    name: "User & Role",
+    path: "",
+    children: [
+      {
+        id: "User",
+        name: "User",
+        path: "/admin/user&role/user"
+      },
+      {
+        id: "Role",
+        name: "Role",
+        path: "/admin/user&role/role"
+      },
+      {
+        id: "Menu Access",
+        name: "Menu Access",
+        path: "/admin/user&role/menu-access"
+      }
+    ]
+  }
+]
+
 export const navBar = [
   {
     id: "Landing Page",

src/app/admin/layout.tsx

@@ -30,45 +30,51 @@ import _ from "lodash";
 import Link from "next/link";
 import { useRouter, useSelectedLayoutSegments } from "next/navigation";
 import { useEffect, useState } from "react";
-import { useSnapshot } from "valtio";
+// import { useSnapshot } from "valtio";
 import { getNavbar } from "./(dashboard)/user&role/_com/dynamicNavbar";
 
 export default function Layout({ children }: { children: React.ReactNode }) {
- const [opened, { toggle }] = useDisclosure();
+  const [opened, { toggle }] = useDisclosure();
   const [loading, setLoading] = useState(true);
+  const [isLoggingOut, setIsLoggingOut] = useState(false);
   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
   const router = useRouter();
   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
 
-  const { user } = useSnapshot(authStore);
+  // const { user } = useSnapshot(authStore);
 
-  console.log("Current user in store:", user);
-
- useEffect(() => {
-    if (authStore.user) {
-      setLoading(false);
-      return;
-    }
+  // console.log("Current user in store:", user);
 
+  // ✅ FIX: Selalu fetch user data setiap kali komponen mount
+  useEffect(() => {
     const fetchUser = async () => {
       try {
-        const res = await fetch('/api/auth/me');
+        const res = await fetch('/api/me');
         const data = await res.json();
 
         if (data.user) {
+          // Check if user is active
+          if (!data.user.isActive) {
+            authStore.setUser(null);
+            router.replace('/waiting-room');
+            return;
+          }
+
+          // ✅ PENTING: Selalu fetch menuIds terbaru setiap login
           const menuRes = await fetch(`/api/admin/user-menu-access?userId=${data.user.id}`);
           const menuData = await menuRes.json();
 
-          // ✅ Clone ke array mutable
           const menuIds = menuData.success && Array.isArray(menuData.menuIds)
-            ? [...menuData.menuIds] // Converts readonly array to mutable
+            ? [...menuData.menuIds]
             : null;
 
+          // ✅ Set user dengan menuIds yang fresh dari database
           authStore.setUser({
             id: data.user.id,
             name: data.user.name,
             roleId: Number(data.user.roleId),
-            menuIds,
+            menuIds, // menuIds terbaru
+            isActive: data.user.isActive
           });
         } else {
           authStore.setUser(null);
@@ -84,7 +90,7 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     };
 
     fetchUser();
-  }, [router]);
+  }, [router]); // ✅ Hapus dependency pada authStore.user
 
   if (loading) {
     return (
@@ -98,15 +104,43 @@ export default function Layout({ children }: { children: React.ReactNode }) {
     );
   }
 
-  // ✅ Ambil menu berdasarkan roleId
+  // ✅ Ambil menu berdasarkan roleId dan menuIds
   const currentNav = authStore.user
     ? getNavbar({ roleId: authStore.user.roleId, menuIds: authStore.user.menuIds })
     : [];
 
-  const handleLogout = () => {
-    authStore.setUser(null);
-    document.cookie = `${process.env.BASE_SESSION_KEY}=; Max-Age=0; path=/;`;
-    router.push('/login');
+  const handleLogout = async () => {
+    try {
+      setIsLoggingOut(true);
+      
+      // ✅ Panggil API logout untuk clear session di server
+      const response = await fetch('/api/logout', { method: 'POST' });
+      const result = await response.json();
+      
+      if (result.success) {
+        // Clear user data dari store
+        authStore.setUser(null);
+        
+        // Clear localStorage
+        localStorage.removeItem('auth_nomor');
+        localStorage.removeItem('auth_kodeId');
+        
+        // Force reload untuk reset semua state
+        window.location.href = '/login';
+      } else {
+        console.error('Logout failed:', result.message);
+        // Tetap redirect meskipun gagal
+        authStore.setUser(null);
+        window.location.href = '/login';
+      }
+    } catch (error) {
+      console.error('Error during logout:', error);
+      // Tetap clear store dan redirect jika error
+      authStore.setUser(null);
+      window.location.href = '/login';
+    } finally {
+      setIsLoggingOut(false);
+    }
   };
 
   return (
@@ -212,6 +246,8 @@ export default function Layout({ children }: { children: React.ReactNode }) {
                 size="lg"
                 variant="gradient"
                 gradient={{ from: colors["blue-button"], to: "#228be6" }}
+                loading={isLoggingOut}
+                disabled={isLoggingOut}
               >
                 <IconLogout2 size={22} />
               </ActionIcon>
@@ -327,4 +363,4 @@ export default function Layout({ children }: { children: React.ReactNode }) {
       </AppShellMain>
     </AppShell>
   );
-}
+}

src/app/api/[[...slugs]]/_lib/user/delUser.ts

@@ -1,12 +1,12 @@
-// /api/user/delete.ts
+// /api/user/delUser.ts
 import prisma from '@/lib/prisma';
 import { Context } from 'elysia';
 
-export default async function userDelete(context: Context) {
+export default async function userDeleteAccount(context: Context) {
   const { id } = context.params as { id: string };
 
   try {
-    // Cek user dulu
+    // 1. Cek user dulu
     const existingUser = await prisma.user.findUnique({
       where: { id },
     });
@@ -18,15 +18,39 @@ export default async function userDelete(context: Context) {
       };
     }
 
-    // Hard delete (hapus permanen)
-    const deletedUser = await prisma.user.delete({
-      where: { id },
+    // ✅ 2. Hapus SEMUA relasi dalam TRANSACTION
+    const result = await prisma.$transaction(async (tx) => {
+      // Hapus UserSession
+      const deletedSessions = await tx.userSession.deleteMany({
+        where: { userId: id },
+      });
+
+      // ✅ Hapus UserMenuAccess
+      const deletedMenuAccess = await tx.userMenuAccess.deleteMany({
+        where: { userId: id },
+      });
+
+      // ✅ Tambahkan relasi lain jika ada (contoh):
+      // await tx.userLog.deleteMany({ where: { userId: id } });
+      // await tx.userNotification.deleteMany({ where: { userId: id } });
+      // await tx.userToken.deleteMany({ where: { userId: id } });
+
+      // Hapus user
+      const deletedUser = await tx.user.delete({
+        where: { id },
+      });
+
+      return {
+        user: deletedUser,
+        sessionsDeleted: deletedSessions.count,
+        menuAccessDeleted: deletedMenuAccess.count,
+      };
     });
 
     return {
       success: true,
-      message: 'User berhasil dihapus permanen',
-      data: deletedUser,
+      message: `User berhasil dihapus permanen (${result.sessionsDeleted} session, ${result.menuAccessDeleted} menu access)`,
+      data: result,
     };
   } catch (error) {
     console.error('Error delete user:', error);
@@ -35,4 +59,4 @@ export default async function userDelete(context: Context) {
       message: 'Terjadi kesalahan saat menghapus user',
     };
   }
-}
+}

src/app/api/[[...slugs]]/_lib/user/index.ts

@@ -5,6 +5,7 @@ import userFindMany from "./findMany";
 import userFindUnique from "./findUnique";
 import userDelete from "./del"; // `delete` nggak boleh jadi nama file JS langsung, jadi biasanya `del.ts`
 import userUpdate from "./updt";
+import userDeleteAccount from "./delUser";
 
 const User = new Elysia({ prefix: "/api/user" })
   .get("/findMany", userFindMany)
@@ -25,7 +26,7 @@ const User = new Elysia({ prefix: "/api/user" })
       })
     }
   )
-  .put("/delUser/:id", userDelete, {
+  .delete("/delUser/:id", userDeleteAccount, {
     params: t.Object({
       id: t.String(),
     }),

src/app/api/[[...slugs]]/_lib/user/updt.ts

@@ -1,171 +1,46 @@
-// /* eslint-disable @typescript-eslint/no-explicit-any */
-// import prisma from "@/lib/prisma";
-// import { Context } from "elysia";
-
-// export default async function userUpdate(context: Context) {
-//   try {
-//     const { id, isActive, roleId } = await context.body as {
-//       id: string,
-//       isActive?: boolean,
-//       roleId?: string
-//     };
-
-//     if (!id) {
-//       return {
-//         success: false,
-//         message: "ID user wajib ada",
-//       };
-//     }
-
-//     // Optional: cek apakah roleId valid
-//     if (roleId) {
-//       const cekRole = await prisma.role.findUnique({
-//         where: { id: roleId }
-//       });
-
-//       if (!cekRole) {
-//         return {
-//           success: false,
-//           message: "Role tidak ditemukan",
-//         };
-//       }
-//     }
-
-//     // ✅ CEK: Apakah roleId berubah?
-//     let isRoleChanged = false;
-//     let oldRoleId: string | null = null;
-    
-//     if (roleId) {
-//       const currentUser = await prisma.user.findUnique({
-//         where: { id },
-//         select: { 
-//           roleId: true,
-//           username: true,
-//         }
-//       });
-      
-//       if (currentUser && currentUser.roleId !== roleId) {
-//         isRoleChanged = true;
-//         oldRoleId = currentUser.roleId;
-//         console.log(`🔄 Role berubah untuk ${currentUser.username}: ${oldRoleId} → ${roleId}`);
-//       }
-//     }
-
-//     // Update user
-//     const updatedUser = await prisma.user.update({
-//       where: { id },
-//       data: {
-//         ...(isActive !== undefined && { isActive }),
-//         ...(roleId && { roleId }),
-//       },
-//       select: {
-//         id: true,
-//         username: true,
-//         nomor: true,
-//         isActive: true,
-//         roleId: true,
-//         updatedAt: true,
-//         role: {
-//           select: {
-//             id: true,
-//             name: true,
-//           }
-//         }
-//       }
-//     });
-
-//     // ✅ FORCE LOGOUT: Hapus UserSession jika role berubah
-//     if (isRoleChanged) {
-//       try {
-//         const deletedSessions = await prisma.userSession.deleteMany({
-//           where: { userId: id }
-//         });
-        
-//         console.log(`🔒 Force logout user ${updatedUser.username} (${id})`);
-//         console.log(`   Deleted ${deletedSessions.count} session(s)`);
-//         console.log(`   Role: ${oldRoleId} → ${roleId}`);
-//       } catch (sessionError: any) {
-//         // Jika UserSession tidak ditemukan (user belum pernah login), skip error
-//         if (sessionError.code !== 'P2025') {
-//           console.error("⚠️ Error menghapus session:", sessionError);
-//         } else {
-//           console.log(`ℹ️ User ${updatedUser.username} belum pernah login`);
-//         }
-//       }
-//     }
-
-//     // ✅ Response dengan info tambahan
-//     return {
-//       success: true,
-//       message: isRoleChanged 
-//         ? `User berhasil diupdate. ${updatedUser.username} akan logout otomatis.`
-//         : "User berhasil diupdate",
-//       data: updatedUser,
-//       roleChanged: isRoleChanged, // Info untuk frontend
-//       oldRoleId: oldRoleId,
-//       newRoleId: roleId,
-//     };
-
-//   } catch (e: any) {
-//     console.error("❌ Error update user:", e);
-//     return {
-//       success: false,
-//       message: "Gagal mengupdate user: " + (e.message || "Unknown error"),
-//     };
-//   }
-// }
-
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import prisma from "@/lib/prisma";
 import { Context } from "elysia";
 
-
-// API update user (Elysia atau Next.js API Route)
+// API update user
 export default async function userUpdate(context: Context) {
   try {
-    const { id, isActive, roleId } = await context.body as {
-      id: string,
-      isActive?: boolean,
-      roleId?: string
+    const { id, isActive, roleId } = (await context.body) as {
+      id: string;
+      isActive?: boolean;
+      roleId?: string;
     };
 
     if (!id) {
-      return {
-        success: false,
-        message: "ID user wajib ada",
-      };
+      return { success: false, message: "ID user wajib ada" };
     }
 
-    // Cek apakah roleId valid
+    // Validasi role
     if (roleId) {
-      const cekRole = await prisma.role.findUnique({ where: { id: roleId } });
-      if (!cekRole) {
-        return {
-          success: false,
-          message: "Role tidak ditemukan",
-        };
-      }
+      const role = await prisma.role.findUnique({ where: { id: roleId } });
+      if (!role) return { success: false, message: "Role tidak ditemukan" };
     }
 
-    // Deteksi perubahan role
-    let isRoleChanged = false;
-    if (roleId) {
-      const currentUser = await prisma.user.findUnique({
-        where: { id },
-        select: { roleId: true }
-      });
-      isRoleChanged = currentUser?.roleId !== roleId;
+    const currentUser = await prisma.user.findUnique({
+      where: { id },
+      select: { roleId: true, isActive: true }
+    });
+
+    if (!currentUser) {
+      return { success: false, message: "User tidak ditemukan" };
     }
 
-    // ✅ UPDATE USER + INVALIDATE SESSION
+    const isRoleChanged = roleId && currentUser.roleId !== roleId;
+    const isActiveChanged = isActive !== undefined && currentUser.isActive !== isActive;
+
+    // Update user
     const updatedUser = await prisma.user.update({
       where: { id },
       data: {
         ...(isActive !== undefined && { isActive }),
         ...(roleId && { roleId }),
-        // Force logout: set sessionInvalid = true
-        ...(isRoleChanged && { sessionInvalid: true }),
+        // Force logout: invalidate semua sesi
+        ...(isRoleChanged ? { sessionInvalid: true } : {}),
       },
       select: {
         id: true,
@@ -177,26 +52,21 @@ export default async function userUpdate(context: Context) {
       }
     });
 
-    // ✅ Reset sessionInvalid setelah 5 detik (opsional)
+    // ✅ HAPUS SEMUA SESI USER DI DATABASE
     if (isRoleChanged) {
-      setTimeout(async () => {
-        try {
-          await prisma.user.update({
-            where: { id },
-            data: { sessionInvalid: false }
-          });
-        } catch (e) {
-          console.error('Gagal reset sessionInvalid:', e);
-        }
-      }, 5000);
+      await prisma.userSession.deleteMany({ where: { userId: id } });
     }
 
     return {
       success: true,
-      message: isRoleChanged 
-        ? `User berhasil diupdate. ${updatedUser.username} akan logout otomatis.`
-        : "User berhasil diupdate",
+      roleChanged: isRoleChanged,
+      isActiveChanged,
       data: updatedUser,
+      message: isRoleChanged 
+        ? `Role ${updatedUser.username} diubah. User akan logout otomatis.`
+        : isActiveChanged
+        ? `${updatedUser.username} ${isActive ? 'diaktifkan' : 'dinonaktifkan'}.`
+        : "User berhasil diupdate"
     };
   } catch (e: any) {
     console.error("❌ Error update user:", e);

src/app/api/[auth]/_lib/api_fetch_auth.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-// app/api/auth/_lib/api_fetch_auth.ts
+// app/api/_lib/api_fetch_auth.ts
 
-// app/api/auth/_lib/api_fetch_auth.ts
+// app/api/_lib/api_fetch_auth.ts
 
 export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
   if (!nomor || nomor.replace(/\D/g, '').length < 10) {
@@ -10,10 +10,11 @@ export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
 
   const cleanPhone = nomor.replace(/\D/g, '');
 
-  const response = await fetch("/api/auth/login", {
+  const response = await fetch("/api/login", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ nomor: cleanPhone }),
+    credentials: 'include'
   });
 
   // Pastikan respons bisa di-parse sebagai JSON
@@ -21,7 +22,7 @@ export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
   try {
     data = await response.json();
   } catch (e) {
-    console.error("Non-JSON response from /api/auth/login:", await response.text());
+    console.error("Non-JSON response from /api/login:", await response.text());
     throw new Error('Respons server tidak valid');
   }
 
@@ -54,10 +55,11 @@ export const apiFetchRegister = async ({
   const cleanPhone = nomor.replace(/\D/g, '');
   if (cleanPhone.length < 10) throw new Error('Nomor tidak valid');
 
-  const response = await fetch("/api/auth/register", {
+  const response = await fetch("/api/register", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ username: username.trim(), nomor: cleanPhone }),
+    credentials: 'include',
   });
 
   const data = await response.json();
@@ -71,7 +73,7 @@ export const apiFetchOtpData = async ({ kodeId }: { kodeId: string }) => {
     throw new Error('Kode ID tidak valid');
   }
 
-  const response = await fetch("/api/auth/otp-data", {
+  const response = await fetch("/api/otp-data", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ kodeId }),
@@ -86,32 +88,14 @@ export const apiFetchOtpData = async ({ kodeId }: { kodeId: string }) => {
   return data;
 };
 
-export const apiFetchVerifyOtp = async ({
-  nomor,
-  otp,
-  kodeId
-}: {
-  nomor: string;
-  otp: string;
-  kodeId: string;
-}) => {
-  if (!nomor || !otp || !kodeId) {
-    throw new Error('Data verifikasi tidak lengkap');
-  }
-
-  if (!/^\d{4,6}$/.test(otp)) {
-    throw new Error('Kode OTP harus 4-6 digit angka');
-  }
-
-  const response = await fetch('/api/auth/verify-otp', {
+// Ganti endpoint ke verify-otp-login
+export const apiFetchVerifyOtp = async ({ nomor, otp, kodeId }: { nomor: string; otp: string; kodeId: string }) => {
+  const response = await fetch('/api/verify-otp-login', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify({ nomor, otp, kodeId }),
   });
-
   const data = await response.json();
-
-  // ✅ Jangan throw error untuk status 4xx — biarkan frontend handle
   return {
     success: response.ok,
     ...data,

src/app/api/[auth]/_lib/session_create.ts

@@ -0,0 +1,65 @@
+// src/app/api/auth/_lib/sessionCreate.ts
+import { cookies } from "next/headers";
+import { encrypt } from "./encrypt";
+import prisma from "@/lib/prisma";
+import { add } from "date-fns";
+
+export async function sessionCreate({
+  sessionKey,
+  exp = "30 day",
+  jwtSecret,
+  user,
+  invalidatePrevious = true, // 🔑 kontrol apakah sesi lama di-nonaktifkan
+}: {
+  sessionKey: string;
+  exp?: string;
+  jwtSecret: string;
+  user: Record<string, unknown> & { id: string };
+  invalidatePrevious?: boolean; // default true untuk login, false untuk registrasi
+}) {
+  // ✅ Validasi env vars
+  if (!sessionKey || sessionKey.length === 0) {
+    throw new Error("sessionKey tidak boleh kosong");
+  }
+  if (!jwtSecret || jwtSecret.length < 32) {
+    throw new Error("jwtSecret minimal 32 karakter");
+  }
+
+  const token = await encrypt({ exp, jwtSecret, user });
+  if (!token) {
+    throw new Error("Token generation failed");
+  }
+
+  // ✅ Hitung expiresAt
+  let expiresAt = add(new Date(), { days: 30 });
+  if (exp === "7 day") expiresAt = add(new Date(), { days: 7 });
+
+  // 🔐 Hanya nonaktifkan sesi aktif sebelumnya jika diminta (misal: saat login ulang)
+  if (invalidatePrevious) {
+    await prisma.userSession.updateMany({
+      where: { userId: user.id, active: true },
+      data: { active: false },
+    });
+  }
+
+  // ✅ Simpan sesi baru
+  await prisma.userSession.create({
+    data: {
+      token,
+      userId: user.id,
+      active: true,
+      expiresAt,
+    },
+  });
+
+  // ✅ Set cookie
+  (await cookies()).set(sessionKey, token, {
+    httpOnly: true,
+    sameSite: "lax",
+    path: "/",
+    secure: process.env.NODE_ENV === "production",
+    maxAge: 30 * 24 * 60 * 60, // 30 hari dalam detik
+  });
+
+  return token;
+}

src/app/api/[auth]/_lib/session_verify.ts

@@ -0,0 +1,39 @@
+// app/api/auth/_lib/session_verify.ts
+import { cookies } from "next/headers";
+import { decrypt } from "./decrypt";
+import prisma from "@/lib/prisma";
+
+export async function verifySession() {
+  try {
+    const sessionKey = process.env.BASE_SESSION_KEY;
+    const jwtSecret = process.env.BASE_TOKEN_KEY;
+    if (!sessionKey || !jwtSecret) throw new Error('Env tidak lengkap');
+
+    const token = (await cookies()).get(sessionKey)?.value;
+    if (!token) return null;
+
+    const jwtUser = await decrypt({ token, jwtSecret });
+    if (!jwtUser?.id) return null;
+
+    // Cari session di DB berdasarkan token
+    const dbSession = await prisma.userSession.findFirst({
+      where: { 
+        token, 
+        active: true,
+        expiresAt: { gte: new Date() }
+      },
+      include: { user: true }
+    });
+
+    if (!dbSession) {
+      console.log('⚠️ Session tidak ditemukan di DB');
+      return null;
+    }
+
+    // Don't check isActive here, let the frontend handle it
+    return dbSession.user;
+  } catch (error) {
+    console.warn('Session verification failed:', error);
+    return null;
+  }
+}

src/app/api/[auth]/clear-flow/route.ts

@@ -0,0 +1,19 @@
+// app/api/auth/clear-flow/route.ts
+import { NextResponse } from 'next/server';
+import { cookies } from 'next/headers';
+
+export async function POST() {
+  try {
+    // ✅ Next.js 15 syntax
+    const cookieStore = await cookies();
+    cookieStore.delete('auth_flow');
+    
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    console.error('❌ Error clearing flow cookie:', error);
+    return NextResponse.json(
+      { success: false, message: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}

src/app/api/[auth]/finalize-registration/route.ts

@@ -0,0 +1,122 @@
+// src/app/api/auth/finalize-registration/route.ts
+import prisma from "@/lib/prisma";
+import { NextResponse } from "next/server";
+import { sessionCreate } from "../_lib/session_create";
+
+// ✅ Gunakan STRING untuk roleId
+const DEFAULT_MENUS_BY_ROLE: Record<string, string[]> = {
+  "0": [
+    "Landing Page", "PPID", "Desa", "Kesehatan", "Keamanan",
+    "Ekonomi", "Inovasi", "Lingkungan", "Pendidikan", "User & Role"
+  ],
+  "1": [
+    "Landing Page", "PPID", "Desa", "Keamanan",
+    "Ekonomi", "Inovasi", "Lingkungan", "User & Role"
+  ],
+  "2": ["Landing Page", "Desa", "Ekonomi", "Inovasi", "Lingkungan"],
+  "3": ["Kesehatan"],
+  "4": ["Pendidikan"],
+};
+
+export async function POST(req: Request) {
+  try {
+    const { nomor, username, kodeId } = await req.json();
+    const cleanNomor = nomor.replace(/\D/g, "");
+
+    if (!cleanNomor || !username || !kodeId) {
+      return NextResponse.json(
+        { success: false, message: "Data tidak lengkap" },
+        { status: 400 }
+      );
+    }
+
+    const otpRecord = await prisma.kodeOtp.findUnique({ where: { id: kodeId } });
+    if (!otpRecord?.isActive || otpRecord.nomor !== cleanNomor) {
+      return NextResponse.json(
+        { success: false, message: "OTP tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    if (await prisma.user.findFirst({ where: { username } })) {
+      return NextResponse.json(
+        { success: false, message: "Username sudah digunakan" },
+        { status: 409 }
+      );
+    }
+
+    // 🔥 Tentukan roleId sebagai STRING
+    const targetRoleId = "1"; // ✅ string, bukan number
+
+    // Validasi role (gunakan string)
+    const roleExists = await prisma.role.findUnique({
+      where: { id: targetRoleId }, // ✅ id bertipe string
+      select: { id: true }
+    });
+
+    if (!roleExists) {
+      return NextResponse.json(
+        { success: false, message: "Role tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    // Buat user dengan roleId string
+    const newUser = await prisma.user.create({
+      data: {
+        username,
+        nomor,
+        roleId: targetRoleId, // ✅ string
+        isActive: false,
+      },
+    });
+
+    // Berikan akses menu
+    const menuIds = DEFAULT_MENUS_BY_ROLE[targetRoleId] || [];
+    if (menuIds.length > 0) {
+      await prisma.userMenuAccess.createMany({
+        data: menuIds.map(menuId => ({
+          userId: newUser.id,
+          menuId,
+        })),
+      });
+    }
+
+    await prisma.kodeOtp.update({
+      where: { id: kodeId },
+      data: { isActive: false },
+    });
+
+    const token = await sessionCreate({
+      sessionKey: process.env.BASE_SESSION_KEY!,
+      jwtSecret: process.env.BASE_TOKEN_KEY!,
+      exp: "30 day",
+      user: {
+        id: newUser.id,
+        nomor: newUser.nomor,
+        username: newUser.username,
+        roleId: newUser.roleId, // string
+        isActive: false,
+      },
+      invalidatePrevious: false,
+    });
+
+    const response = NextResponse.redirect(new URL('/waiting-room', req.url));
+    response.cookies.set(process.env.BASE_SESSION_KEY!, token, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      path: "/",
+      maxAge: 30 * 24 * 60 * 60,
+    });
+
+    return response;
+  } catch (error) {
+    console.error("❌ Finalize Registration Error:", error);
+    return NextResponse.json(
+      { success: false, message: "Registrasi gagal" },
+      { status: 500 }
+    );
+  } finally {
+    await prisma.$disconnect();
+  }
+}

src/app/api/[auth]/get-flow/route.ts

@@ -0,0 +1,22 @@
+// app/api/auth/get-flow/route.ts
+import { NextResponse } from 'next/server';
+import { cookies } from 'next/headers';
+
+export async function GET() {
+  try {
+    // ✅ Next.js 15 syntax
+    const cookieStore = await cookies();
+    const flow = cookieStore.get('auth_flow')?.value || 'login';
+    
+    return NextResponse.json({ 
+      success: true, 
+      flow 
+    });
+  } catch (error) {
+    console.error('❌ Error getting flow cookie:', error);
+    return NextResponse.json(
+      { success: false, flow: 'login' },
+      { status: 500 }
+    );
+  }
+}

src/app/api/[auth]/login/route.ts

@@ -2,6 +2,7 @@
 import prisma from "@/lib/prisma";
 import { NextResponse } from "next/server";
 import { randomOTP } from "../_lib/randomOTP";
+import { cookies } from "next/headers";
 
 export async function POST(req: Request) {
   if (req.method !== "POST") {
@@ -29,19 +30,37 @@ export async function POST(req: Request) {
     const isRegistered = !!existingUser;
 
     if (isRegistered) {
-      // ✅ User terdaftar → kirim OTP
       const codeOtp = randomOTP();
       const otpNumber = Number(codeOtp);
 
-      const waMessage = `Website Desa Darmasaba - Kode verifikasi Anda: ${codeOtp}`;
-      const waUrl = `https://wa.wibudev.com/code?nom=${encodeURIComponent(nomor)}&text=${encodeURIComponent(waMessage)}`;
+      // ✅ PERBAIKAN: Gunakan format pesan yang lebih sederhana
+      // Hapus karakter khusus yang bisa bikin masalah
+      const waMessage = `Website Desa Darmasaba\nKode verifikasi Anda ${codeOtp}`;
+      
+      // // ✅ OPSI 1: Tanpa encoding (coba dulu ini)
+      // const waUrl = `https://wa.wibudev.com/code?nom=${nomor}&text=${waMessage}`;
+      
+      // ✅ OPSI 2: Dengan encoding (kalau opsi 1 gagal)
+      const waUrl = `https://wa.wibudev.com/code?nom=${nomor}&text=${encodeURIComponent(waMessage)}`;
+      
+      // ✅ OPSI 3: Encoding manual untuk URL-safe (alternatif terakhir)
+      // const encodedMessage = waMessage.replace(/\n/g, '%0A').replace(/ /g, '%20');
+      // const waUrl = `https://wa.wibudev.com/code?nom=${nomor}&text=${encodedMessage}`;
 
+      console.log("🔍 Debug WA URL:", waUrl); // Untuk debugging
+      
       const res = await fetch(waUrl);
       const sendWa = await res.json();
 
+      console.log("📱 WA Response:", sendWa); // Debug response
+
       if (sendWa.status !== "success") {
         return NextResponse.json(
-          { success: false, message: "Gagal mengirim OTP via WhatsApp" },
+          { 
+            success: false, 
+            message: "Gagal mengirim OTP via WhatsApp",
+            debug: sendWa // Tampilkan error detail
+          },
           { status: 400 }
         );
       }
@@ -50,6 +69,15 @@ export async function POST(req: Request) {
         data: { nomor, otp: otpNumber, isActive: true },
       });
 
+      const cookieStore = await cookies();
+      cookieStore.set('auth_flow', 'login', {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === 'production',
+        sameSite: 'lax',
+        maxAge: 60 * 5, // 5 menit
+        path: '/'
+      });
+
       return NextResponse.json({
         success: true,
         message: "Kode verifikasi dikirim",
@@ -57,16 +85,14 @@ export async function POST(req: Request) {
         isRegistered: true,
       });
     } else {
-      // ❌ User belum terdaftar → JANGAN kirim OTP
       return NextResponse.json({
         success: true,
         message: "Nomor belum terdaftar",
         isRegistered: false,
-        // Tidak ada kodeId
       });
     }
   } catch (error) {
-    console.error("Error Login:", error);
+    console.error("❌ Error Login:", error);
     return NextResponse.json(
       { success: false, message: "Terjadi kesalahan saat login" },
       { status: 500 }

src/app/api/[auth]/me/route.ts

@@ -0,0 +1,59 @@
+// src/app/api/auth/me/route.ts
+import { NextResponse } from 'next/server';
+import { verifySession } from '../_lib/session_verify';
+import prisma from '@/lib/prisma';
+
+export async function GET() {
+  try {
+    const sessionUser = await verifySession();
+    if (!sessionUser) {
+      return NextResponse.json(
+        { success: false, message: "Unauthorized", user: null },
+        { status: 401 }
+      );
+    }
+
+    const [dbUser, menuAccess] = await Promise.all([
+      prisma.user.findUnique({
+        where: { id: sessionUser.id },
+        select: {
+          id: true,
+          username: true,
+          nomor: true,
+          roleId: true,   // STRING!
+          isActive: true, // BOOLEAN!
+        },
+      }),
+      prisma.userMenuAccess.findMany({
+        where: { userId: sessionUser.id },
+        select: { menuId: true },
+      }),
+    ]);
+
+    if (!dbUser) {
+      return NextResponse.json(
+        { success: false, message: "User not found", user: null },
+        { status: 404 }
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      user: {
+        id: dbUser.id,
+        name: dbUser.username,
+        username: dbUser.username,
+        nomor: dbUser.nomor,
+        roleId: dbUser.roleId,     // STRING!
+        isActive: dbUser.isActive, // BOOLEAN!
+        menuIds: menuAccess.map(m => m.menuId),
+      },
+    });
+  } catch (error) {
+    console.error("❌ Error in /api/me:", error);
+    return NextResponse.json(
+      { success: false, message: "Internal server error", user: null },
+      { status: 500 }
+    );
+  }
+}

src/app/api/[auth]/otp-data/route.ts

@@ -2,9 +2,10 @@
 import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";
 
-export async function POST(req: Request) {
+export async function GET(request: Request) {
   try {
-    const { kodeId } = await req.json();
+    const { searchParams } = new URL(request.url);
+    const kodeId = searchParams.get("kodeId");
 
     if (!kodeId) {
       return NextResponse.json(
@@ -15,7 +16,7 @@ export async function POST(req: Request) {
 
     const otpRecord = await prisma.kodeOtp.findUnique({
       where: { id: kodeId },
-      select: { id: true, nomor: true, isActive: true, createdAt: true },
+      select: { nomor: true, isActive: true },
     });
 
     if (!otpRecord || !otpRecord.isActive) {
@@ -27,12 +28,12 @@ export async function POST(req: Request) {
 
     return NextResponse.json({
       success: true,
-      data: otpRecord,
+      data: { nomor: otpRecord.nomor },
     });
   } catch (error) {
-    console.error("Error fetching OTP data:", error);
+    console.error("❌ Gagal mengambil data OTP:", error);
     return NextResponse.json(
-      { success: false, message: "Gagal mengambil data OTP" },
+      { success: false, message: "Terjadi kesalahan internal" },
       { status: 500 }
     );
   } finally {

src/app/api/[auth]/refresh-session/route.ts

@@ -0,0 +1,55 @@
+import { NextResponse } from 'next/server';
+import { verifySession } from '../_lib/session_verify';
+import { sessionCreate } from '../_lib/session_create';
+import prisma from '@/lib/prisma';
+
+export async function POST() {
+  try {
+    const sessionUser = await verifySession();
+    if (!sessionUser) {
+      return NextResponse.json(
+        { success: false, message: "Unauthorized" },
+        { status: 401 }
+      );
+    }
+
+    // Get fresh user data
+    const user = await prisma.user.findUnique({
+      where: { id: sessionUser.id },
+      select: {
+        id: true,
+        username: true,
+        roleId: true,
+        isActive: true,
+      },
+    });
+
+    if (!user) {
+      return NextResponse.json(
+        { success: false, message: "User not found" },
+        { status: 404 }
+      );
+    }
+
+    // Create new session with updated data
+    await sessionCreate({
+      sessionKey: process.env.BASE_SESSION_KEY!,
+      jwtSecret: process.env.BASE_TOKEN_KEY!,
+      user: {
+        id: user.id,
+        username: user.username,
+        roleId: user.roleId,
+        isActive: user.isActive,
+      },
+      invalidatePrevious: false, // Keep existing sessions
+    });
+
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    console.error('Error refreshing session:', error);
+    return NextResponse.json(
+      { success: false, message: "Internal server error" },
+      { status: 500 }
+    );
+  }
+}

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

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server';
+import { cookies } from 'next/headers';
 import prisma from '@/lib/prisma';
-import { randomOTP } from '../_lib/randomOTP'; // pastikan ada
+import { randomOTP } from '../_lib/randomOTP';
 
 export async function POST(req: Request) {
   try {
@@ -14,7 +15,7 @@ export async function POST(req: Request) {
     if (await prisma.user.findUnique({ where: { nomor } })) {
       return NextResponse.json({ success: false, message: 'Nomor sudah terdaftar' }, { status: 409 });
     }
-    if (await prisma.user.findUnique({ where: { username } })) {
+    if (await prisma.user.findFirst({ where: { username } })) {
       return NextResponse.json({ success: false, message: 'Username sudah digunakan' }, { status: 409 });
     }
 
@@ -36,7 +37,17 @@ export async function POST(req: Request) {
       data: { nomor, otp: otpNumber, isActive: true }
     });
 
-    // ✅ Kembalikan kodeId (jangan buat user di sini!)
+    // ✅ Set cookie flow=register (Next.js 15+ syntax)
+    const cookieStore = await cookies();
+    cookieStore.set('auth_flow', 'register', {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'lax',
+      maxAge: 60 * 5, // 5 menit
+      path: '/'
+    });
+
+    // ✅ Kembalikan kodeId
     return NextResponse.json({
       success: true,
       message: 'Kode verifikasi dikirim',

src/app/api/[auth]/resend/route.ts

@@ -0,0 +1,58 @@
+// src/app/api/auth/resend-otp/route.ts
+import prisma from "@/lib/prisma";
+
+import { NextResponse } from "next/server";
+import { randomOTP } from "../_lib/randomOTP";
+
+export async function POST(req: Request) {
+  try {
+    const { nomor } = await req.json();
+
+    if (!nomor || typeof nomor !== 'string') {
+      return NextResponse.json(
+        { success: false, message: "Nomor tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    const codeOtp = randomOTP();
+    const otpNumber = Number(codeOtp);
+
+    // Kirim OTP via WhatsApp
+    const waMessage = `Kode verifikasi Anda: ${codeOtp}`;
+    const waUrl = `https://wa.wibudev.com/code?nom=${encodeURIComponent(nomor)}&text=${encodeURIComponent(waMessage)}`;
+    const waRes = await fetch(waUrl);
+    const waData = await waRes.json();
+
+    if (waData.status !== "success") {
+      return NextResponse.json(
+        { success: false, message: "Gagal mengirim OTP via WhatsApp" },
+        { status: 400 }
+      );
+    }
+
+    // Simpan OTP ke database
+    const otpRecord = await prisma.kodeOtp.create({
+      data: {
+        nomor,
+        otp: otpNumber,
+        isActive: true,
+      },
+    });
+
+    return NextResponse.json({
+      success: true,
+      message: "OTP baru dikirim",
+      kodeId: otpRecord.id,
+    });
+
+  } catch (error) {
+    console.error("Error Resend OTP:", error);
+    return NextResponse.json(
+      { success: false, message: "Gagal mengirim ulang OTP" },
+      { status: 500 }
+    );
+  } finally {
+    await prisma.$disconnect();
+  }
+}

src/app/api/[auth]/send-otp-register/route.ts

@@ -14,7 +14,7 @@ export async function POST(req: Request) {
     if (await prisma.user.findUnique({ where: { nomor } })) {
       return NextResponse.json({ success: false, message: 'Nomor sudah terdaftar' }, { status: 409 });
     }
-    if (await prisma.user.findUnique({ where: { username } })) {
+    if (await prisma.user.findFirst({ where: { username } })) {
       return NextResponse.json({ success: false, message: 'Username sudah digunakan' }, { status: 409 });
     }
 

src/app/api/[auth]/set-flow/route.ts

@@ -0,0 +1,34 @@
+// app/api/auth/set-flow/route.ts
+import { NextResponse } from 'next/server';
+import { cookies } from 'next/headers';
+
+export async function POST(request: Request) {
+  try {
+    const { flow } = await request.json();
+    
+    if (!flow || !['login', 'register'].includes(flow)) {
+      return NextResponse.json(
+        { success: false, message: 'Invalid flow parameter' },
+        { status: 400 }
+      );
+    }
+    
+    // ✅ Next.js 15 syntax
+    const cookieStore = await cookies();
+    cookieStore.set('auth_flow', flow, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === 'production',
+      sameSite: 'lax',
+      maxAge: 60 * 5,
+      path: '/'
+    });
+    
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    console.error('❌ Error setting flow cookie:', error);
+    return NextResponse.json(
+      { success: false, message: 'Internal server error' },
+      { status: 500 }
+    );
+  }
+}

src/app/api/[auth]/verify-otp-login/route.ts

@@ -0,0 +1,101 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// src/app/api/auth/verify-otp-login/route.ts
+import prisma from "@/lib/prisma";
+import { NextResponse } from "next/server";
+import { sessionCreate } from "../_lib/session_create";
+
+export async function POST(req: Request) {
+  try {
+    const { nomor, otp, kodeId } = await req.json();
+
+    if (!nomor || !otp || !kodeId) {
+      return NextResponse.json(
+        { success: false, message: "Data tidak lengkap" },
+        { status: 400 }
+      );
+    }
+
+    const otpRecord = await prisma.kodeOtp.findUnique({ where: { id: kodeId } });
+    if (!otpRecord || !otpRecord.isActive || otpRecord.nomor !== nomor) {
+      return NextResponse.json(
+        { success: false, message: "Kode verifikasi tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    const receivedOtp = Number(otp);
+    if (isNaN(receivedOtp) || otpRecord.otp !== receivedOtp) {
+      return NextResponse.json(
+        { success: false, message: "Kode OTP salah" },
+        { status: 400 }
+      );
+    }
+
+    // 🔍 CARI USER — JANGAN BUAT BARU!
+    const user = await prisma.user.findUnique({
+      where: { nomor },
+      select: { id: true, nomor: true, username: true, roleId: true, isActive: true },
+    });
+
+    if (!user) {
+      // ❌ Nomor belum terdaftar → suruh registrasi
+      return NextResponse.json(
+        { success: false, message: "Akun tidak ditemukan. Silakan registrasi terlebih dahulu." },
+        { status: 404 }
+      );
+    }
+
+    // ✅ Buat sesi
+    const token = await sessionCreate({
+      sessionKey: process.env.BASE_SESSION_KEY!,
+      jwtSecret: process.env.BASE_TOKEN_KEY!,
+      exp: "30 day",
+      user: {
+        id: user.id,
+        nomor: user.nomor,
+        username: user.username,
+        roleId: user.roleId,
+        isActive: user.isActive,
+      },
+    });
+
+    await prisma.$transaction([
+      prisma.kodeOtp.update({ where: { id: kodeId }, data: { isActive: false } }),
+      prisma.user.update({ where: { id: user.id }, data: { lastLogin: new Date() } }),
+    ]);
+
+    const response = NextResponse.json({
+      success: true,
+      message: user.isActive ? "Berhasil login" : "Menunggu persetujuan",
+      user: {
+        id: user.id,
+        name: user.username,
+        roleId: user.roleId,
+        isActive: user.isActive,
+      },
+    });
+
+    response.cookies.set(process.env.BASE_SESSION_KEY!, token, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      path: "/",
+      maxAge: 30 * 24 * 60 * 60,
+    });
+
+    return response;
+  } catch (error: any) {
+    console.error("❌ Verify OTP Login Error:", error);
+    if (error.message.includes("sessionKey") || error.message.includes("jwtSecret")) {
+      return NextResponse.json(
+        { success: false, message: "Konfigurasi server tidak lengkap" },
+        { status: 500 }
+      );
+    }
+    return NextResponse.json(
+      { success: false, message: "Terjadi kesalahan saat login" },
+      { status: 500 }
+    );
+  } finally {
+    await prisma.$disconnect();
+  }
+}

src/app/api/[auth]/verify-otp-register/route.ts

@@ -0,0 +1,61 @@
+// src/app/api/auth/verify-otp-register/route.ts
+import prisma from "@/lib/prisma";
+import { NextResponse } from "next/server";
+
+export async function POST(req: Request) {
+  try {
+    const { nomor, otp, kodeId } = await req.json();
+
+    if (!nomor || !otp || !kodeId) {
+      return NextResponse.json(
+        { success: false, message: "Data tidak lengkap" },
+        { status: 400 }
+      );
+    }
+
+    const otpRecord = await prisma.kodeOtp.findUnique({
+      where: { id: kodeId },
+    });
+
+    if (!otpRecord || !otpRecord.isActive) {
+      return NextResponse.json(
+        { success: false, message: "Kode verifikasi tidak valid atau sudah kadaluarsa" },
+        { status: 400 }
+      );
+    }
+
+    if (otpRecord.nomor !== nomor) {
+      return NextResponse.json(
+        { success: false, message: "Nomor tidak sesuai dengan kode verifikasi" },
+        { status: 400 }
+      );
+    }
+
+    const receivedOtp = Number(otp);
+    if (isNaN(receivedOtp) || otpRecord.otp !== receivedOtp) {
+      return NextResponse.json(
+        { success: false, message: "Kode OTP salah" },
+        { status: 400 }
+      );
+    }
+
+    // ✅ Hanya validasi — jangan update isActive!
+    return NextResponse.json({
+      success: true,
+      message: "OTP valid. Lanjutkan ke finalisasi registrasi.",
+      data: {
+        nomor,
+        kodeId,
+      },
+    });
+
+  } catch (error) {
+    console.error("❌ Verify OTP Register Error:", error);
+    return NextResponse.json(
+      { success: false, message: "Terjadi kesalahan saat verifikasi OTP" },
+      { status: 500 }
+    );
+  } finally {
+    await prisma.$disconnect();
+  }
+}

src/app/api/auth/_lib/session_create.ts

@@ -1,91 +0,0 @@
-// app/api/auth/_lib/session_create.ts
-import { cookies } from "next/headers";
-import { encrypt } from "./encrypt";
-import prisma from "@/lib/prisma";
-
-export async function sessionCreate({
-  sessionKey,
-  exp = "30 day",
-  jwtSecret,
-  user,
-}: {
-  sessionKey: string;
-  exp?: string;
-  jwtSecret: string;
-  user: Record<string, unknown>;
-}) {
-  // 🔒 Validasi kunci tidak kosong
-  if (!sessionKey || sessionKey.length === 0) {
-    throw new Error("sessionKey tidak boleh kosong");
-  }
-  if (!jwtSecret || jwtSecret.length === 0) {
-    throw new Error("jwtSecret tidak boleh kosong");
-  }
-
-  const token = await encrypt({
-    exp,
-    jwtSecret,
-    user,
-  });
-
-  if (token === null) {
-    throw new Error("Token generation failed");
-  }
-
-  // ✅ HYBRID: Simpan token ke database UserSession
-  const userId = user.id as string;
-  
-  if (userId) {
-    try {
-      // Hapus session lama user ini (logout device lain)
-      await prisma.userSession.deleteMany({
-        where: { userId },
-      });
-
-      // Parse expiration
-      const expiresDate = new Date();
-      const expMatch = exp.match(/(\d+)\s*(day|year)/);
-      
-      if (expMatch) {
-        const [, num, unit] = expMatch;
-        const amount = parseInt(num);
-        
-        if (unit === 'year') {
-          expiresDate.setFullYear(expiresDate.getFullYear() + amount);
-        } else if (unit === 'day') {
-          expiresDate.setDate(expiresDate.getDate() + amount);
-        }
-      } else {
-        // Default 30 hari
-        expiresDate.setDate(expiresDate.getDate() + 30);
-      }
-
-      // Buat session baru di database
-      await prisma.userSession.create({
-        data: {
-          userId,
-          token, // JWT token disimpan
-          expires: expiresDate,
-          active: true,
-        },
-      });
-
-      console.log(`✅ Session created for user ${userId}`);
-    } catch (dbError) {
-      console.error("⚠️ Error menyimpan session ke database:", dbError);
-      // Tetap lanjut meski gagal simpan ke DB (fallback ke JWT only)
-    }
-  }
-
-  // Set cookie
-  const cookieStore = await cookies();
-  cookieStore.set(sessionKey, token, {
-    httpOnly: true,
-    sameSite: "lax",
-    path: "/",
-    secure: process.env.NODE_ENV === "production",
-    maxAge: 30 * 24 * 60 * 60, // 30 hari dalam detik
-  });
-
-  return token;
-}

src/app/api/auth/_lib/session_verify.ts

@@ -1,136 +0,0 @@
-// // app/api/auth/_lib/session_verify.ts
-// import { cookies } from 'next/headers';
-// import { decrypt } from './decrypt';
-// import prisma from '@/lib/prisma';
-
-// /**
-//  * Verifikasi session hybrid:
-//  * 1. Decrypt JWT token
-//  * 2. Cek apakah token masih ada di database (untuk force logout)
-//  * 3. Return data user terbaru dari database
-//  */
-// export async function verifySession(): Promise<Record<string, unknown> | null> {
-//   try {
-//     const sessionKey = process.env.BASE_SESSION_KEY;
-//     if (!sessionKey) {
-//       throw new Error('BASE_SESSION_KEY tidak ditemukan di environment');
-//     }
-
-//     const jwtSecret = process.env.BASE_TOKEN_KEY;
-//     if (!jwtSecret) {
-//       throw new Error('BASE_TOKEN_KEY tidak ditemukan di environment');
-//     }
-
-//     const cookieStore = await cookies();
-//     const token = cookieStore.get(sessionKey)?.value;
-
-//     if (!token) {
-//       return null;
-//     }
-
-//     // Step 1: Decrypt JWT
-//     const jwtUser = await decrypt({ token, jwtSecret });
-    
-//     if (!jwtUser || !jwtUser.id) {
-//       console.log('⚠️ JWT decrypt failed atau tidak ada user ID');
-//       return null;
-//     }
-
-//     // Step 2: Cek database UserSession (untuk force logout)
-//     try {
-//       const dbSession = await prisma.userSession.findFirst({
-//         where: {
-//           userId: jwtUser.id as string,
-//           token: token,
-//           active: true,
-//           OR: [
-//             { expires: null },
-//             { expires: { gte: new Date() } },
-//           ],
-//         },
-//         include: {
-//           User: {
-//             select: {
-//               id: true,
-//               username: true,
-//               nomor: true,
-//               roleId: true,
-//               isActive: true,
-//             },
-//           },
-//         },
-//       });
-
-//       // Token tidak ditemukan di database = sudah dihapus (force logout)
-//       if (!dbSession) {
-//         console.log('⚠️ Token valid tapi sudah dihapus dari database (force logout)');
-//         return null;
-//       }
-
-//       // Step 3: Return data user terbaru dari database
-//       // Ini penting agar roleId selalu update
-//       return {
-//         id: dbSession.User.id,
-//         username: dbSession.User.username,
-//         nomor: dbSession.User.nomor,
-//         roleId: dbSession.User.roleId,
-//         isActive: dbSession.User.isActive,
-//       };
-
-//     } catch (dbError) {
-//       console.error("⚠️ Error cek database session:", dbError);
-//       // Fallback: jika database error, tetap pakai JWT
-//       return jwtUser;
-//     }
-
-//   } catch (error) {
-//     console.warn('❌ Session verification failed:', error);
-//     return null;
-//   }
-// }
-
-// src/app/api/auth/_lib/session_verify.ts
-import { cookies } from 'next/headers';
-import { decrypt } from './decrypt';
-import prisma from '@/lib/prisma';
-
-export async function verifySession() {
-  try {
-    const sessionKey = process.env.BASE_SESSION_KEY;
-    const jwtSecret = process.env.BASE_TOKEN_KEY;
-
-    if (!sessionKey || !jwtSecret) {
-      throw new Error('Environment variables tidak lengkap');
-    }
-
-    const token = (await cookies()).get(sessionKey)?.value;
-    if (!token) return null;
-
-    // Decrypt JWT
-    const jwtUser = await decrypt({ token, jwtSecret });
-    if (!jwtUser || !jwtUser.id) return null;
-
-    // ✅ Cek apakah session di-invalidate
-    const user = await prisma.user.findUnique({
-      where: { id: jwtUser.id as string },
-      select: {
-        id: true,
-        username: true,
-        nomor: true,
-        roleId: true,
-        isActive: true,
-        sessionInvalid: true, // ← Tambahkan field ini
-      },
-    });
-
-    if (!user || user.sessionInvalid) {
-      console.log('⚠️ Session tidak valid (force logout)');
-      return null;
-    }
-
-    return user;
-  } catch (error) {
-    console.warn('Session verification failed:', error);
-    return null;
-  }
-}

src/app/api/auth/finalize-registration/route.ts

@@ -1,100 +0,0 @@
-// app/api/auth/finalize-registration/route.ts
-import prisma from "@/lib/prisma";
-import { NextResponse } from "next/server";
-import { sessionCreate } from "../_lib/session_create";
-
-export async function POST(req: Request) {
-  try {
-    const { nomor, username, kodeId, roleId } = await req.json();
-
-    // Validasi input
-    if (!nomor || !username || !kodeId) {
-      return NextResponse.json(
-        { success: false, message: "Data tidak lengkap" },
-        { status: 400 }
-      );
-    }
-
-    // Verifikasi OTP
-    const otpRecord = await prisma.kodeOtp.findUnique({
-      where: { id: kodeId },
-    });
-
-    if (!otpRecord?.isActive || otpRecord.nomor !== nomor) {
-      return NextResponse.json(
-        { success: false, message: "OTP tidak valid" },
-        { status: 400 }
-      );
-    }
-
-    // Cek apakah username sudah dipakai
-    const existingUser = await prisma.user.findUnique({
-      where: { username },
-    });
-
-    if (existingUser) {
-      return NextResponse.json(
-        { success: false, message: "Username sudah digunakan" },
-        { status: 400 }
-      );
-    }
-
-    // Buat user baru
-    const newUser = await prisma.user.create({
-      data: {
-        username,
-        nomor,
-        roleId: roleId || "1", // Default role
-        isActive: false, // Menunggu approval
-      },
-    });
-
-    // Nonaktifkan OTP
-    await prisma.kodeOtp.update({
-      where: { id: kodeId },
-      data: { isActive: false },
-    });
-
-    // ✅ CREATE SESSION (JWT + Database)
-    try {
-      await sessionCreate({
-        sessionKey: process.env.BASE_SESSION_KEY!,
-        jwtSecret: process.env.BASE_TOKEN_KEY!,
-        exp: "30 day",
-        user: {
-          id: newUser.id,
-          nomor: newUser.nomor,
-          username: newUser.username,
-          roleId: newUser.roleId,
-          isActive: false, // User baru belum aktif
-        },
-      });
-    } catch (sessionError) {
-      console.error("❌ Error creating session:", sessionError);
-      return NextResponse.json(
-        { success: false, message: "Gagal membuat session" },
-        { status: 500 }
-      );
-    }
-
-    return NextResponse.json({
-      success: true,
-      message: "Registrasi berhasil. Menunggu persetujuan admin.",
-      user: {
-        id: newUser.id,
-        name: newUser.username,
-        roleId: newUser.roleId,
-        isActive: false,
-      },
-    });
-
-  } catch (error) {
-    console.error("❌ Finalize Registration Error:", error);
-    return NextResponse.json(
-      { success: false, message: "Registrasi gagal" },
-      { status: 500 }
-    );
-  } finally {
-    await prisma.$disconnect();
-  }
-}

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

@@ -1,41 +0,0 @@
-// src/app/api/auth/me/route.ts
-import { NextResponse } from 'next/server';
-import { verifySession } from '../_lib/session_verify';
-import prisma from '@/lib/prisma';
-
-export async function GET() {
-  try {
-    const user = await verifySession();
-    if (!user) {
-      return NextResponse.json(
-        { success: false, message: "Session tidak valid", user: null },
-        { status: 401 }
-      );
-    }
-
-    // ✅ Ambil menu akses kustom
-    const menuAccess = await prisma.userMenuAccess.findMany({
-      where: { userId: user.id },
-      select: { menuId: true },
-    });
-
-    return NextResponse.json({
-      success: true,
-      user: {
-        id: user.id,
-        name: user.username,
-        username: user.username,
-        nomor: user.nomor,
-        roleId: user.roleId,
-        isActive: user.isActive,
-        menuIds: menuAccess.map(m => m.menuId), // ✅ tambahkan ini
-      },
-    });
-  } catch (error) {
-    console.error("❌ Error in /api/auth/me:", error);
-    return NextResponse.json(
-      { success: false, message: "Terjadi kesalahan", user: null },
-      { status: 500 }
-    );
-  }
-}

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

@@ -1,71 +0,0 @@
-import prisma from "@/lib/prisma";
-import { randomOTP } from "../_lib/randomOTP";
-import { NextResponse } from "next/server";
-
-export async function POST(req: Request) {
-  if (req.method !== "POST") {
-    return NextResponse.json(
-      { success: false, message: "Method Not Allowed" },
-      { status: 405 }
-    );
-  }
-
-  try {
-    const codeOtp = randomOTP();
-    const body = await req.json();
-    const { nomor } = body;
-
-    const res = await fetch(
-      `https://wa.wibudev.com/code?nom=${nomor}&text=HIPMI - Kode ini bersifat RAHASIA dan JANGAN DI BAGIKAN KEPADA SIAPAPUN, termasuk anggota ataupun pengurus HIPMI lainnya.
-      \n
-      >> Kode OTP anda: ${codeOtp}.
-      `
-    );
-
-    const sendWa = await res.json();
-    if (sendWa.status !== "success")
-      return NextResponse.json(
-        {
-          success: false,
-          message: "Nomor Whatsapp Tidak Aktif",
-        },
-        { status: 400 }
-      );
-
-    const createOtpId = await prisma.kodeOtp.create({
-      data: {
-        nomor: nomor,
-        otp: codeOtp,
-      },
-    });
-
-    if (!createOtpId)
-      return NextResponse.json(
-        {
-          success: false,
-          message: "Gagal Membuat Kode OTP",
-        },
-        { status: 400 }
-      );
-
-    return NextResponse.json(
-      {
-        success: true,
-        message: "Kode Verifikasi Dikirim",
-        kodeId: createOtpId.id,
-      },
-      { status: 200 }
-    );
-  } catch (error) {
-    console.error(" Error Resend OTP", error);
-    return NextResponse.json(
-      {
-        success: false,
-        message: "Server Whatsapp Error !!",
-      },
-      { status: 500 }
-    );
-  } finally {
-    await prisma.$disconnect();
-  }
-}

src/app/api/auth/verify-otp/route.ts

@@ -1,126 +0,0 @@
-// app/api/auth/verify-otp/route.ts
-import prisma from "@/lib/prisma";
-import { NextResponse } from "next/server";
-import { sessionCreate } from "../_lib/session_create";
-
-export async function POST(req: Request) {
-  try {
-    const { nomor, otp, kodeId } = await req.json();
-
-    // Validasi input
-    if (!nomor || !otp || !kodeId) {
-      return NextResponse.json(
-        { success: false, message: "Data tidak lengkap" },
-        { status: 400 }
-      );
-    }
-
-    // Cari OTP record
-    const otpRecord = await prisma.kodeOtp.findUnique({
-      where: { id: kodeId },
-    });
-
-    if (!otpRecord) {
-      return NextResponse.json(
-        { success: false, message: "Kode verifikasi tidak valid" },
-        { status: 400 }
-      );
-    }
-
-    if (!otpRecord.isActive) {
-      return NextResponse.json(
-        { success: false, message: "Kode verifikasi sudah digunakan" },
-        { status: 400 }
-      );
-    }
-
-    // Validasi OTP
-    const receivedOtp = Number(otp);
-    if (isNaN(receivedOtp) || otpRecord.otp !== receivedOtp) {
-      return NextResponse.json(
-        { success: false, message: "Kode OTP salah" },
-        { status: 400 }
-      );
-    }
-
-    if (otpRecord.nomor !== nomor) {
-      return NextResponse.json(
-        { success: false, message: "Nomor tidak sesuai" },
-        { status: 400 }
-      );
-    }
-
-    // Cek user berdasarkan nomor
-    const user = await prisma.user.findUnique({
-      where: { nomor },
-      select: {
-        id: true,
-        nomor: true,
-        username: true,
-        roleId: true,
-        isActive: true,
-      },
-    });
-
-    if (!user) {
-      return NextResponse.json(
-        { success: false, message: "Akun tidak ditemukan" },
-        { status: 404 }
-      );
-    }
-
-    // ✅ CREATE SESSION (JWT + Database)
-    try {
-      await sessionCreate({
-        sessionKey: process.env.BASE_SESSION_KEY!,
-        jwtSecret: process.env.BASE_TOKEN_KEY!,
-        exp: "30 day",
-        user: {
-          id: user.id,
-          nomor: user.nomor,
-          username: user.username,
-          roleId: user.roleId,
-          isActive: user.isActive,
-        },
-      });
-    } catch (sessionError) {
-      console.error("❌ Error creating session:", sessionError);
-      return NextResponse.json(
-        { success: false, message: "Gagal membuat session" },
-        { status: 500 }
-      );
-    }
-
-    // Nonaktifkan OTP
-    await prisma.kodeOtp.update({
-      where: { id: kodeId },
-      data: { isActive: false },
-    });
-
-    // Update lastLogin
-    await prisma.user.update({
-      where: { id: user.id },
-      data: { lastLogin: new Date() },
-    });
-
-    return NextResponse.json({
-      success: true,
-      message: user.isActive ? "Berhasil login" : "Menunggu persetujuan",
-      user: {
-        id: user.id,
-        name: user.username,
-        roleId: user.roleId,
-        isActive: user.isActive,
-      },
-    });
-
-  } catch (error) {
-    console.error("❌ Verify OTP Error:", error);
-    return NextResponse.json(
-      { success: false, message: "Terjadi kesalahan saat verifikasi" },
-      { status: 500 }
-    );
-  } finally {
-    await prisma.$disconnect();
-  }
-}

src/app/darmasaba/(pages)/ppid/indeks-kepuasan-masyarakat/page.tsx

@@ -41,7 +41,7 @@ const state = useProxy(indeksKepuasanState.responden);
     indeksKepuasanState.jenisKelaminResponden.findMany.load()
     indeksKepuasanState.pilihanRatingResponden.findMany.load()
     indeksKepuasanState.kelompokUmurResponden.findMany.load()
-  })
+  },[])
 
   const handleSubmit = async () => {
     try {

src/app/darmasaba/_com/main-page/kepuasan/index.tsx

@@ -41,7 +41,7 @@ function Kepuasan() {
     indeksKepuasanState.jenisKelaminResponden.findMany.load()
     indeksKepuasanState.pilihanRatingResponden.findMany.load()
     indeksKepuasanState.kelompokUmurResponden.findMany.load()
-  })
+  },[])
 
   const handleSubmit = async () => {
     try {

src/app/darmasaba/_com/main-page/landing-page/index.tsx

@@ -59,6 +59,35 @@ const getWorkStatus = (day: string, currentTime: string): { status: string; mess
     : { status: "Tutup", message: "08:00 - 17:00" };
 };
 
+// Skeleton component untuk Social Media
+const SosmedSkeleton = () => (
+  <Flex gap="md" justify="center" wrap="wrap">
+    {[1, 2, 3, 4].map((i) => (
+      <Skeleton key={i} height={56} width={56} circle />
+    ))}
+  </Flex>
+);
+
+// Skeleton component untuk Profile
+const ProfileSkeleton = () => (
+  <Card
+    radius="xl"
+    bg={colors.grey[1]}
+    p="lg"
+    shadow="xl"
+    w={{ base: "100%", md: "35%" }}
+    style={{ height: "fit-content" }}
+  >
+    <Stack gap="lg" align="center">
+      <Skeleton height={300} width="100%" radius="lg" />
+      <Stack gap="xs" w="100%" align="center">
+        <Skeleton height={20} width="60%" />
+        <Skeleton height={32} width="80%" />
+      </Stack>
+    </Stack>
+  </Card>
+);
+
 function LandingPage() {
   const [socialMedia, setSocialMedia] = useState<
     Prisma.MediaSosialGetPayload<{ include: { image: true } }>[]
@@ -66,9 +95,8 @@ function LandingPage() {
   const [profile, setProfile] = useState<
     Prisma.PejabatDesaGetPayload<{ include: { image: true } }> | null
   >(null);
-  const [isLoading, setIsLoading] = useState(true);
-
-  
+  const [isLoadingSosmed, setIsLoadingSosmed] = useState(true);
+  const [isLoadingProfile, setIsLoadingProfile] = useState(true);
 
   useEffect(() => {
     const fetchSocialMedia = async () => {
@@ -86,7 +114,7 @@ function LandingPage() {
       } catch {
         setSocialMedia([]);
       } finally {
-        setIsLoading(false);
+        setIsLoadingSosmed(false);
       }
     };
 
@@ -98,6 +126,8 @@ function LandingPage() {
         setProfile(result.data || null);
       } catch {
         setProfile(null);
+      } finally {
+        setIsLoadingProfile(false);
       }
     };
 
@@ -189,8 +219,8 @@ function LandingPage() {
 
               <ModuleView />
 
-              {isLoading ? (
-                <Skeleton height={32} width="100%" />
+              {isLoadingSosmed ? (
+                <SosmedSkeleton />
               ) : socialMedia.length > 0 ? (
                 <SosmedView data={socialMedia} />
               ) : (
@@ -207,19 +237,27 @@ function LandingPage() {
           </Card>
         </Stack>
 
-        {isLoading ? (
-          <Skeleton height={300} width="100%" radius="lg" />
+        {isLoadingProfile ? (
+          <ProfileSkeleton />
         ) : profile ? (
           <ProfileView data={profile} />
         ) : (
-          <Center w="100%">
-            <Text c="dimmed">Informasi profil belum tersedia</Text>
-          </Center>
+          <Card
+            radius="xl"
+            bg={colors.grey[1]}
+            p="lg"
+            shadow="xl"
+            w={{ base: "100%", md: "35%" }}
+            style={{ height: "fit-content" }}
+          >
+            <Center h={300}>
+              <Text c="dimmed">Informasi profil belum tersedia</Text>
+            </Center>
+          </Card>
         )}
       </Flex>
-      
     </Stack>
   );
 }
 
-export default LandingPage;
+export default LandingPage;

src/app/darmasaba/page.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import DesaAntiKorupsi from "@/app/darmasaba/_com/main-page/desaantikorupsi";
 import Kepuasan from "@/app/darmasaba/_com/main-page/kepuasan";
@@ -13,32 +14,34 @@ import Apbdes from "./_com/main-page/apbdes";
 import Prestasi from "./_com/main-page/prestasi";
 import ScrollToTopButton from "./_com/scrollToTopButton";
 
-import NewsReaderLanding from "./_com/NewsReaderalanding";
-import ModernNewsNotification from "./_com/ModernNeewsNotification";
-import { useMemo } from "react";
-import { useProxy } from "valtio/utils";
+import { useEffect, useMemo } from "react";
+import { useSnapshot } from "valtio";
 import stateDashboardBerita from "../admin/(dashboard)/_state/desa/berita";
 import stateDesaPengumuman from "../admin/(dashboard)/_state/desa/pengumuman";
-import { useEffect } from "react";
+import ModernNewsNotification from "./_com/ModernNeewsNotification";
+import NewsReaderLanding from "./_com/NewsReaderalanding";
 
 
 export default function Page() {
-  const featured = useProxy(stateDashboardBerita.berita.findFirst);
+  const snap1 = useSnapshot(stateDashboardBerita.berita.findFirst);
+  const snap2 = useSnapshot(stateDesaPengumuman.pengumuman.findFirst);
+
+  const featured = snap1;
+  const pengumuman = snap2;
   const loadingFeatured = featured.loading;
-  const pengumuman = useProxy(stateDesaPengumuman.pengumuman.findFirst);
   const loadingPengumuman = pengumuman.loading;
 
   useEffect(() => {
     if (!featured.data && !loadingFeatured) {
       stateDashboardBerita.berita.findFirst.load();
     }
-  }, [featured.data, loadingFeatured]);
+  }, []);
 
   useEffect(() => {
     if (!pengumuman.data && !loadingPengumuman) {
       stateDesaPengumuman.pengumuman.findFirst.load();
     }
-  }, [pengumuman.data, loadingPengumuman]);
+  }, []);
 
 
   const newsData = useMemo(() => {

src/app/waiting-room/page.tsx

@@ -2,73 +2,173 @@
 'use client';
 
 import colors from '@/con/colors';
-import { Center, Loader, Paper, Stack, Text, Title } from '@mantine/core';
+import {
+  Button,
+  Center,
+  Loader,
+  Paper,
+  Stack,
+  Text,
+  Title,
+} from '@mantine/core';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
+import { authStore } from '@/store/authStore'; // ✅ integrasi authStore
 
-// Ganti ini jika tidak pakai next-auth
 async function fetchUser() {
-  const res = await fetch('/api/auth/me');
-  if (!res.ok) throw new Error('Unauthorized');
+  const res = await fetch('/api/me');
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(`HTTP ${res.status}: ${text}`);
+  }
   return res.json();
 }
 
 export default function WaitingRoom() {
   const router = useRouter();
   const [user, setUser] = useState<any>(null);
-  // const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  const [isRedirecting, setIsRedirecting] = useState(false);
+  const [retryCount, setRetryCount] = useState(0);
+  const MAX_RETRIES = 2;
 
+  useEffect(() => {
+    let isMounted = true;
+    let interval: ReturnType<typeof setInterval>;
 
-useEffect(() => {
-  let isMounted = true;
-  const interval = setInterval(async () => {
-    try {
-      const data = await fetchUser();
-      if (!isMounted) return;
+    const poll = async () => {
+      if (isRedirecting || !isMounted) return;
 
-      const currentUser = data.user;
-      setUser(currentUser);
+      try {
+        const data = await fetchUser();
+        if (!isMounted) return;
 
-      // ✅ Sekarang isActive tersedia!
-      if (currentUser?.isActive) {
-        clearInterval(interval);
-        // Redirect ke halaman admin sesuai role
-        if (currentUser.roleId === 0) {
-          router.push('/admin/landing-page/profil/program-inovasi');
+        const currentUser = data.user;
+        setUser(currentUser);
+
+        // ✅ Update authStore
+        if (currentUser) {
+          authStore.setUser({
+            id: currentUser.id,
+            name: currentUser.name,
+            roleId: Number(currentUser.roleId),
+            menuIds: currentUser.menuIds || null,
+          });
+        }
+
+        // In the poll function
+        if (currentUser?.isActive === true) {
+          setIsRedirecting(true);
+          clearInterval(interval);
+
+          // Update authStore with the current user data
+          authStore.setUser({
+            id: currentUser.id,
+            name: currentUser.name || 'User',
+            roleId: Number(currentUser.roleId),
+            menuIds: currentUser.menuIds || null,
+            isActive: true
+          });
+
+          // Clean up storage
+          localStorage.removeItem('auth_kodeId');
+          localStorage.removeItem('auth_nomor');
+          localStorage.removeItem('auth_username');
+
+          // Force a session refresh
+          try {
+            const res = await fetch('/api/refresh-session', {
+              method: 'POST',
+              credentials: 'include'
+            });
+
+            if (res.ok) {
+              // Redirect based on role
+              let redirectPath = '/admin';
+              switch (String(currentUser.roleId)) {
+                case "0": case "1": case "2":
+                  redirectPath = '/admin/landing-page/profil/program-inovasi';
+                  break;
+                case "3":
+                  redirectPath = '/admin/kesehatan/posyandu';
+                  break;
+                case "4":
+                  redirectPath = '/admin/pendidikan/info-sekolah/jenjang-pendidikan';
+                  break;
+              }
+              window.location.href = redirectPath; // Use window.location to force full page reload
+            }
+          } catch (error) {
+            console.error('Error refreshing session:', error);
+            router.refresh(); // Fallback to client-side refresh
+          }
+        }
+      } catch (err: any) {
+        if (!isMounted) return;
+
+        if (err.message.includes('401')) {
+          if (retryCount < MAX_RETRIES) {
+            setRetryCount((prev) => prev + 1);
+            setTimeout(() => {
+              if (isMounted) interval = setInterval(poll, 3000);
+            }, 800);
+          } else {
+            setError('Sesi tidak valid. Silakan login ulang.');
+            clearInterval(interval);
+            authStore.setUser(null); // ✅ clear sesi
+          }
         } else {
-          router.push('/admin'); // atau halaman default role
+          console.error('Error polling:', err);
         }
       }
-    } catch (err: any) {
-      if (!isMounted) return;
-      setError(err.message || 'Gagal memuat status');
-      clearInterval(interval);
-      if (err.message === 'Unauthorized') {
-        router.push('/login');
-      }
-    }
-  }, 2000);
+    };
 
-  return () => {
-    isMounted = false;
-    clearInterval(interval);
-  };
-}, [router]);
+    interval = setInterval(poll, 3000);
+    return () => {
+      isMounted = false;
+      if (interval) clearInterval(interval);
+    };
+  }, [router, isRedirecting, retryCount]);
 
+  // ✅ UI Error
   if (error) {
     return (
       <Center h="100vh">
         <Paper p="xl" radius="md" bg={colors['white-trans-1']} w={400}>
           <Stack align="center" gap="md">
-            <Title order={3} c="red">Error</Title>
+            <Title order={3} c="red">
+              Sesi Tidak Valid
+            </Title>
             <Text>{error}</Text>
+            <Button onClick={() => router.push('/login')}>
+              Login Ulang
+            </Button>
           </Stack>
         </Paper>
       </Center>
     );
   }
 
+  // ✅ UI Redirecting
+  if (isRedirecting) {
+    return (
+      <Center h="100vh" bg={colors.Bg}>
+        <Paper p="xl" radius="md" bg={colors['white-trans-1']} w={{ base: '90%', sm: 400 }}>
+          <Stack align="center" gap="lg">
+            <Title order={2} c={colors['blue-button']} ta="center">
+              Akun Disetujui! ✅
+            </Title>
+            <Text ta="center" c="green">
+              Mengalihkan ke dashboard...
+            </Text>
+            <Loader size="sm" color="green" />
+          </Stack>
+        </Paper>
+      </Center>
+    );
+  }
+
+  // ✅ UI Default (MENUNGGU) — INI YANG KAMU HILANGKAN!
   return (
     <Center h="100vh" bg={colors.Bg}>
       <Paper p="xl" radius="md" bg={colors['white-trans-1']} w={{ base: '90%', sm: 400 }}>
@@ -76,17 +176,13 @@ useEffect(() => {
           <Title order={2} c={colors['blue-button']} ta="center">
             Menunggu Persetujuan
           </Title>
-
           <Text ta="center" c="dimmed">
             Akun Anda sedang dalam proses verifikasi oleh Superadmin.
           </Text>
-
           <Text ta="center" size="sm" c="dimmed">
             Nomor: {user?.nomor || '...'}
           </Text>
-
           <Loader size="sm" color={colors['blue-button']} />
-
           <Text ta="center" size="xs" c="dimmed">
             Jangan tutup halaman ini. Anda akan dialihkan otomatis setelah disetujui.
           </Text>

src/store/authStore.ts

@@ -6,6 +6,7 @@ export type User = {
   name: string;
   roleId: number;
   menuIds?: string[] | null; // ✅ Pastikan pakai `string[]`
+  isActive?: boolean;
 };
 
 export const authStore = proxy<{