fix(users): preserve superadmin roles and enforce actor privilege boundary
This commit is contained in:
1 parent
3321bac22d
commit
ca3d4f6a16
7 files changed
+183
-29
No files matched your search
@@ -4,6 +4,46 @@ import { MemoryRouter } from 'react-router-dom';
|
||||
import { beforeEach,describe,expect,it,vi } from 'vitest';
|
||||
import api from '../services/api';
|
||||
import Users from './Users';
|
||||
import { useAdminAuthStore } from '../store/adminAuthStore';
|
||||
|
||||
vi.mock('../store/adminAuthStore', () => ({ useAdminAuthStore: vi.fn() }));
|
||||
|
||||
describe('Users superadmin editor', () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
vi.mocked(useAdminAuthStore).mockReturnValue('SUPER_ADMIN');
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'owner-fixture', firstName: 'Owner', role: 'SUPER_ADMIN' }], meta: { total: 1 } } });
|
||||
vi.mocked(api.put).mockResolvedValue({ data: { success: true } });
|
||||
});
|
||||
it.each(['SUPER_ADMIN', 'ADMIN', 'Admin', 'User_Vet'])('preserves exact %s role on password-only save', async (role) => {
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'owner-fixture', firstName: 'Owner', role }], meta: { total: 1 } } });
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click((await screen.findAllByTitle('ویرایش مشخصات'))[0]);
|
||||
const select = screen.getAllByRole('combobox')[1];
|
||||
expect(select).toHaveValue(role);
|
||||
expect(screen.getAllByRole('option', { name: /مدیر ارشد/ }).length).toBeGreaterThan(0);
|
||||
fireEvent.change(document.querySelector('input[type="password"]')!, { target: { value: 'Fixture-only-123' } });
|
||||
fireEvent.click(screen.getByRole('button', { name: 'ذخیره تغییرات' }));
|
||||
await waitFor(() => expect(api.put).toHaveBeenCalled());
|
||||
const payload = vi.mocked(api.put).mock.calls[0][1] as Record<string, unknown>;
|
||||
expect(payload).not.toHaveProperty('role');
|
||||
});
|
||||
it('submits explicit superadmin promotion for authorized actor', async () => {
|
||||
vi.mocked(api.get).mockResolvedValue({ data: { data: [{ id: 'ordinary-fixture', role: 'Admin' }], meta: { total: 1 } } });
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click((await screen.findAllByTitle('ویرایش مشخصات'))[0]);
|
||||
fireEvent.change(screen.getAllByRole('combobox')[1], { target: { value: 'SUPER_ADMIN' } });
|
||||
fireEvent.click(screen.getByRole('button', { name: 'ذخیره تغییرات' }));
|
||||
await waitFor(() => expect(api.put).toHaveBeenCalledWith('/admin/users/ordinary-fixture', expect.objectContaining({ role: 'SUPER_ADMIN' })));
|
||||
});
|
||||
it('does not offer superadmin promotion to ordinary admin', async () => {
|
||||
vi.mocked(useAdminAuthStore).mockReturnValue('Admin');
|
||||
render(<MemoryRouter><Users /></MemoryRouter>);
|
||||
fireEvent.click(screen.getByRole('button', { name: 'افزودن کاربر جدید' }));
|
||||
const select = screen.getAllByRole('combobox')[1];
|
||||
expect(select.querySelector('option[value="SUPER_ADMIN"]')).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
vi.mock('../services/api', () => ({
|
||||
default: {
|
||||
|
||||
@@ -17,6 +17,7 @@ import Button from '../components/ui/Button';
|
||||
import Modal from '../components/ui/Modal';
|
||||
import Pagination from '../components/ui/Pagination';
|
||||
import api from '../services/api';
|
||||
import { useAdminAuthStore } from '../store/adminAuthStore';
|
||||
|
||||
|
||||
|
||||
@@ -44,6 +45,8 @@ export interface UserRecord {
|
||||
import { useSearchParams } from 'react-router-dom';
|
||||
|
||||
export default function Users() {
|
||||
const actorRole = useAdminAuthStore(state => state.adminUser?.role);
|
||||
const canManageSuperAdmin = ['superadmin', 'adminsuper'].includes((actorRole || '').toLowerCase().replace(/[_-]/g, ''));
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
const [users, setUsers] = useState<UserRecord[]>([]);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
@@ -266,7 +269,7 @@ export default function Users() {
|
||||
firstName: editFormData.firstName.trim(),
|
||||
lastName: editFormData.lastName.trim(),
|
||||
mobile: editFormData.mobile.trim(),
|
||||
role: editFormData.role,
|
||||
...(editFormData.role !== editUser.role && { role: editFormData.role }),
|
||||
walletBalance: Number(editFormData.walletBalance) || 0,
|
||||
};
|
||||
if (editFormData.email.trim()) payload.email = editFormData.email.trim();
|
||||
@@ -358,6 +361,7 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
<option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>
|
||||
</select>
|
||||
|
||||
<div className="relative w-full sm:w-64">
|
||||
@@ -633,6 +637,7 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده (داروخانه/پتشاپ)</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
{canManageSuperAdmin && <option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -742,6 +747,7 @@ export default function Users() {
|
||||
<label className="block text-gray-700 font-bold mb-1">نقش دسترسی</label>
|
||||
<select
|
||||
value={editFormData.role}
|
||||
disabled={!canManageSuperAdmin && ['superadmin', 'adminsuper'].includes((editUser?.role || '').toLowerCase().replace(/[_-]/g, ''))}
|
||||
onChange={(e) => setEditFormData({ ...editFormData, role: e.target.value })}
|
||||
className="w-full px-3 py-2.5 rounded-xl border border-gray-200 focus:border-purple-500 outline-none font-bold bg-white"
|
||||
>
|
||||
@@ -749,6 +755,10 @@ export default function Users() {
|
||||
<option value="User_Wholesale">خریدار عمده (داروخانه/پتشاپ)</option>
|
||||
<option value="User_B2B">همکار (B2B)</option>
|
||||
<option value="ADMIN">مدیر سیستم (Admin)</option>
|
||||
{canManageSuperAdmin && <option value="SUPER_ADMIN">مدیر ارشد (Super Admin)</option>}
|
||||
{editUser?.role && !['User_PetOwner', 'User_Wholesale', 'User_B2B', 'ADMIN', ...(canManageSuperAdmin ? ['SUPER_ADMIN'] : [])].includes(editUser.role) && (
|
||||
<option value={editUser.role}>{['superadmin', 'adminsuper'].includes(editUser.role.toLowerCase().replace(/[_-]/g, '')) ? 'مدیر ارشد (Super Admin)' : editUser.role}</option>
|
||||
)}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in new issue
Block a user