From 9d00c64d3babcd3c3a410a2112f481ebcb8e5be6 Mon Sep 17 00:00:00 2001 From: Hieppham-190305 Date: Mon, 2 Nov 2026 21:42:22 +0700 Subject: [PATCH 1/7] [KAN-67] feat(rbac): define web permissions and route access matrix --- src/services/accessControl.ts | 64 +++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 src/services/accessControl.ts diff --git a/src/services/accessControl.ts b/src/services/accessControl.ts new file mode 100644 index 0000000..ca1b570 --- /dev/null +++ b/src/services/accessControl.ts @@ -0,0 +1,64 @@ +import type { StaffRole } from './authService'; + +// Keep these names aligned with Cruise-api RolePermissions (KAN-67). +export const PERMISSIONS = [ + 'USERS_MANAGE', 'SECURITY_AUDIT_READ', 'TERMINALS_MANAGE', + 'ITINERARY_READ', 'ITINERARY_MANAGE', 'ACTIVITIES_READ', 'ACTIVITIES_MANAGE', + 'EXCURSIONS_READ', 'EXCURSIONS_MANAGE', 'PASSENGERS_READ', 'PASSENGERS_MANAGE', + 'POS_READ', 'POS_OPERATE', 'FINANCE_MANAGE', 'REPORTS_READ', 'OPERATIONS_MANAGE', 'CATALOG_READ', +] as const; +export type Permission = typeof PERMISSIONS[number]; + +const grants: Record = { + SYSTEM_ADMIN: PERMISSIONS, + OPERATIONS_MANAGER: PERMISSIONS.filter(p => !['USERS_MANAGE', 'SECURITY_AUDIT_READ', 'TERMINALS_MANAGE'].includes(p)), + ITINERARY_COORDINATOR: ['ITINERARY_READ', 'ITINERARY_MANAGE', 'CATALOG_READ'], + ACTIVITY_MANAGER: ['ITINERARY_READ', 'ACTIVITIES_READ', 'ACTIVITIES_MANAGE', 'PASSENGERS_READ', 'CATALOG_READ'], + SHORE_EXCURSION_MANAGER: ['ITINERARY_READ', 'EXCURSIONS_READ', 'EXCURSIONS_MANAGE', 'PASSENGERS_READ', 'CATALOG_READ'], + POS_STAFF: ['ITINERARY_READ', 'POS_READ', 'POS_OPERATE', 'PASSENGERS_READ'], + FINANCE_FRONT_DESK: ['ITINERARY_READ', 'POS_READ', 'FINANCE_MANAGE', 'REPORTS_READ', 'PASSENGERS_READ', 'PASSENGERS_MANAGE'], + PASSENGER: ['ITINERARY_READ', 'CATALOG_READ'], +}; + +export function isKnownRole(role: unknown): role is StaffRole { + return typeof role === 'string' && Object.hasOwn(grants, role); +} + +export function hasPermission(role: unknown, permission: Permission): boolean { + return isKnownRole(role) && grants[role].includes(permission); +} + +export function homeForRole(role: unknown): string { + switch (role) { + case 'SYSTEM_ADMIN': case 'OPERATIONS_MANAGER': return '/'; + case 'ITINERARY_COORDINATOR': return '/itinerary'; + case 'ACTIVITY_MANAGER': return '/activities'; + case 'SHORE_EXCURSION_MANAGER': return '/excursions'; + case 'POS_STAFF': return '/pos'; + case 'FINANCE_FRONT_DESK': return '/billing/settlement'; + default: return '/login'; + } +} + +const routeRules: [RegExp, Permission][] = [ + [/^\/$/, 'OPERATIONS_MANAGE'], + [/^\/users(?:\/|$)/, 'USERS_MANAGE'], + [/^\/(?:ships|itinerary)(?:\/|$)/, 'ITINERARY_MANAGE'], + [/^\/admin\/cruise-area-policies(?:\/|$)/, 'ITINERARY_MANAGE'], + [/^\/voyage(?:\/|$)/, 'OPERATIONS_MANAGE'], + [/^\/(?:excursions|excursion-attendance|excursion-dispatcher|excursion-analytics)(?:\/|$)/, 'EXCURSIONS_MANAGE'], + [/^\/(?:activities|activity-attendance|activity-roster)(?:\/|$)/, 'ACTIVITIES_MANAGE'], + [/^\/pos(?:\/|$)/, 'POS_OPERATE'], + [/^\/passengers(?:\/|$)/, 'PASSENGERS_READ'], + [/^\/embarkation(?:\/|$)/, 'PASSENGERS_MANAGE'], + [/^\/(?:billing\/settlement|provider-settlement)(?:\/|$)/, 'FINANCE_MANAGE'], + [/^\/reports\/operational(?:\/|$)/, 'REPORTS_READ'], +]; + +/** UI convenience only: the backend verifies every request independently. */ +export function canAccessPath(role: unknown, path: string): boolean { + if (!isKnownRole(role) || role === 'PASSENGER') return false; + if (path === '/forbidden') return true; + const permission = routeRules.find(([pattern]) => pattern.test(path))?.[1]; + return permission !== undefined && hasPermission(role, permission); +} From a0ee3e58ad5a4cae9a3c7de7c6304fded00a0b55 Mon Sep 17 00:00:00 2001 From: Hieppham-190305 Date: Mon, 2 Nov 2026 21:52:08 +0700 Subject: [PATCH 2/7] [KAN-69] feat(rbac): guard staff screens and authenticate API requests --- src/App.test.tsx | 7 +++---- src/App.tsx | 5 +++++ src/components/auth/RouteAccessGuard.tsx | 10 ++++++++++ src/components/ui/CommandPaletteModal.tsx | 10 +++++++--- src/components/ui/ReactiveUiSuite.test.tsx | 2 ++ src/layouts/MainLayout.test.tsx | 2 ++ src/layouts/MainLayout.tsx | 17 +++++++---------- src/layouts/MainLayoutRoles.test.tsx | 5 +++-- src/pages/ForbiddenPage.tsx | 16 ++++++++++++++++ src/pages/PassengersPage.test.tsx | 6 +++++- src/pages/PassengersPage.tsx | 9 +++++++++ src/services/api.ts | 10 +++++++++- src/services/authService.ts | 19 ++++++++++--------- vite.config.ts | 14 ++++++++++++++ 14 files changed, 102 insertions(+), 30 deletions(-) create mode 100644 src/components/auth/RouteAccessGuard.tsx create mode 100644 src/pages/ForbiddenPage.tsx diff --git a/src/App.test.tsx b/src/App.test.tsx index 72a27ba..df66724 100644 --- a/src/App.test.tsx +++ b/src/App.test.tsx @@ -132,7 +132,7 @@ describe('App Routing Integration Tests', () => { }); }); - it('renders NotFoundPage when navigating to an unknown route', async () => { + it('denies an unclassified protected route', async () => { render( @@ -140,9 +140,8 @@ describe('App Routing Integration Tests', () => { ); await waitFor(() => { - expect(screen.getByRole('heading', { level: 2, name: '404' })).toBeInTheDocument(); - expect(screen.getByText('Trang không tồn tại')).toBeInTheDocument(); - expect(screen.getByRole('link', { name: /Về Trang Chủ/i })).toHaveAttribute('href', '/'); + expect(screen.getByRole('heading', { name: 'Bạn không có quyền truy cập' })).toBeInTheDocument(); + expect(screen.getByRole('link', { name: 'Về trang làm việc' })).toHaveAttribute('href', '/'); }); }); diff --git a/src/App.tsx b/src/App.tsx index 92d738a..6c1378e 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -3,6 +3,8 @@ import { MainLayout } from './layouts/MainLayout'; import { PassengerLayout } from './layouts/PassengerLayout'; import { AdminAuthGuard } from './components/auth/AdminAuthGuard'; import { RoleGuard } from './components/auth/RoleGuard'; +import { RouteAccessGuard } from './components/auth/RouteAccessGuard'; +import { ForbiddenPage } from './pages/ForbiddenPage'; import { LoginPage } from './pages/LoginPage'; import { DashboardPage } from './pages/DashboardPage'; import { ActivitiesPage } from './pages/ActivitiesPage'; @@ -68,7 +70,9 @@ export function App() { {/* Protected Maritime Operations & Administrative Fleet Console */} }> + }> }> + } /> } /> } /> } /> @@ -101,6 +105,7 @@ export function App() { } /> } /> + ); diff --git a/src/components/auth/RouteAccessGuard.tsx b/src/components/auth/RouteAccessGuard.tsx new file mode 100644 index 0000000..5128b61 --- /dev/null +++ b/src/components/auth/RouteAccessGuard.tsx @@ -0,0 +1,10 @@ +import { Navigate, Outlet, useLocation } from 'react-router-dom'; +import { authService } from '../../services/authService'; +import { canAccessPath, homeForRole } from '../../services/accessControl'; + +export function RouteAccessGuard() { + const { pathname } = useLocation(); + const role = authService.getCurrentUser()?.role; + if (canAccessPath(role, pathname)) return ; + return ; +} diff --git a/src/components/ui/CommandPaletteModal.tsx b/src/components/ui/CommandPaletteModal.tsx index 377f665..ddec7e3 100644 --- a/src/components/ui/CommandPaletteModal.tsx +++ b/src/components/ui/CommandPaletteModal.tsx @@ -1,6 +1,8 @@ import React, { useEffect, useState, useMemo, useRef } from 'react'; import { useNavigate } from 'react-router-dom'; import { useFocusTrap } from '../../hooks/useFocusTrap'; +import { authService } from '../../services/authService'; +import { canAccessPath } from '../../services/accessControl'; import { Search, Compass, @@ -143,16 +145,18 @@ export const CommandPaletteModal: React.FC = ({ useFocusTrap(isOpen, modalRef, onClose); + const role = authService.getCurrentUser()?.role; const filteredItems = useMemo(() => { const q = query.trim().toLowerCase(); - if (!q) return ADMIN_COMMAND_ITEMS; - return ADMIN_COMMAND_ITEMS.filter( + const permitted = ADMIN_COMMAND_ITEMS.filter(item => canAccessPath(role, item.to)); + if (!q) return permitted; + return permitted.filter( (item) => item.label.toLowerCase().includes(q) || item.subtitle.toLowerCase().includes(q) || item.category.toLowerCase().includes(q) ); - }, [query]); + }, [query, role]); useEffect(() => { setActiveIndex(0); diff --git a/src/components/ui/ReactiveUiSuite.test.tsx b/src/components/ui/ReactiveUiSuite.test.tsx index 6c1f014..c613f03 100644 --- a/src/components/ui/ReactiveUiSuite.test.tsx +++ b/src/components/ui/ReactiveUiSuite.test.tsx @@ -7,6 +7,7 @@ import { ShinyText, DecryptedText } from './ShinyText'; import { Magnet } from './Magnet'; import { MaritimeGlobe3D } from './MaritimeGlobe3D'; import { CommandPaletteModal } from './CommandPaletteModal'; +import { authService } from '../../services/authService'; describe('React Bits, Three.js & UI/UX Pro Max Suite', () => { it('renders SpotlightCard and tracks cursor hover state', () => { @@ -68,6 +69,7 @@ describe('React Bits, Three.js & UI/UX Pro Max Suite', () => { }); it('renders CommandPaletteModal, filters modules and closes on Escape', () => { + authService.setSession('domain-test-admin', { id: 1, username: 'admin', fullName: 'Test Admin', role: 'SYSTEM_ADMIN' }); const onClose = vi.fn(); render( diff --git a/src/layouts/MainLayout.test.tsx b/src/layouts/MainLayout.test.tsx index a4d93f9..42920fb 100644 --- a/src/layouts/MainLayout.test.tsx +++ b/src/layouts/MainLayout.test.tsx @@ -4,6 +4,7 @@ import userEvent from '@testing-library/user-event'; import { MemoryRouter } from 'react-router-dom'; import { MainLayout } from './MainLayout'; import * as apiModule from '../services/api'; +import { authService } from '../services/authService'; vi.mock('../services/api', () => ({ checkBackendHealth: vi.fn(), @@ -13,6 +14,7 @@ vi.mock('../services/api', () => ({ describe('MainLayout (Layout & Async State Tests)', () => { beforeEach(() => { vi.clearAllMocks(); + authService.setSession('domain-test-admin', { id: 1, username: 'admin', fullName: 'Test Admin', role: 'SYSTEM_ADMIN' }); }); afterEach(() => { diff --git a/src/layouts/MainLayout.tsx b/src/layouts/MainLayout.tsx index 8171df1..4243cb9 100644 --- a/src/layouts/MainLayout.tsx +++ b/src/layouts/MainLayout.tsx @@ -21,6 +21,7 @@ import { import { checkBackendHealth, getBackendInfo } from '../services/api'; import type { SystemHealth, SystemInfo } from '../services/api'; import { authService } from '../services/authService'; +import { canAccessPath } from '../services/accessControl'; import { CommandPaletteModal } from '../components/ui/CommandPaletteModal'; import { SpotlightCard } from '../components/ui/SpotlightCard'; @@ -32,10 +33,10 @@ export function MainLayout() { const [isCommandOpen, setIsCommandOpen] = useState(false); const currentUser = authService.getCurrentUser() || { - id: 1, - username: 'admin', - fullName: 'Huy Trần Gia', - role: 'SYSTEM_ADMIN' as const, + id: '', + username: '', + fullName: 'Chưa đăng nhập', + role: 'PASSENGER' as const, }; const fetchStatus = async () => { @@ -73,7 +74,6 @@ export function MainLayout() { label: string; icon: typeof Compass; code: string; - roles?: string[]; }[] = [ { to: '/', label: 'Dashboard Tổng quan', icon: Compass, code: '01' }, { to: '/ships', label: 'Quản lý Đội tàu', icon: Ship, code: '02' }, @@ -88,14 +88,11 @@ export function MainLayout() { { to: '/embarkation', label: 'Cảng Đón Khách (Terminal)', icon: Ship, code: '11' }, { to: '/billing/settlement', label: 'Tất toán & Hoá đơn', icon: Receipt, code: '12' }, { to: '/reports/operational', label: 'Báo Cáo Doanh Thu (Audit)', icon: Receipt, code: '13' }, - { to: '/users', label: 'Quản lý Người dùng', icon: Users, code: '14', roles: ['SYSTEM_ADMIN'] }, + { to: '/users', label: 'Quản lý Người dùng', icon: Users, code: '14' }, ]; - // Mục có khai báo `roles` chỉ hiện cho tài khoản thuộc các vai trò đó const sessionRole = authService.getCurrentUser()?.role; - const navItems = allNavItems.filter( - (item) => !item.roles || (sessionRole !== undefined && item.roles.includes(sessionRole)) - ); + const navItems = allNavItems.filter(item => canAccessPath(sessionRole, item.to)); return (
{ async (role) => { signInAs(role); renderLayout(); - expect(await screen.findByText('Quản lý Đội tàu')).toBeInTheDocument(); + expect(await screen.findByText('CRUISE MANAGER')).toBeInTheDocument(); expect(screen.queryByText('Quản lý Người dùng')).not.toBeInTheDocument(); } ); @@ -53,7 +53,8 @@ describe('MainLayout role-based menu', () => { it('hides the menu when there is no signed-in user', async () => { signInAs(null); renderLayout(); - expect(await screen.findByText('Quản lý Đội tàu')).toBeInTheDocument(); + expect(await screen.findByText('CRUISE MANAGER')).toBeInTheDocument(); + expect(screen.queryByText('Quản lý Đội tàu')).not.toBeInTheDocument(); expect(screen.queryByText('Quản lý Người dùng')).not.toBeInTheDocument(); }); }); diff --git a/src/pages/ForbiddenPage.tsx b/src/pages/ForbiddenPage.tsx new file mode 100644 index 0000000..bbd238c --- /dev/null +++ b/src/pages/ForbiddenPage.tsx @@ -0,0 +1,16 @@ +import { Link } from 'react-router-dom'; +import { authService } from '../services/authService'; +import { homeForRole } from '../services/accessControl'; + +export function ForbiddenPage() { + return ( +
+

403

+

Bạn không có quyền truy cập

+

Vai trò của bạn không được phép mở chức năng này. Liên hệ quản trị viên nếu cần thay đổi quyền.

+ + Về trang làm việc + +
+ ); +} diff --git a/src/pages/PassengersPage.test.tsx b/src/pages/PassengersPage.test.tsx index 6445367..4f22589 100644 --- a/src/pages/PassengersPage.test.tsx +++ b/src/pages/PassengersPage.test.tsx @@ -1,9 +1,13 @@ -import { describe, it, expect, vi } from 'vitest'; +import { describe, it, expect, vi, beforeEach } from 'vitest'; import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { PassengersPage } from './PassengersPage'; +import { authService } from '../services/authService'; describe('PassengersPage (Component & User Interaction Tests)', () => { + beforeEach(() => { + authService.setSession('domain-test-admin', { id: 1, username: 'admin', fullName: 'Test Admin', role: 'SYSTEM_ADMIN' }); + }); it('renders passenger table header and all initial passengers', () => { render(); diff --git a/src/pages/PassengersPage.tsx b/src/pages/PassengersPage.tsx index 9e012b8..977d657 100644 --- a/src/pages/PassengersPage.tsx +++ b/src/pages/PassengersPage.tsx @@ -25,8 +25,11 @@ import { } from '../services/passengerService'; import { getTours, INITIAL_TOURS, type CruiseTour } from '../services/tourService'; import { RegisterPassengerModal } from '../components/passengers/RegisterPassengerModal'; +import { authService } from '../services/authService'; +import { hasPermission } from '../services/accessControl'; export function PassengersPage() { + const canManage = hasPermission(authService.getCurrentUser()?.role, 'PASSENGERS_MANAGE'); const [tours, setTours] = useState(INITIAL_TOURS); const [selectedTourId, setSelectedTourId] = useState(1); const [searchTerm, setSearchTerm] = useState(''); @@ -120,6 +123,7 @@ export function PassengersPage() { }; const handleCheckInToggle = async (passenger: Passenger) => { + if (!canManage) return; const nextStatus = passenger.checkInStatus === 'BOARDED' ? 'NOT_CHECKED_IN' : 'BOARDED'; try { await updateCheckInStatus(passenger.id, nextStatus); @@ -131,6 +135,7 @@ export function PassengersPage() { }; const handleRegistrationStatusChange = async (passengerId: number, status: RegistrationStatus) => { + if (!canManage) return; try { await updateRegistrationStatus(passengerId, status); showToast('Đã cập nhật trạng thái đăng ký thành công!'); @@ -141,6 +146,7 @@ export function PassengersPage() { }; const handleRegisterSuccess = async (payload: RegisterPassengerPayload) => { + if (!canManage) return; await registerPassenger(payload); showToast(`Đã đăng ký thành công cho hành khách ${payload.fullName}!`); void loadPassengers(); @@ -202,6 +208,7 @@ export function PassengersPage() {