@greatapps/common 1.1.234 → 1.1.237

package/src/middleware.ts

@@ -1,4 +1,4 @@
-export { createAuthMiddleware } from './middlewares/create-auth-middleware';
-export { createMiddlewareChain } from './middlewares/chain';
-export type { MiddlewareConfig, MiddlewareFunction, MiddlewareResult } from './middlewares/types';
-export { continueChain, stopChain } from './middlewares/types';
+export { createAuthMiddleware } from './middlewares/create-auth-middleware';
+export { createMiddlewareChain } from './middlewares/chain';
+export type { MiddlewareConfig, MiddlewareFunction, MiddlewareResult } from './middlewares/types';
+export { continueChain, stopChain } from './middlewares/types';

package/src/modules/accounts/actions/account-management.action.ts

@@ -1,90 +1,91 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { accountService } from '../services/account.service';
-import type {
-  AccountUsersPaginationParams,
-  ChangePasswordRequest,
-  CreateAccountUserRequest,
-  UpdateAccountRequest,
-  UpdateAccountUserRequest,
-} from '../types';
-import { twoFactorService } from '../services/two-factor.service';
-
-export async function listAccountUsersAction(params?: AccountUsersPaginationParams) {
-  return safeServerAction(async () => {
-    const { users, total } = await accountService.listAccountUsers(params);
-    return { data: users, total };
-  });
-}
-
-export async function updateUserAction(user: UpdateAccountUserRequest) {
-  return safeServerAction(() => accountService.updateAccountUser(user));
-}
-
-export async function updateAccountUserByIdAction(
-  userId: number,
-  user: UpdateAccountUserRequest
-) {
-  return safeServerAction(() => accountService.updateAccountUserById(userId, user));
-}
-
-export async function updateAccountAction(data: UpdateAccountRequest) {
-  return safeServerAction(() => accountService.updateAccount(data));
-}
-
-export async function deleteAccountUserAction(userId: number) {
-  return safeServerAction(() => accountService.deleteAccountUser(userId));
-}
-
-export async function deleteAccountAction() {
-  return safeServerAction(() => accountService.deleteAccount());
-}
-
-export async function createAccountUserAction(user: CreateAccountUserRequest) {
-  return safeServerAction(() => accountService.createAccountUser(user));
-}
-
-export async function changePasswordAction(data: ChangePasswordRequest) {
-  return safeServerAction(() => accountService.changePassword(data));
-}
-
-export async function requestEmailChangeAction(newEmail: string) {
-  return safeServerAction(() => accountService.requestContactReset('email', newEmail));
-}
-
-export async function confirmEmailChangeAction(token: string, newEmail: string) {
-  return safeServerAction(() => accountService.confirmContactReset('email', token, newEmail));
-}
-
-export async function requestPhoneChangeAction(newPhone: string, ddi?: string) {
-  return safeServerAction(() => accountService.requestContactReset('phone', newPhone, ddi));
-}
-
-export async function confirmPhoneChangeAction(token: string, newPhone: string, ddi?: string) {
-  return safeServerAction(() => accountService.confirmContactReset('phone', token, newPhone, ddi));
-}
-
-export async function generateTwoFactorAction() {
-  return safeServerAction(async () => {
-    const result = await twoFactorService.generate();
-    return {
-      qrcode: result.data.qrcode,
-      backupCodes: result.data.backup_codes,
-    };
-  });
-}
-
-export async function confirmTwoFactorAction(code: string) {
-  return safeServerAction(async () => {
-    await twoFactorService.confirm(code);
-    await accountService.updateAccountUser({ two_factor_authentication: true });
-  });
-}
-
-export async function disableTwoFactorAction(code: string) {
-  return safeServerAction(async () => {
-    await twoFactorService.verify(code);
-    await twoFactorService.disable();
-  });
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { accountService } from '../services/account.service';
+import type {
+  AccountUsersPaginationParams,
+  ChangePasswordRequest,
+  CreateAccountUserRequest,
+  UpdateAccountRequest,
+  UpdateAccountUserRequest,
+} from '../types';
+import { twoFactorService } from '../services/two-factor.service';
+
+export async function listAccountUsersAction(params?: AccountUsersPaginationParams) {
+  return safeServerAction(async () => {
+    const { users, total } = await accountService.listAccountUsers(params);
+    return { data: users, total };
+  });
+}
+
+export async function updateUserAction(user: UpdateAccountUserRequest) {
+  return safeServerAction(() => accountService.updateAccountUser(user));
+}
+
+export async function updateAccountUserByIdAction(
+  userId: number,
+  user: UpdateAccountUserRequest
+) {
+  return safeServerAction(() => accountService.updateAccountUserById(userId, user));
+}
+
+export async function updateAccountAction(data: UpdateAccountRequest) {
+  return safeServerAction(() => accountService.updateAccount(data));
+}
+
+export async function deleteAccountUserAction(userId: number) {
+  return safeServerAction(() => accountService.deleteAccountUser(userId));
+}
+
+export async function deleteAccountAction() {
+  return safeServerAction(() => accountService.deleteAccount());
+}
+
+export async function createAccountUserAction(user: CreateAccountUserRequest) {
+  return safeServerAction(() => accountService.createAccountUser(user));
+}
+
+export async function changePasswordAction(data: ChangePasswordRequest) {
+  return safeServerAction(() => accountService.changePassword(data));
+}
+
+export async function requestEmailChangeAction(newEmail: string) {
+  return safeServerAction(() => accountService.requestContactReset('email', newEmail));
+}
+
+export async function confirmEmailChangeAction(token: string, newEmail: string) {
+  return safeServerAction(() => accountService.confirmContactReset('email', token, newEmail));
+}
+
+export async function requestPhoneChangeAction(newPhone: string, ddi?: string) {
+  return safeServerAction(() => accountService.requestContactReset('phone', newPhone, ddi));
+}
+
+export async function confirmPhoneChangeAction(token: string, newPhone: string, ddi?: string) {
+  return safeServerAction(() => accountService.confirmContactReset('phone', token, newPhone, ddi));
+}
+
+export async function generateTwoFactorAction() {
+  return safeServerAction(async () => {
+    const result = await twoFactorService.generate();
+    return {
+      qrcode: result.data.qrcode,
+      backupCodes: result.data.backup_codes,
+    };
+  });
+}
+
+export async function confirmTwoFactorAction(code: string) {
+  return safeServerAction(async () => {
+    await twoFactorService.confirm(code);
+    await accountService.updateAccountUser({ two_factor_authentication: true });
+  });
+}
+
+export async function disableTwoFactorAction(code: string) {
+  return safeServerAction(async () => {
+    await twoFactorService.verify(code);
+    await twoFactorService.disable();
+    await accountService.updateAccountUser({ two_factor_authentication: false });
+  });
+}

package/src/modules/accounts/actions/find-current-account.action.ts

@@ -1,9 +1,9 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { accountService } from '../services/account.service';
-import type { Account } from '../types';
-
-export async function findCurrentAccount() {
-  return safeServerAction<Account>(() => accountService.findCurrentAccount());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { accountService } from '../services/account.service';
+import type { Account } from '../types';
+
+export async function findCurrentAccount() {
+  return safeServerAction<Account>(() => accountService.findCurrentAccount());
+}

package/src/modules/accounts/actions/list-currencies.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { currencyService } from '../services/currency.service';
-
-export async function listCurrenciesAction() {
-  return safeServerAction(() => currencyService.fetchOptions());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { currencyService } from '../services/currency.service';
+
+export async function listCurrenciesAction() {
+  return safeServerAction(() => currencyService.fetchOptions());
+}

package/src/modules/accounts/actions/list-timezones.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { timezoneService } from '../services/timezone.service';
-
-export async function listTimezonesAction() {
-  return safeServerAction(() => timezoneService.fetchOptions());
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { timezoneService } from '../services/timezone.service';
+
+export async function listTimezonesAction() {
+  return safeServerAction(() => timezoneService.fetchOptions());
+}

package/src/modules/accounts/hooks/current-account.hook.tsx

@@ -1,22 +1,22 @@
-'use client';
-
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { findCurrentAccount } from '../actions/find-current-account.action';
-import { withAction } from '../../../utils/withAction';
-
-export const ACCOUNT_QUERY_KEY = ['account'];
-
-export function useCurrentAccount() {
-  return useQuery({
-    queryKey: ACCOUNT_QUERY_KEY,
-    queryFn: withAction(findCurrentAccount),
-    staleTime: 0,
-    gcTime: 10 * 60 * 1000,
-    retry: false,
-  });
-}
-
-export function useInvalidateAccount() {
-  const queryClient = useQueryClient();
-  return () => queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-}
+'use client';
+
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { findCurrentAccount } from '../actions/find-current-account.action';
+import { withAction } from '../../../utils/withAction';
+
+export const ACCOUNT_QUERY_KEY = ['account'];
+
+export function useCurrentAccount() {
+  return useQuery({
+    queryKey: ACCOUNT_QUERY_KEY,
+    queryFn: withAction(findCurrentAccount),
+    staleTime: 0,
+    gcTime: 10 * 60 * 1000,
+    retry: false,
+  });
+}
+
+export function useInvalidateAccount() {
+  const queryClient = useQueryClient();
+  return () => queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+}

package/src/modules/accounts/hooks/useAccountManagement.ts

@@ -1,85 +1,85 @@
-'use client';
-
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { USER_QUERY_KEY } from '../../auth/hooks/useUserQuery';
-import { ACCOUNT_QUERY_KEY } from './current-account.hook';
-import type {
-  UpdateAccountRequest,
-  UpdateAccountUserRequest,
-  DeleteAccountUserResponse,
-  DeleteAccountResponse,
-} from '../types';
-import {
-  updateUserAction,
-  updateAccountAction,
-  updateAccountUserByIdAction,
-  deleteAccountUserAction,
-  deleteAccountAction,
-} from '../actions/account-management.action';
-import { withAction } from '../../../utils/withAction';
-import type { UseMutationOptions } from '@tanstack/react-query';
-
-const ACCOUNT_USERS_QUERY_KEY = ['account-users'];
-
-export function useUpdateAccount() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(updateAccountAction),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-    },
-  });
-}
-
-export function useUpdateAccountUser() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(updateUserAction),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
-      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
-    },
-  });
-}
-
-export function useUpdateAccountUserById() {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(({ userId, ...user }: UpdateAccountUserRequest & { userId: number }) =>
-      updateAccountUserByIdAction(userId, user)
-    ),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-    },
-  });
-}
-
-export function useDeleteAccountUser(
-  options?: UseMutationOptions<DeleteAccountUserResponse, Error, number>
-) {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: withAction(deleteAccountUserAction),
-    ...options,
-    onSuccess: (...params) => {
-      options?.onSuccess?.(...params);
-      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
-    },
-  });
-}
-
-export function useDeleteAccount(
-  options?: UseMutationOptions<DeleteAccountResponse, Error, void>
-) {
-  return useMutation({
-    mutationFn: withAction(deleteAccountAction),
-    ...options,
-  });
-}
+'use client';
+
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { USER_QUERY_KEY } from '../../auth/hooks/useUserQuery';
+import { ACCOUNT_QUERY_KEY } from './current-account.hook';
+import type {
+  UpdateAccountRequest,
+  UpdateAccountUserRequest,
+  DeleteAccountUserResponse,
+  DeleteAccountResponse,
+} from '../types';
+import {
+  updateUserAction,
+  updateAccountAction,
+  updateAccountUserByIdAction,
+  deleteAccountUserAction,
+  deleteAccountAction,
+} from '../actions/account-management.action';
+import { withAction } from '../../../utils/withAction';
+import type { UseMutationOptions } from '@tanstack/react-query';
+
+const ACCOUNT_USERS_QUERY_KEY = ['account-users'];
+
+export function useUpdateAccount() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(updateAccountAction),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
+    },
+  });
+}
+
+export function useUpdateAccountUser() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(updateUserAction),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });
+    },
+  });
+}
+
+export function useUpdateAccountUserById() {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(({ userId, ...user }: UpdateAccountUserRequest & { userId: number }) =>
+      updateAccountUserByIdAction(userId, user)
+    ),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+    },
+  });
+}
+
+export function useDeleteAccountUser(
+  options?: UseMutationOptions<DeleteAccountUserResponse, Error, number>
+) {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: withAction(deleteAccountUserAction),
+    ...options,
+    onSuccess: (...params) => {
+      options?.onSuccess?.(...params);
+      queryClient.invalidateQueries({ queryKey: ACCOUNT_USERS_QUERY_KEY });
+    },
+  });
+}
+
+export function useDeleteAccount(
+  options?: UseMutationOptions<DeleteAccountResponse, Error, void>
+) {
+  return useMutation({
+    mutationFn: withAction(deleteAccountAction),
+    ...options,
+  });
+}

package/src/modules/accounts/hooks/useCurrencies.ts

@@ -1,15 +1,15 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listCurrenciesAction } from '../actions/list-currencies.action';
-import { withAction } from '../../../utils/withAction';
-
-export const CURRENCIES_QUERY_KEY = ['currencies'];
-
-export function useCurrencies() {
-  return useQuery({
-    queryKey: CURRENCIES_QUERY_KEY,
-    queryFn: withAction(listCurrenciesAction),
-    staleTime: Infinity,
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listCurrenciesAction } from '../actions/list-currencies.action';
+import { withAction } from '../../../utils/withAction';
+
+export const CURRENCIES_QUERY_KEY = ['currencies'];
+
+export function useCurrencies() {
+  return useQuery({
+    queryKey: CURRENCIES_QUERY_KEY,
+    queryFn: withAction(listCurrenciesAction),
+    staleTime: Infinity,
+  });
+}

package/src/modules/accounts/hooks/useTimezones.ts

@@ -1,15 +1,15 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listTimezonesAction } from '../actions/list-timezones.action';
-import { withAction } from '../../../utils/withAction';
-
-export const TIMEZONES_QUERY_KEY = ['timezones'];
-
-export function useTimezones() {
-  return useQuery({
-    queryKey: TIMEZONES_QUERY_KEY,
-    queryFn: withAction(listTimezonesAction),
-    staleTime: Infinity,
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listTimezonesAction } from '../actions/list-timezones.action';
+import { withAction } from '../../../utils/withAction';
+
+export const TIMEZONES_QUERY_KEY = ['timezones'];
+
+export function useTimezones() {
+  return useQuery({
+    queryKey: TIMEZONES_QUERY_KEY,
+    queryFn: withAction(listTimezonesAction),
+    staleTime: Infinity,
+  });
+}