diff --git a/backend/src/admin/admin-users-list.spec.ts b/backend/src/admin/admin-users-list.spec.ts new file mode 100644 index 00000000..3e1f58d6 --- /dev/null +++ b/backend/src/admin/admin-users-list.spec.ts @@ -0,0 +1,72 @@ +import { Test } from "@nestjs/testing"; +import { ExecutionContext } from "@nestjs/common"; +import { firstValueFrom, of } from "rxjs"; +import { AdminService } from "./admin.service"; +import { AdminController } from "./admin.controller"; +import { PrismaService } from "../prisma/prisma.service"; +import { RedisService } from "../redis/redis.service"; +import { RevalidationService } from "../common/revalidation/revalidation.service"; +import { DecimalInterceptor } from "../common/interceptors/decimal.interceptor"; +import { Prisma } from "@prisma/client"; + +describe("admin users list contract", () => { + const prisma = { user: { findMany: jest.fn(), count: jest.fn() } }; + let service: AdminService; + + beforeEach(async () => { + jest.clearAllMocks(); + const module = await Test.createTestingModule({ + providers: [ + AdminService, + { provide: PrismaService, useValue: prisma }, + { provide: RedisService, useValue: {} }, + { provide: RevalidationService, useValue: {} }, + ], + }).compile(); + service = module.get(AdminService); + }); + + it("returns only allowlisted list fields with aggregates through the controller and decimal interceptor", async () => { + // Deliberately return extra fields even if the query selects safely. + prisma.user.findMany.mockResolvedValue([{ + id: "fixture-user", firstName: "Fixture", lastName: "User", + mobile: "fixture-mobile", email: null, role: "ADMIN", + walletBalance: new Prisma.Decimal(0), charityDonationTotal: new Prisma.Decimal(12), + createdAt: new Date("2026-01-01T00:00:00Z"), + password: "test-only-password-hash", passwordHash: "test-only-hash", + refreshToken: "test-only-token", futureSecret: "must-not-leak", + walletTransactions: [{ transactionReference: "private-reference" }], + addresses: [], orders: [{ totalAmount: new Prisma.Decimal(100) }, { totalAmount: 25 }], + _count: { orders: 3, reviews: 2, blogComments: 1, pets: 4 }, + }]); + prisma.user.count.mockResolvedValue(11); + const controller = new AdminController(service, {} as never); + const result = await controller.getUsers({ page: 2, limit: 10 }); + const body = await firstValueFrom(new DecimalInterceptor().intercept({} as ExecutionContext, { handle: () => of(result) })); + expect(body).toEqual({ + data: [{ + id: "fixture-user", firstName: "Fixture", lastName: "User", mobile: "fixture-mobile", + email: null, role: "ADMIN", walletBalance: "0", charityDonationTotal: "12", + createdAt: new Date("2026-01-01T00:00:00Z"), addresses: [], + totalSpent: 125, ordersCount: 3, reviewsCount: 3, petsCount: 4, + }], + meta: { total: 11, page: 2, limit: 10, lastPage: 2 }, + }); + const query = prisma.user.findMany.mock.calls[0][0]; + expect(query.select).toBeDefined(); + expect(query.select.password).toBeUndefined(); + expect(query.include).toBeUndefined(); + expect(query.skip).toBe(10); + }); + + it("preserves the empty paginated list contract and filters", async () => { + prisma.user.findMany.mockResolvedValue([]); + prisma.user.count.mockResolvedValue(0); + expect(await service.getUsers({ search: "fixture", role: "ADMIN" })).toEqual({ + data: [], meta: { total: 0, page: 1, limit: 10, lastPage: 1 }, + }); + expect(prisma.user.findMany).toHaveBeenCalledWith(expect.objectContaining({ + where: expect.objectContaining({ role: "ADMIN", OR: expect.any(Array) }), + })); + }); +}); diff --git a/backend/src/admin/admin.service.ts b/backend/src/admin/admin.service.ts index 192a0c71..8724ed81 100644 --- a/backend/src/admin/admin.service.ts +++ b/backend/src/admin/admin.service.ts @@ -168,12 +168,17 @@ export class AdminService { skip, take: limit, orderBy: { [sortField]: sortDirection }, - include: { + select: { + id: true, + firstName: true, + lastName: true, + mobile: true, + email: true, + role: true, + walletBalance: true, + charityDonationTotal: true, + createdAt: true, addresses: true, - walletTransactions: { - orderBy: { createdAt: "desc" }, - take: 20, - }, orders: { where: { status: { not: "CANCELLED" } }, select: { totalAmount: true }, @@ -197,9 +202,19 @@ export class AdminService { (acc, curr) => acc + (Number(curr.totalAmount) || 0), 0, ) || 0; - const { orders: _orders, ...rest } = u; + // Explicit response allowlist: never expose authentication fields or + // new model columns implicitly through this administrative list. return { - ...rest, + id: u.id, + firstName: u.firstName, + lastName: u.lastName, + mobile: u.mobile, + email: u.email, + role: u.role, + walletBalance: u.walletBalance, + charityDonationTotal: u.charityDonationTotal, + createdAt: u.createdAt, + addresses: u.addresses, totalSpent, ordersCount: u._count?.orders || 0, reviewsCount: (u._count?.reviews || 0) + (u._count?.blogComments || 0), diff --git a/frontend/admin-panel/src/pages/Users.test.tsx b/frontend/admin-panel/src/pages/Users.test.tsx index 09cad62a..986e898c 100644 --- a/frontend/admin-panel/src/pages/Users.test.tsx +++ b/frontend/admin-panel/src/pages/Users.test.tsx @@ -57,9 +57,9 @@ describe('Users Page', () => { vi.clearAllMocks(); vi.mocked(api.get).mockResolvedValue({ data: { - success: true, + // Actual GET /admin/users contract: no success envelope. data: mockUsers, - meta: { lastPage: 2, total: 2 }, + meta: { lastPage: 2, total: 2, page: 1, limit: 10 }, }, }); }); @@ -260,9 +260,8 @@ describe('Users Page', () => { it('renders empty table state when no users are returned', async () => { vi.mocked(api.get).mockResolvedValueOnce({ data: { - success: true, data: [], - meta: { lastPage: 1, total: 0 }, + meta: { lastPage: 1, total: 0, page: 1, limit: 10 }, }, }); diff --git a/frontend/admin-panel/src/pages/Users.tsx b/frontend/admin-panel/src/pages/Users.tsx index c00d1ce3..58edcb53 100644 --- a/frontend/admin-panel/src/pages/Users.tsx +++ b/frontend/admin-panel/src/pages/Users.tsx @@ -179,7 +179,8 @@ export default function Users() { if (role) params.append('role', role); const response = await api.get(`/admin/users?${params.toString()}`); - if (response.data?.success) { + // The list endpoint returns { data, meta }, not a success envelope. + if (Array.isArray(response.data?.data)) { const userList = response.data.data || []; setUsers(userList); setTotalPages(response.data.meta?.lastPage || 1);