Fix Kondisi Verify Otp Registrasi dan Login
Next mau fix eror saat user sudah terdaftar tetapi di redirect ke login, seharusnya redirect sesuai roleIdnya
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
// 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';
|
||||
|
||||
export function getNavbar({
|
||||
roleId,
|
||||
@@ -14,9 +14,10 @@ export function getNavbar({
|
||||
}
|
||||
|
||||
// Fallback ke role-based
|
||||
if (roleId === 0) return navBar;
|
||||
if (roleId === 1) return role1;
|
||||
if (roleId === 2) return role2;
|
||||
if (roleId === 3) return role3;
|
||||
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 [];
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user