@greatapps/common 1.1.477 → 1.1.479

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

@@ -1,97 +1,99 @@
-'use client';
-
-import { useMemo } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { listIaCreditsAction } from '../actions/list-ia-credits.action';
-import type { IaCreditOperation, IaCreditsSummary } from '../types';
-import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
-import { withAction } from '../../../utils/withAction';
-
-function calculateSummary(operations: IaCreditOperation[]): IaCreditsSummary {
-  const today = new Date();
-  const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
-
-  const adds = operations.filter((op) => op.operation === 'add');
-  const subtracts = operations.filter((op) => op.operation === 'subtract');
-
-  let totalCredits = 0;
-  let usedCredits = 0;
-  let nextExpirationInDays: number | null = null;
-  let nextExpiringCredits: number | null = null;
-
-  for (const add of adds) {
-    const expirationRaw = add.expiration_time;
-    if (!expirationRaw) continue;
-
-    const expiration = new Date(expirationRaw);
-    const expirationDate = new Date(
-      expiration.getFullYear(),
-      expiration.getMonth(),
-      expiration.getDate()
-    );
-
-    const expiredByDate = expirationDate.getTime() < todayDate.getTime();
-    const hasExpired = add.has_expired || expiredByDate;
-
-    if (hasExpired) continue;
-
-    const addedCredits = add.operation_value;
-
-    const consumedForAdd = subtracts
-      .filter((sub) => String(sub.consumed_from_add_id) === String(add.id))
-      .reduce((sum, sub) => sum + sub.operation_value, 0);
-
-    const remainingForAdd = Math.max(0, addedCredits - consumedForAdd);
-
-    totalCredits += addedCredits;
-    usedCredits += consumedForAdd;
-
-    const diffMs = expirationDate.getTime() - todayDate.getTime();
-    const days = Math.max(0, Math.ceil(diffMs / (1000 * 60 * 60 * 24)));
-
-    if (remainingForAdd > 0) {
-      if (nextExpirationInDays === null || days < nextExpirationInDays) {
-        nextExpirationInDays = days;
-        nextExpiringCredits = remainingForAdd;
-      }
-    }
-  }
-
-  const availableCredits = Math.max(0, totalCredits - usedCredits);
-
-  return {
-    totalCredits,
-    usedCredits,
-    availableCredits,
-    nextExpiringCredits,
-    nextExpirationInDays,
-  };
-}
-
-export function useIaCredits() {
-  const { data: subscriptionData, isPending: isSubscriptionLoading } = useActiveSubscription();
-  const subscription = subscriptionData?.data?.[0] ?? null;
-  const subscriptionId = subscription?.id;
-
-  const query = useQuery({
-    queryKey: ['ia-credits', subscriptionId],
-    queryFn: withAction(() => listIaCreditsAction(subscriptionId!)),
-    enabled: subscriptionId != null,
-  });
-
-  const operations = query.data?.data ?? [];
-
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const summary = useMemo(() => calculateSummary(operations), [operations]);
-
-  return {
-    subscription,
-    operations,
-    summary,
-    isLoading: isSubscriptionLoading || query.isPending,
-    isSubscriptionLoading,
-    isCreditsLoading: query.isPending,
-    isError: query.isError,
-    error: query.error,
-  };
-}
+'use client';
+
+import { useMemo } from 'react';
+import { useQuery } from '@tanstack/react-query';
+import { listIaCreditsAction } from '../actions/list-ia-credits.action';
+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 {
+  const today = new Date();
+  const todayDate = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+
+  const adds = operations.filter((op) => op.operation === 'add');
+  const subtracts = operations.filter((op) => op.operation === 'subtract');
+
+  let totalCredits = 0;
+  let usedCredits = 0;
+  let nextExpirationInDays: number | null = null;
+  let nextExpiringCredits: number | null = null;
+
+  for (const add of adds) {
+    const expirationRaw = add.expiration_time;
+    if (!expirationRaw) continue;
+
+    const expiration = new Date(expirationRaw);
+    const expirationDate = new Date(
+      expiration.getFullYear(),
+      expiration.getMonth(),
+      expiration.getDate()
+    );
+
+    const expiredByDate = expirationDate.getTime() < todayDate.getTime();
+    const hasExpired = add.has_expired || expiredByDate;
+
+    if (hasExpired) continue;
+
+    const addedCredits = add.operation_value;
+
+    const consumedForAdd = subtracts
+      .filter((sub) => String(sub.consumed_from_add_id) === String(add.id))
+      .reduce((sum, sub) => sum + sub.operation_value, 0);
+
+    const remainingForAdd = Math.max(0, addedCredits - consumedForAdd);
+
+    totalCredits += addedCredits;
+    usedCredits += consumedForAdd;
+
+    const diffMs = expirationDate.getTime() - todayDate.getTime();
+    const days = Math.max(0, Math.ceil(diffMs / (1000 * 60 * 60 * 24)));
+
+    if (remainingForAdd > 0) {
+      if (nextExpirationInDays === null || days < nextExpirationInDays) {
+        nextExpirationInDays = days;
+        nextExpiringCredits = remainingForAdd;
+      }
+    }
+  }
+
+  const availableCredits = Math.max(0, totalCredits - usedCredits);
+
+  return {
+    totalCredits,
+    usedCredits,
+    availableCredits,
+    nextExpiringCredits,
+    nextExpirationInDays,
+  };
+}
+
+export function useIaCredits() {
+  const { data: subscriptionData, isPending: isSubscriptionLoading } = useActiveSubscription();
+  const subscription = subscriptionData?.data?.[0] ?? null;
+  const subscriptionId = subscription?.id;
+  const queryKey = useAuthQueryKey(['ia-credits', subscriptionId]);
+
+  const query = useQuery({
+    queryKey,
+    queryFn: withAction(() => listIaCreditsAction(subscriptionId!)),
+    enabled: subscriptionId != null,
+  });
+
+  const operations = query.data?.data ?? [];
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const summary = useMemo(() => calculateSummary(operations), [operations]);
+
+  return {
+    subscription,
+    operations,
+    summary,
+    isLoading: isSubscriptionLoading || query.isPending,
+    isSubscriptionLoading,
+    isCreditsLoading: query.isPending,
+    isError: query.isError,
+    error: query.error,
+  };
+}

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

@@ -4,12 +4,15 @@ import { useQuery } from '@tanstack/react-query';
 import { withAction } from '@greatapps/common';
 import { listPlansAction } from '../actions/list-plans.action';
 import type { Plan } from '../types/plan.type';
+import { useWlQueryKey } from '../../../hooks/useAuthQueryKey';
 
-export const PLANS_QUERY_KEY = ['plans'];
+export const PLANS_QUERY_KEY = ['plans'] as const;
 
 export function usePlans() {
+  const queryKey = useWlQueryKey([...PLANS_QUERY_KEY]);
+
   return useQuery<Plan[]>({
-    queryKey: [...PLANS_QUERY_KEY],
+    queryKey,
     queryFn: withAction(listPlansAction),
     staleTime: Infinity,
     gcTime: Infinity,

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

@@ -5,16 +5,18 @@ import { withAction } from "../../../utils/withAction";
 import { findPlanByIdAction } from "../actions/find-plan-by-id.action";
 import type { Plan } from "../types/plan.type";
 import { PLANS_QUERY_KEY } from "./list-plans.hook";
+import { useWlQueryKey } from "../../../hooks/useAuthQueryKey";
 
 export function usePlanById(idPlan: number | string | undefined) {
   const queryClient = useQueryClient();
+  const plansKey = useWlQueryKey([...PLANS_QUERY_KEY]);
 
   return useQuery({
-    queryKey: [...PLANS_QUERY_KEY, idPlan],
+    queryKey: [...plansKey, idPlan],
     queryFn: withAction(() => findPlanByIdAction(idPlan!)),
     initialData: () => {
       const queries = queryClient.getQueriesData<Plan[]>({
-        queryKey: [...PLANS_QUERY_KEY],
+        queryKey: plansKey,
       });
 
       for (const [, data] of queries) {

package/src/modules/plans/services/plans.service.ts

@@ -41,9 +41,10 @@ class PlansService {
   async listPlans(
     params?: ListPlansParams,
   ): Promise<PaginatedSuccessResult<Plan>> {
-    const { id_account } = await getUserContext();
+    const { id_wl, id_account } = await getUserContext();
     const cacheKey = this.buildCacheKey("plans", {
       ...params,
+      id_wl,
       id_account,
     });
 
@@ -87,8 +88,9 @@ class PlansService {
   }
 
   async findById(idPlan: number | string): Promise<SuccessResult<Plan>> {
-    const { id_account } = await getUserContext();
+    const { id_wl, id_account } = await getUserContext();
     const cacheKey = this.buildCacheKey(`plan-${idPlan}`, {
+      id_wl,
       id_account: String(id_account),
     });
 

package/src/modules/projects/hooks/add-project-user.hook.ts

@@ -5,27 +5,30 @@ import { addProjectUserAction } from '../actions/add-project-user.action';
 import { LIST_PROJECT_USERS_BASE_KEY } from './list-project-users.hook';
 import { LIST_ALL_ACCOUNT_USERS_BASE_KEY } from './list-all-account-users.hook';
 import type { UsersPage, AccountUser, ProjectUser } from '../types';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useAddProjectUser(projectId: number) {
   const queryClient = useQueryClient();
+  const allAccountUsersKey = useAuthQueryKey([...LIST_ALL_ACCOUNT_USERS_BASE_KEY()]);
+  const projectUsersKey = useAuthQueryKey([...LIST_PROJECT_USERS_BASE_KEY(projectId)]);
 
   return useMutation({
-    mutationFn: (userId: number) =>
-      addProjectUserAction({ projectId, users: [userId] }),
+    mutationFn: (targetUserId: number) =>
+      addProjectUserAction({ projectId, users: [targetUserId] }),
 
-    onMutate: async (userId) => {
-      await queryClient.cancelQueries({ queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY() });
-      await queryClient.cancelQueries({ queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId) });
+    onMutate: async (targetUserId) => {
+      await queryClient.cancelQueries({ queryKey: allAccountUsersKey });
+      await queryClient.cancelQueries({ queryKey: projectUsersKey });
 
       const prevAccountUsers = queryClient.getQueriesData<InfiniteData<UsersPage<AccountUser>>>({
-        queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY(),
+        queryKey: allAccountUsersKey,
       });
       const prevProjectUsers = queryClient.getQueriesData<InfiniteData<UsersPage<ProjectUser>>>({
-        queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId),
+        queryKey: projectUsersKey,
       });
 
       queryClient.setQueriesData<InfiniteData<UsersPage<AccountUser>>>(
-        { queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY(), exact: false },
+        { queryKey: allAccountUsersKey, exact: false },
         (old) => {
           if (!old) return old;
           return {
@@ -33,7 +36,7 @@ export function useAddProjectUser(projectId: number) {
             pages: old.pages.map((page) => ({
               ...page,
               data: page.data.map((u) =>
-                u.id === userId ? { ...u, in_project: true } : u
+                u.id === targetUserId ? { ...u, in_project: true } : u
               ),
             })),
           };
@@ -41,7 +44,7 @@ export function useAddProjectUser(projectId: number) {
       );
 
       queryClient.setQueriesData<InfiniteData<UsersPage<ProjectUser>>>(
-        { queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId), exact: false },
+        { queryKey: projectUsersKey, exact: false },
         (old) => {
           if (!old?.pages.length) return old;
           return {
@@ -56,14 +59,14 @@ export function useAddProjectUser(projectId: number) {
       return { prevAccountUsers, prevProjectUsers };
     },
 
-    onError: (_err, _userId, ctx) => {
+    onError: (_err, _targetUserId, ctx) => {
       ctx?.prevAccountUsers.forEach(([key, data]) => queryClient.setQueryData(key, data));
       ctx?.prevProjectUsers.forEach(([key, data]) => queryClient.setQueryData(key, data));
     },
 
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId) });
-      queryClient.invalidateQueries({ queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY() });
+      queryClient.invalidateQueries({ queryKey: projectUsersKey });
+      queryClient.invalidateQueries({ queryKey: allAccountUsersKey });
     },
   });
 }

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

@@ -3,19 +3,24 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { listAllAccountUsersAction } from '../actions/list-all-account-users.action';
 import { withAction } from '../../../utils/withAction';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
 
-export const LIST_ALL_ACCOUNT_USERS_BASE_KEY = () => ['account-users', 'all'];
+export const LIST_ALL_ACCOUNT_USERS_BASE_KEY = () =>
+  ['account-users', 'all'] as const;
+
 export const LIST_ALL_ACCOUNT_USERS_QUERY_KEY = (search: string = '', projectId?: number) => [
   ...LIST_ALL_ACCOUNT_USERS_BASE_KEY(),
   search,
   projectId,
-];
+] as const;
 
 export function useListAllAccountUsers(search: string = '', projectId?: number) {
+  const queryKey = useAuthQueryKey([...LIST_ALL_ACCOUNT_USERS_QUERY_KEY(search, projectId)]);
+
   return useInfiniteQuery({
-    queryKey: LIST_ALL_ACCOUNT_USERS_QUERY_KEY(search, projectId),
+    queryKey,
     queryFn: ({ pageParam }) =>
       withAction(() =>
         listAllAccountUsersAction({

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

@@ -3,18 +3,23 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { listAvailableUsersAction } from '../actions/list-available-users.action';
 import { withAction } from '../../../utils/withAction';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
 
-export const LIST_AVAILABLE_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'out'];
+export const LIST_AVAILABLE_USERS_BASE_KEY = (projectId: number) =>
+  ['project-users', projectId, 'out'] as const;
+
 export const LIST_AVAILABLE_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
   ...LIST_AVAILABLE_USERS_BASE_KEY(projectId),
   search,
-];
+] as const;
 
 export function useListAvailableUsers(projectId: number, search: string = '') {
+  const queryKey = useAuthQueryKey([...LIST_AVAILABLE_USERS_QUERY_KEY(projectId, search)]);
+
   return useInfiniteQuery({
-    queryKey: LIST_AVAILABLE_USERS_QUERY_KEY(projectId, search),
+    queryKey,
     queryFn: ({ pageParam }) =>
       withAction(() =>
         listAvailableUsersAction(projectId, {

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

@@ -3,18 +3,23 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { listProjectUsersAction } from '../actions/list-project-users.action';
 import { withAction } from '../../../utils/withAction';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
 
-export const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'in'];
+export const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) =>
+  ['project-users', projectId, 'in'] as const;
+
 export const LIST_PROJECT_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
   ...LIST_PROJECT_USERS_BASE_KEY(projectId),
   search,
-];
+] as const;
 
 export function useListProjectUsers(projectId: number, search: string = '') {
+  const queryKey = useAuthQueryKey([...LIST_PROJECT_USERS_QUERY_KEY(projectId, search)]);
+
   return useInfiniteQuery({
-    queryKey: LIST_PROJECT_USERS_QUERY_KEY(projectId, search),
+    queryKey,
     queryFn: ({ pageParam }) =>
       withAction(() =>
         listProjectUsersAction(projectId, {

package/src/modules/projects/hooks/remove-project-user.hook.ts

@@ -5,27 +5,30 @@ import { removeProjectUserAction } from '../actions/remove-project-user.action';
 import { LIST_PROJECT_USERS_BASE_KEY } from './list-project-users.hook';
 import { LIST_ALL_ACCOUNT_USERS_BASE_KEY } from './list-all-account-users.hook';
 import type { UsersPage, AccountUser, ProjectUser } from '../types';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useRemoveProjectUser(projectId: number) {
   const queryClient = useQueryClient();
+  const allAccountUsersKey = useAuthQueryKey([...LIST_ALL_ACCOUNT_USERS_BASE_KEY()]);
+  const projectUsersKey = useAuthQueryKey([...LIST_PROJECT_USERS_BASE_KEY(projectId)]);
 
   return useMutation({
-    mutationFn: (userId: number) =>
-      removeProjectUserAction({ projectId, users: [userId] }),
+    mutationFn: (targetUserId: number) =>
+      removeProjectUserAction({ projectId, users: [targetUserId] }),
 
-    onMutate: async (userId) => {
-      await queryClient.cancelQueries({ queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY() });
-      await queryClient.cancelQueries({ queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId) });
+    onMutate: async (targetUserId) => {
+      await queryClient.cancelQueries({ queryKey: allAccountUsersKey });
+      await queryClient.cancelQueries({ queryKey: projectUsersKey });
 
       const prevAccountUsers = queryClient.getQueriesData<InfiniteData<UsersPage<AccountUser>>>({
-        queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY(),
+        queryKey: allAccountUsersKey,
       });
       const prevProjectUsers = queryClient.getQueriesData<InfiniteData<UsersPage<ProjectUser>>>({
-        queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId),
+        queryKey: projectUsersKey,
       });
 
       queryClient.setQueriesData<InfiniteData<UsersPage<AccountUser>>>(
-        { queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY(), exact: false },
+        { queryKey: allAccountUsersKey, exact: false },
         (old) => {
           if (!old) return old;
           return {
@@ -33,7 +36,7 @@ export function useRemoveProjectUser(projectId: number) {
             pages: old.pages.map((page) => ({
               ...page,
               data: page.data.map((u) =>
-                u.id === userId ? { ...u, in_project: false } : u
+                u.id === targetUserId ? { ...u, in_project: false } : u
               ),
             })),
           };
@@ -41,7 +44,7 @@ export function useRemoveProjectUser(projectId: number) {
       );
 
       queryClient.setQueriesData<InfiniteData<UsersPage<ProjectUser>>>(
-        { queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId), exact: false },
+        { queryKey: projectUsersKey, exact: false },
         (old) => {
           if (!old?.pages.length) return old;
           return {
@@ -56,14 +59,14 @@ export function useRemoveProjectUser(projectId: number) {
       return { prevAccountUsers, prevProjectUsers };
     },
 
-    onError: (_err, _userId, ctx) => {
+    onError: (_err, _targetUserId, ctx) => {
       ctx?.prevAccountUsers.forEach(([key, data]) => queryClient.setQueryData(key, data));
       ctx?.prevProjectUsers.forEach(([key, data]) => queryClient.setQueryData(key, data));
     },
 
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: LIST_PROJECT_USERS_BASE_KEY(projectId) });
-      queryClient.invalidateQueries({ queryKey: LIST_ALL_ACCOUNT_USERS_BASE_KEY() });
+      queryClient.invalidateQueries({ queryKey: projectUsersKey });
+      queryClient.invalidateQueries({ queryKey: allAccountUsersKey });
     },
   });
 }

package/src/modules/subscriptions/constants/query-keys.constants.ts

@@ -1 +1,3 @@
-export const SUBSCRIPTIONS_QUERY_KEY = ['subscriptions'];
+export const SUBSCRIPTIONS_QUERY_KEY = ['subscriptions'] as const;
+
+export const CHARGES_QUERY_KEY = ['charges'] as const;

package/src/modules/subscriptions/hooks/find-active-subscription.hook.ts

@@ -4,10 +4,13 @@ import { useQuery } from "@tanstack/react-query";
 import { listSubscriptionsAction } from "../actions/list-subscriptions.action";
 import { SUBSCRIPTIONS_QUERY_KEY } from "../constants/query-keys.constants";
 import { withAction } from "../../../utils/withAction";
+import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 
 export function useActiveSubscription() {
+  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, "active"]);
+
   return useQuery({
-    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, "active"],
+    queryKey,
     queryFn: async () => {
       return await withAction(listSubscriptionsAction)({ limit: 1 });
     },

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

@@ -6,10 +6,13 @@ import { parseResult } from '../../../infra/utils/parser';
 import { SubscriptionSchema, type FindSubscriptionsParams } from '../types/subscription.type';
 import { withAction } from '../../../utils/withAction';
 import { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {
+  const queryKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY, params]);
+
   return useQuery({
-    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, params],
+    queryKey,
     queryFn: async () =>
       parseResult(SubscriptionSchema, await withAction(() => listSubscriptionsAction(params))()),
   });

package/src/modules/subscriptions/hooks/update-subscription-plan.hook.ts

@@ -3,11 +3,14 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { withAction } from '../../../utils/withAction';
 import { updateSubscriptionPlanAction } from '../actions/update-subscription-plan.action';
-import { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';
+import { SUBSCRIPTIONS_QUERY_KEY, CHARGES_QUERY_KEY } from '../constants/query-keys.constants';
 import type { UpdateSubscriptionPlanRequest } from '../types/calculate-subscription.type';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export function useUpdateSubscriptionPlan() {
   const queryClient = useQueryClient();
+  const subscriptionsKey = useAuthQueryKey([...SUBSCRIPTIONS_QUERY_KEY]);
+  const chargesKey = useAuthQueryKey([...CHARGES_QUERY_KEY]);
 
   return useMutation({
     mutationFn: ({
@@ -18,8 +21,8 @@ export function useUpdateSubscriptionPlan() {
       data: UpdateSubscriptionPlanRequest;
     }) => withAction(updateSubscriptionPlanAction)(subscriptionId, data),
     onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: SUBSCRIPTIONS_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: ['charges'] });
+      queryClient.invalidateQueries({ queryKey: subscriptionsKey });
+      queryClient.invalidateQueries({ queryKey: chargesKey });
     },
   });
 }

package/src/modules/users/hooks/messages.hook.ts

@@ -6,21 +6,26 @@ import { markMessageAsReadAction } from '../action/mark-message-as-read.action';
 import { markAllMessagesAsReadAction } from '../action/mark-all-messages-as-read.action';
 import { withAction } from '../../../utils/withAction';
 import type { FindMessagesParams } from '../schema/messages.schema';
+import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
-export const MESSAGES_QUERY_KEY = ['messages'];
+export const MESSAGES_QUERY_KEY = ['messages'] as const;
 
 const INFINITE_MESSAGES_PAGE_SIZE = 10;
 
 export function useMessages(params?: Partial<FindMessagesParams>) {
+  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, params]);
+
   return useQuery({
-    queryKey: [...MESSAGES_QUERY_KEY, params],
+    queryKey,
     queryFn: withAction(() => listMessagesAction(params)),
   });
 }
 
 export function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'page' | 'limit'>>) {
+  const queryKey = useAuthQueryKey([...MESSAGES_QUERY_KEY, 'infinite', params]);
+
   return useInfiniteQuery({
-    queryKey: [...MESSAGES_QUERY_KEY, 'infinite', params],
+    queryKey,
     queryFn: ({ pageParam }) =>
       withAction(() =>
         listMessagesAction({
@@ -39,22 +44,24 @@ export function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'p
 
 export function useMarkMessageAsRead() {
   const queryClient = useQueryClient();
+  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);
 
   return useMutation({
     mutationFn: withAction(markMessageAsReadAction),
     onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: MESSAGES_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: messagesKey });
     },
   });
 }
 
 export function useMarkAllMessagesAsRead() {
   const queryClient = useQueryClient();
+  const messagesKey = useAuthQueryKey([...MESSAGES_QUERY_KEY]);
 
   return useMutation({
     mutationFn: withAction(markAllMessagesAsReadAction),
     onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: MESSAGES_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: messagesKey });
     },
   });
 }