@greatapps/common 1.1.656 → 1.1.657

package/dist/route.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/route.ts"],"sourcesContent":["export { safeRouteHandler } from './infra/route/safe-route-handler';\nexport { searchParamsToParams } from './infra/route/search-params';\nexport { parseId } from './infra/route/parse-id';\n"],"mappings":"AAAA,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,eAAe;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greatapps/common",
-  "version": "1.1.656",
+  "version": "1.1.657",
   "description": "Shared library for GreatApps frontend applications",
   "main": "./dist/index.mjs",
   "types": "./src/index.ts",
@@ -16,6 +16,18 @@
     "./middleware": {
       "import": "./dist/middleware.mjs",
       "types": "./src/middleware.ts"
+    },
+    "./route": {
+      "import": "./dist/route.mjs",
+      "types": "./src/route.ts"
+    },
+    "./http": {
+      "import": "./dist/http.mjs",
+      "types": "./src/http.ts"
+    },
+    "./handlers": {
+      "import": "./dist/handlers.mjs",
+      "types": "./src/handlers.ts"
     }
   },
   "files": [
@@ -61,7 +73,8 @@
     "react-image-crop": "^11.0.10",
     "server-only": "^0.0.1",
     "sonner": ">=2.0.0",
-    "tailwind-merge": "^3.5.0"
+    "tailwind-merge": "^3.5.0",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@hookform/resolvers": "^5.2.2",
@@ -77,7 +90,6 @@
     "react-hook-form": "^7.72.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "zod": "^4.3.6",
     "zustand": "^5.0.12"
   },
   "peerDependencies": {
@@ -88,7 +100,6 @@
     "react-dom": ">=19.0.0",
     "react-hook-form": ">=7.0.0",
     "sonner": ">=2.0.0",
-    "zod": ">=4.0.0",
     "zustand": ">=4.0.0"
   }
 }

package/src/components/account/sections/TokenSection.tsx

@@ -60,7 +60,7 @@ export function TokenSection() {
         </div>
 
         <a
-          href="https://documenter.getpostman.com/view/4861938/T1Djiz8H"
+          href="https://documenter.getpostman.com/view/4861938/2sAYdoDmj4"
           target="_blank"
           rel="noopener noreferrer"
           className="paragraph-small-medium text-gray-500 underline hover:text-gray-700 transition-colors w-fit"

package/src/handlers.ts

@@ -0,0 +1,22 @@
+export { createListCardsHandler } from './modules/cards/handlers/list-cards.handler';
+export { createFindCardByIdHandler } from './modules/cards/handlers/find-card-by-id.handler';
+
+export { createListChargesHandler } from './modules/charges/handlers/list-charges.handler';
+export { createFindChargeByIdHandler } from './modules/charges/handlers/find-charge-by-id.handler';
+
+export { createListIaCreditsHandler } from './modules/ia-credits/handlers/list-ia-credits.handler';
+
+export { createCountPagesHandler } from './modules/pages/handlers/count-pages.handler';
+
+export { createListPlansHandler } from './modules/plans/handlers/list-plans.handler';
+export { createFindPlanByIdHandler } from './modules/plans/handlers/find-plan-by-id.handler';
+
+export { createListProjectsHandler } from './modules/projects/handlers/list-projects.handler';
+export { createFindProjectHandler } from './modules/projects/handlers/find-project.handler';
+export { createListProjectUsersHandler } from './modules/projects/handlers/list-project-users.handler';
+export { createListAvailableUsersHandler } from './modules/projects/handlers/list-available-users.handler';
+export { createListAllAccountUsersHandler } from './modules/projects/handlers/list-all-account-users.handler';
+
+export { createListSubscriptionsHandler } from './modules/subscriptions/handlers/list-subscriptions.handler';
+
+export { createListMessagesHandler } from './modules/users/handlers/list-messages.handler';

package/src/http.ts

@@ -0,0 +1 @@
+export { apiFetch } from './infra/http/api-fetch';

package/src/infra/http/api-fetch.ts

@@ -0,0 +1,39 @@
+import { buildQueryParams } from '../utils/params';
+import type { ActionResult } from '../api/types';
+
+type QueryParams = Parameters<typeof buildQueryParams>[0];
+
+interface ApiFetchOptions {
+  params?: object;
+  signal?: AbortSignal;
+}
+
+export async function apiFetch<T>(path: string, options: ApiFetchOptions = {}): Promise<T> {
+  const { params, signal } = options;
+  const qs = params ? buildQueryParams(params as QueryParams) : '';
+  const url = qs ? `${path}?${qs}` : path;
+
+  const response = await fetch(url, {
+    method: 'GET',
+    credentials: 'same-origin',
+    headers: { Accept: 'application/json' },
+    signal,
+  });
+
+  if (!response.ok) {
+    let message = `Erro ${response.status}`;
+    try {
+      const body = (await response.json()) as ActionResult<unknown>;
+      if (body && !body.success && body.error) message = body.error;
+    } catch {
+      // corpo não-JSON — mantém a mensagem genérica
+    }
+    throw new Error(message);
+  }
+
+  const body = (await response.json()) as ActionResult<T>;
+  if (!body.success) {
+    throw new Error(body.error ?? 'Erro desconhecido');
+  }
+  return body.data as T;
+}

package/src/infra/route/parse-id.ts

@@ -0,0 +1,9 @@
+import { ApiError } from '../api/types';
+
+export function parseId(value: string): number {
+  const id = Number(value);
+  if (!Number.isFinite(id) || id <= 0) {
+    throw new ApiError('Identificador inválido', 'INVALID_ID', 400);
+  }
+  return id;
+}

package/src/infra/route/safe-route-handler.ts

@@ -0,0 +1,16 @@
+import 'server-only';
+
+import { ApiError } from '../api/types';
+
+export async function safeRouteHandler<T>(fn: () => Promise<T>): Promise<Response> {
+  try {
+    const data = await fn();
+    return Response.json({ success: true, data });
+  } catch (error) {
+    if (error instanceof ApiError) {
+      return Response.json({ success: false, error: error.message }, { status: error.statusCode });
+    }
+    console.error('[safeRouteHandler] erro inesperado', error);
+    return Response.json({ success: false, error: 'Erro interno do servidor' }, { status: 500 });
+  }
+}

package/src/infra/route/search-params.ts

@@ -0,0 +1,9 @@
+export function searchParamsToParams<T extends object>(
+  searchParams: URLSearchParams
+): Partial<T> {
+  const params = Object.create(null) as Partial<Record<keyof T, string>>;
+  for (const [key, value] of searchParams.entries()) {
+    params[key as keyof T] = value;
+  }
+  return params as Partial<T>;
+}

package/src/modules/cards/handlers/find-card-by-id.handler.ts

@@ -0,0 +1,15 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { parseId } from '../../../infra/route/parse-id';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { cardsService } from '../services/cards.service';
+
+export function createFindCardByIdHandler() {
+  return async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return cardsService.findCardById(parseId(id));
+    });
+  };
+}

package/src/modules/cards/handlers/list-cards.handler.ts

@@ -0,0 +1,10 @@
+import 'server-only';
+
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { cardsService } from '../services/cards.service';
+
+export function createListCardsHandler() {
+  return async function GET() {
+    return safeRouteHandler(() => cardsService.listCards());
+  };
+}

package/src/modules/cards/hooks/card-by-id.hook.ts

@@ -1,7 +1,9 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { SuccessResult } from '../../../infra/api/types';
+import type { Card } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useCardById(id: number | undefined) {
@@ -9,10 +11,7 @@ export function useCardById(id: number | undefined) {
 
   return useQuery({
     queryKey: cardKey,
-    queryFn: async () => {
-      const { findCardByIdAction } = await import('../actions/find-card-by-id.action');
-      return withAction(findCardByIdAction)(id!);
-    },
+    queryFn: ({ signal }) => apiFetch<SuccessResult<Card>>(`/api/cards/${id}`, { signal }),
     enabled: id != null,
   });
 }

package/src/modules/cards/hooks/cards.hook.ts

@@ -1,7 +1,9 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { PaginatedSuccessResult } from '../../../infra/api/types';
+import type { Card } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const CARDS_QUERY_KEY = ['cards'] as const;
@@ -11,10 +13,7 @@ export function useCards() {
 
   return useQuery({
     queryKey,
-    queryFn: async () => {
-      const { listCardsAction } = await import('../actions/list-cards.action');
-      return withAction(listCardsAction)();
-    },
+    queryFn: ({ signal }) => apiFetch<PaginatedSuccessResult<Card>>('/api/cards', { signal }),
     select: (result) => ({
       ...result,
       data: result.data.filter((card) => !card.deleted),

package/src/modules/charges/handlers/find-charge-by-id.handler.ts

@@ -0,0 +1,14 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { chargesService } from '../services/charges.service';
+
+export function createFindChargeByIdHandler() {
+  return async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return chargesService.findChargeById(id);
+    });
+  };
+}

package/src/modules/charges/handlers/list-charges.handler.ts

@@ -0,0 +1,15 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { chargesService } from '../services/charges.service';
+import type { FindChargesParams } from '../types/charge.type';
+
+export function createListChargesHandler() {
+  return async function GET(req: NextRequest) {
+    return safeRouteHandler(() =>
+      chargesService.listCharges(searchParamsToParams<FindChargesParams>(req.nextUrl.searchParams))
+    );
+  };
+}

package/src/modules/charges/hooks/charge-by-id.hook.ts

@@ -1,9 +1,10 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { SuccessResult } from '../../../infra/api/types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
-import { findChargeByIdAction } from '../actions/find-charge-by-id.action';
+import { Charge } from '../types/charge.type';
 import { CHARGES_QUERY_KEY } from '../../subscriptions/constants/query-keys.constants';
 
 export function useChargeById(chargeId: string | number | null | undefined) {
@@ -11,7 +12,8 @@ export function useChargeById(chargeId: string | number | null | undefined) {
 
   return useQuery({
     queryKey: chargesKey,
-    queryFn: () => withAction(findChargeByIdAction)(chargeId!),
+    queryFn: ({ signal }) =>
+      apiFetch<SuccessResult<Charge>>(`/api/charges/${chargeId}`, { signal }),
     enabled: !!chargeId,
   });
 }

package/src/modules/charges/hooks/charges.hook.ts

@@ -1,10 +1,10 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { PaginatedSuccessResult } from '../../../infra/api/types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
-import { listChargesAction } from '../actions/list-charges.action';
-import { FindChargesParams } from '../types/charge.type';
+import { Charge, FindChargesParams } from '../types/charge.type';
 import { CHARGES_QUERY_KEY } from '../../subscriptions/constants/query-keys.constants';
 
 export function useCharges(params?: Partial<FindChargesParams>) {
@@ -12,7 +12,8 @@ export function useCharges(params?: Partial<FindChargesParams>) {
 
   return useQuery({
     queryKey: chargesKey,
-    queryFn: () => withAction(listChargesAction)(params),
+    queryFn: ({ signal }) =>
+      apiFetch<PaginatedSuccessResult<Charge>>('/api/charges', { params, signal }),
     staleTime: 10_000,
   });
 }

package/src/modules/ia-credits/handlers/list-ia-credits.handler.ts

@@ -0,0 +1,14 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { iaCreditsService } from '../services/ia-credits.service';
+
+export function createListIaCreditsHandler() {
+  return async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return iaCreditsService.listOperations(id);
+    });
+  };
+}

package/src/modules/ia-credits/hooks/ia-credits.hook.ts

@@ -2,10 +2,10 @@
 
 import { useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
-import { listIaCreditsAction } from '../actions/list-ia-credits.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { PaginatedSuccessResult } from '../../../infra/api/types';
 import type { IaCreditOperation, IaCreditsSummary } from '../types';
 import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
-import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 function calculateSummary(operations: IaCreditOperation[]): IaCreditsSummary {
@@ -77,7 +77,11 @@ export function useIaCredits() {
 
   const query = useQuery({
     queryKey,
-    queryFn: withAction(() => listIaCreditsAction(subscriptionId!)),
+    queryFn: ({ signal }) =>
+      apiFetch<PaginatedSuccessResult<IaCreditOperation>>(
+        `/api/subscriptions/${subscriptionId}/ia-credits`,
+        { signal }
+      ),
     enabled: subscriptionId != null,
   });
 

package/src/modules/pages/handlers/count-pages.handler.ts

@@ -0,0 +1,12 @@
+import 'server-only';
+
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { pagesService } from '../services/pages.service';
+
+export function createCountPagesHandler() {
+  return async function GET() {
+    return safeRouteHandler(async () => ({
+      total: await pagesService.countPages(),
+    }));
+  };
+}

package/src/modules/pages/hooks/count-pages.hook.ts

@@ -1,9 +1,8 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { countPagesAction } from '../actions/count-pages.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
 import { PAGES_QUERY_KEY } from '../constants/query-keys.constants';
-import { withAction } from '../../../utils/withAction';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const COUNT_PAGES_QUERY_KEY = [...PAGES_QUERY_KEY, 'count'] as const;
@@ -13,8 +12,8 @@ export function useCountPages() {
 
   return useQuery({
     queryKey,
-    queryFn: async () => {
-      const result = await withAction(countPagesAction)();
+    queryFn: async ({ signal }) => {
+      const result = await apiFetch<{ total: number }>('/api/pages/count', { signal });
       return result.total;
     },
     staleTime: 30_000,

package/src/modules/plans/handlers/find-plan-by-id.handler.ts

@@ -0,0 +1,14 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { plansService } from '../services/plans.service';
+
+export function createFindPlanByIdHandler() {
+  return async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return plansService.findById(id);
+    });
+  };
+}

package/src/modules/plans/handlers/list-plans.handler.ts

@@ -0,0 +1,20 @@
+import 'server-only';
+
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { plansService } from '../services/plans.service';
+
+export function createListPlansHandler() {
+  return async function GET() {
+    return safeRouteHandler(async () => {
+      const { data: apiPlans } = await plansService.listPlans({
+        active: true,
+        search: 'client',
+        sort: 'id:ASC',
+      });
+
+      if (!apiPlans?.length) return [];
+
+      return [...apiPlans].sort((a, b) => a.value - b.value);
+    });
+  };
+}

package/src/modules/plans/hooks/list-plans.hook.ts

@@ -1,8 +1,7 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { withAction } from '@greatapps/common';
-import { listPlansAction } from '../actions/list-plans.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
 import type { Plan } from '../types/plan.type';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
@@ -13,7 +12,7 @@ export function usePlans() {
 
   return useQuery<Plan[]>({
     queryKey,
-    queryFn: withAction(listPlansAction),
+    queryFn: ({ signal }) => apiFetch<Plan[]>('/api/plans', { signal }),
     staleTime: Infinity,
     gcTime: Infinity,
     refetchOnWindowFocus: false,

package/src/modules/plans/hooks/use-plan-by-id.hook.ts

@@ -1,8 +1,8 @@
 "use client";
 
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { withAction } from "../../../utils/withAction";
-import { findPlanByIdAction } from "../actions/find-plan-by-id.action";
+import { apiFetch } from "../../../infra/http/api-fetch";
+import type { SuccessResult } from "../../../infra/api/types";
 import type { Plan } from "../types/plan.type";
 import { PLANS_QUERY_KEY } from "./list-plans.hook";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
@@ -13,7 +13,8 @@ export function usePlanById(idPlan?: number | string | null) {
 
   return useQuery({
     queryKey: [...plansKey, idPlan],
-    queryFn: withAction(() => findPlanByIdAction(idPlan!)),
+    queryFn: ({ signal }) =>
+      apiFetch<SuccessResult<Plan>>(`/api/plans/${idPlan}`, { signal }),
     initialData: () => {
       const queries = queryClient.getQueriesData<Plan[]>({
         queryKey: plansKey,

package/src/modules/projects/handlers/find-project.handler.ts

@@ -0,0 +1,15 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { parseId } from '../../../infra/route/parse-id';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { projectsService } from '../services/projects.service';
+
+export function createFindProjectHandler() {
+  return async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return projectsService.findById(parseId(id));
+    });
+  };
+}

package/src/modules/projects/handlers/list-all-account-users.handler.ts

@@ -0,0 +1,17 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { projectUsersService } from '../services/project-users.service';
+import type { ListUsersParams } from '../types';
+
+export function createListAllAccountUsersHandler() {
+  return async function GET(req: NextRequest) {
+    return safeRouteHandler(() =>
+      projectUsersService.listAllAccountUsers(
+        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+      )
+    );
+  };
+}

package/src/modules/projects/handlers/list-available-users.handler.ts

@@ -0,0 +1,20 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { parseId } from '../../../infra/route/parse-id';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { projectUsersService } from '../services/project-users.service';
+import type { ListUsersParams } from '../types';
+
+export function createListAvailableUsersHandler() {
+  return async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return projectUsersService.listNotInProject(
+        parseId(id),
+        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+      );
+    });
+  };
+}

package/src/modules/projects/handlers/list-project-users.handler.ts

@@ -0,0 +1,20 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { parseId } from '../../../infra/route/parse-id';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { projectUsersService } from '../services/project-users.service';
+import type { ListUsersParams } from '../types';
+
+export function createListProjectUsersHandler() {
+  return async function GET(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+    return safeRouteHandler(async () => {
+      const { id } = await params;
+      return projectUsersService.listInProject(
+        parseId(id),
+        searchParamsToParams<ListUsersParams>(req.nextUrl.searchParams)
+      );
+    });
+  };
+}

package/src/modules/projects/handlers/list-projects.handler.ts

@@ -0,0 +1,17 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { projectsService } from '../services/projects.service';
+import type { ListProjectsActionParams } from '../actions/list-projects.action';
+
+export function createListProjectsHandler() {
+  return async function GET(req: NextRequest) {
+    return safeRouteHandler(() =>
+      projectsService.list(
+        searchParamsToParams<ListProjectsActionParams>(req.nextUrl.searchParams)
+      )
+    );
+  };
+}

package/src/modules/projects/hooks/find-project.hook.ts

@@ -1,8 +1,8 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { findProjectAction } from '../actions/find-project.action';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { Project } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 import { PROJECTS_BASE_KEY } from './list-projects.hook';
 
@@ -11,7 +11,7 @@ export function useProject(projectId: number | null) {
 
   return useQuery({
     queryKey,
-    queryFn: () => withAction(() => findProjectAction(projectId!))(),
+    queryFn: ({ signal }) => apiFetch<Project>(`/api/projects/${projectId}`, { signal }),
     enabled: projectId != null && projectId > 0,
     staleTime: 10_000,
   });

package/src/modules/projects/hooks/list-all-account-users.hook.ts

@@ -1,8 +1,8 @@
 'use client';
 
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { listAllAccountUsersAction } from '../actions/list-all-account-users.action';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { AccountUser, UsersPage } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
@@ -21,15 +21,16 @@ export function useListAllAccountUsers(search: string = '', projectId?: number)
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam }) =>
-      withAction(() =>
-        listAllAccountUsersAction({
+    queryFn: ({ pageParam, signal }) =>
+      apiFetch<UsersPage<AccountUser>>('/api/account/users', {
+        params: {
           search: search || undefined,
           page: pageParam as number,
           limit: PAGE_SIZE,
           inProject: projectId,
-        })
-      )(),
+        },
+        signal,
+      }),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : undefined;