fix: move auth client and config in features folder

ivan-dalmet · ivan-dalmet · commit b2af504a362b · 2025-07-04T11:56:45.000+02:00
diff --git a/app/emails/templates/login-code.tsx b/app/emails/templates/login-code.tsx
@@ -1,11 +1,11 @@
 import { Container, Heading, Section, Text } from '@react-email/components';
 
-import { AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES } from '@/lib/auth/config';
 import i18n from '@/lib/i18n';
 
 import { EmailFooter } from '@/emails/components/email-footer';
 import { EmailLayout } from '@/emails/components/email-layout';
 import { styles } from '@/emails/styles';
+import { AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES } from '@/features/auth/config';
 
 export const TemplateLoginCode = (props: {
   language: string;
diff --git a/app/features/account/change-name-drawer.tsx b/app/features/account/change-name-drawer.tsx
@@ -6,7 +6,6 @@ import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
 import { orpc } from '@/lib/orpc/client';
 
 import {
@@ -31,6 +30,7 @@ import {
   FormFieldsAccountUpdateName,
   zFormFieldsAccountUpdateName,
 } from '@/features/account/schema';
+import { authClient } from '@/features/auth/client';
 
 export const ChangeNameDrawer = (props: { children: ReactNode }) => {
   const { t } = useTranslation(['account']);
diff --git a/app/features/account/user-card.tsx b/app/features/account/user-card.tsx
@@ -1,15 +1,14 @@
 import { LogOutIcon, PenLineIcon } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 
-import { authClient } from '@/lib/auth/client';
-
 import { Avatar, AvatarFallback } from '@/components/ui/avatar';
 import { Badge } from '@/components/ui/badge';
 import { Button } from '@/components/ui/button';
 import { Card, CardAction, CardHeader, CardTitle } from '@/components/ui/card';
 
 import { AccountCardRow } from '@/features/account/account-card-row';
 import { ChangeNameDrawer } from '@/features/account/change-name-drawer';
+import { authClient } from '@/features/auth/client';
 import { ConfirmSignOut } from '@/features/auth/confirm-signout';
 
 export const UserCard = () => {
diff --git a/app/features/auth/client.ts b/app/features/auth/client.ts
@@ -8,7 +8,7 @@ import { createAuthClient } from 'better-auth/react';
 import { envClient } from '@/env/client';
 import type { Auth } from '@/server/auth';
 
-import { permissions } from '../../features/auth/permissions';
+import { permissions } from './permissions';
 
 export const authClient = createAuthClient({
   baseURL: `${envClient.VITE_BASE_URL}/api/auth`,
diff --git a/app/features/auth/config.ts b/app/features/auth/config.ts
diff --git a/app/features/auth/confirm-signout.tsx b/app/features/auth/confirm-signout.tsx
@@ -3,10 +3,10 @@ import { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
-
 import { ConfirmResponsiveDrawer } from '@/components/ui/confirm-responsive-drawer';
 
+import { authClient } from '@/features/auth/client';
+
 export const ConfirmSignOut = (props: {
   children: ReactElement<{ onClick: () => unknown }>;
 }) => {
diff --git a/app/features/auth/guard-authenticated.tsx b/app/features/auth/guard-authenticated.tsx
@@ -1,11 +1,10 @@
 import { useRouter } from '@tanstack/react-router';
 import { ReactNode } from 'react';
 
-import { authClient } from '@/lib/auth/client';
-
 import { PageError } from '@/components/page-error';
 import { Spinner } from '@/components/ui/spinner';
 
+import { authClient } from '@/features/auth/client';
 import { PageOnboarding } from '@/features/auth/page-onboarding';
 import { Permission, Role } from '@/features/auth/permissions';
 
diff --git a/app/features/auth/guard-public-only.tsx b/app/features/auth/guard-public-only.tsx
@@ -1,10 +1,9 @@
 import { ReactNode } from 'react';
 
-import { authClient } from '@/lib/auth/client';
-
 import { PageError } from '@/components/page-error';
 import { Spinner } from '@/components/ui/spinner';
 
+import { authClient } from '@/features/auth/client';
 import { useRedirectAfterLogin } from '@/features/auth/utils';
 
 export const GuardPublicOnly = ({ children }: { children?: ReactNode }) => {
diff --git a/app/features/auth/page-login-verify.tsx b/app/features/auth/page-login-verify.tsx
@@ -5,12 +5,6 @@ import { SubmitHandler, useForm } from 'react-hook-form';
 import { Trans, useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
-import {
-  AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES,
-  AUTH_SIGNUP_ENABLED,
-} from '@/lib/auth/config';
-
 import {
   Form,
   FormField,
@@ -20,6 +14,11 @@ import {
 } from '@/components/form';
 import { Button } from '@/components/ui/button';
 
+import { authClient } from '@/features/auth/client';
+import {
+  AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES,
+  AUTH_SIGNUP_ENABLED,
+} from '@/features/auth/config';
 import { useMascot } from '@/features/auth/mascot';
 import {
   FormFieldsLoginVerify,
diff --git a/app/features/auth/page-login.tsx b/app/features/auth/page-login.tsx
@@ -5,9 +5,6 @@ import { SubmitHandler, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
-import { AUTH_SIGNUP_ENABLED } from '@/lib/auth/config';
-
 import {
   Form,
   FormField,
@@ -16,6 +13,8 @@ import {
 } from '@/components/form';
 import { Button } from '@/components/ui/button';
 
+import { authClient } from '@/features/auth/client';
+import { AUTH_SIGNUP_ENABLED } from '@/features/auth/config';
 import { useMascot } from '@/features/auth/mascot';
 import { FormFieldsLogin, zFormFieldsLogin } from '@/features/auth/schema';
 import { LoginEmailHint } from '@/features/devtools/login-hint';
diff --git a/app/features/auth/page-onboarding.tsx b/app/features/auth/page-onboarding.tsx
@@ -5,7 +5,6 @@ import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
 import { orpc } from '@/lib/orpc/client';
 
 import {
@@ -16,6 +15,7 @@ import {
 } from '@/components/form';
 import { Button } from '@/components/ui/button';
 
+import { authClient } from '@/features/auth/client';
 import { ConfirmSignOut } from '@/features/auth/confirm-signout';
 import { LayoutLogin } from '@/features/auth/layout-login';
 import { useMascot } from '@/features/auth/mascot';
diff --git a/app/features/auth/permissions.ts b/app/features/auth/permissions.ts
@@ -6,7 +6,7 @@ import {
 import { adminAc, defaultStatements } from 'better-auth/plugins/admin/access';
 import { z } from 'zod';
 
-import { authClient } from '@/lib/auth/client';
+import { authClient } from '@/features/auth/client';
 
 const statement = {
   ...defaultStatements,
diff --git a/app/features/auth/utils.ts b/app/features/auth/utils.ts
@@ -1,8 +1,7 @@
 import { useRouter, useSearch } from '@tanstack/react-router';
 import { useEffect } from 'react';
 
-import { authClient } from '@/lib/auth/client';
-
+import { authClient } from '@/features/auth/client';
 import { Role } from '@/features/auth/permissions';
 
 export const useRedirectAfterLogin = () => {
diff --git a/app/features/auth/with-permission.tsx b/app/features/auth/with-permission.tsx
@@ -1,7 +1,6 @@
 import { ReactNode } from 'react';
 
-import { authClient } from '@/lib/auth/client';
-
+import { authClient } from '@/features/auth/client';
 import { Permission, Role } from '@/features/auth/permissions';
 
 export const WithPermissions = (props: {
diff --git a/app/features/demo/demo-app-switch.tsx b/app/features/demo/demo-app-switch.tsx
@@ -2,7 +2,6 @@ import { Link, useMatchRoute } from '@tanstack/react-router';
 import { ArrowRightIcon } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 
-import { authClient } from '@/lib/auth/client';
 import { cn } from '@/lib/tailwind/utils';
 
 import { Badge } from '@/components/ui/badge';
@@ -16,6 +15,7 @@ import {
   CardTitle,
 } from '@/components/ui/card';
 
+import { authClient } from '@/features/auth/client';
 import { Role } from '@/features/auth/permissions';
 
 export const DemoAppSwitch = () => {
diff --git a/app/features/devtools/login-hint.tsx b/app/features/devtools/login-hint.tsx
@@ -1,11 +1,10 @@
 import { TerminalIcon } from 'lucide-react';
 import { useFormContext } from 'react-hook-form';
 
-import { AUTH_EMAIL_OTP_MOCKED } from '@/lib/auth/config';
-
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 
 import { envClient } from '@/env/client';
+import { AUTH_EMAIL_OTP_MOCKED } from '@/features/auth/config';
 
 export const LoginEmailHint = () => {
   const form = useFormContext();
diff --git a/app/features/user/manager/form-user.tsx b/app/features/user/manager/form-user.tsx
@@ -1,14 +1,13 @@
 import { useFormContext } from 'react-hook-form';
 
-import { authClient } from '@/lib/auth/client';
-
 import {
   FormField,
   FormFieldController,
   FormFieldHelper,
   FormFieldLabel,
 } from '@/components/form';
 
+import { authClient } from '@/features/auth/client';
 import { rolesNames } from '@/features/auth/permissions';
 import { FormFieldsUser } from '@/features/user/schema';
 
diff --git a/app/features/user/manager/page-user-update.tsx b/app/features/user/manager/page-user-update.tsx
@@ -7,7 +7,6 @@ import { AlertCircleIcon } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
 import { orpc } from '@/lib/orpc/client';
 
 import { BackButton } from '@/components/back-button';
@@ -16,6 +15,7 @@ import { Button } from '@/components/ui/button';
 import { Card, CardContent } from '@/components/ui/card';
 import { Skeleton } from '@/components/ui/skeleton';
 
+import { authClient } from '@/features/auth/client';
 import { FormUser } from '@/features/user/manager/form-user';
 import { zFormFieldsUser } from '@/features/user/schema';
 import {
diff --git a/app/features/user/manager/page-user.tsx b/app/features/user/manager/page-user.tsx
@@ -12,7 +12,6 @@ import { AlertCircleIcon, PencilLineIcon, Trash2Icon } from 'lucide-react';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'sonner';
 
-import { authClient } from '@/lib/auth/client';
 import { orpc } from '@/lib/orpc/client';
 
 import { BackButton } from '@/components/back-button';
@@ -41,6 +40,7 @@ import { ResponsiveIconButton } from '@/components/ui/responsive-icon-button';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Spinner } from '@/components/ui/spinner';
 
+import { authClient } from '@/features/auth/client';
 import { WithPermissions } from '@/features/auth/with-permission';
 import {
   PageLayout,
diff --git a/app/layout/manager/nav-user.tsx b/app/layout/manager/nav-user.tsx
@@ -15,8 +15,6 @@ import { useTheme } from 'next-themes';
 import { useTranslation } from 'react-i18next';
 import { match } from 'ts-pattern';
 
-import { authClient } from '@/lib/auth/client';
-
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
 import {
   DropdownMenu,
@@ -37,6 +35,7 @@ import {
 } from '@/components/ui/sidebar';
 import { themes } from '@/components/ui/theme-switcher';
 
+import { authClient } from '@/features/auth/client';
 import { ConfirmSignOut } from '@/features/auth/confirm-signout';
 import { WithPermissions } from '@/features/auth/with-permission';
 import { BuildInfoDrawer } from '@/features/build-info/build-info-drawer';
diff --git a/app/routes/__root.tsx b/app/routes/__root.tsx
@@ -10,13 +10,13 @@ import { createServerFn } from '@tanstack/react-start';
 import { type ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { authClient } from '@/lib/auth/client';
 import i18n, { syncLanguage } from '@/lib/i18n';
 import { AVAILABLE_LANGUAGES } from '@/lib/i18n/constants';
 
 import { PageError } from '@/components/page-error';
 import { PageErrorBoundary } from '@/components/page-error-boundary';
 
+import { authClient } from '@/features/auth/client';
 import { EnvHint, getEnvHintTitlePrefix } from '@/features/devtools/env-hint';
 import { Providers } from '@/providers';
 import { getUserLanguage } from '@/server/utils';
diff --git a/app/server/auth.tsx b/app/server/auth.tsx
@@ -3,16 +3,16 @@ import { prismaAdapter } from 'better-auth/adapters/prisma';
 import { admin, emailOTP, openAPI } from 'better-auth/plugins';
 import { match } from 'ts-pattern';
 
-import {
-  AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES,
-  AUTH_EMAIL_OTP_MOCKED,
-  AUTH_SIGNUP_ENABLED,
-} from '@/lib/auth/config';
 import i18n from '@/lib/i18n';
 
 import TemplateLoginCode from '@/emails/templates/login-code';
 import { envClient } from '@/env/client';
 import { envServer } from '@/env/server';
+import {
+  AUTH_EMAIL_OTP_EXPIRATION_IN_MINUTES,
+  AUTH_EMAIL_OTP_MOCKED,
+  AUTH_SIGNUP_ENABLED,
+} from '@/features/auth/config';
 import { permissions } from '@/features/auth/permissions';
 import { db } from '@/server/db';
 import { sendEmail } from '@/server/email';
diff --git a/e2e/utils/page-utils.ts b/e2e/utils/page-utils.ts
@@ -1,6 +1,9 @@
 import { expect, Page } from '@playwright/test';
 
-import { AUTH_EMAIL_OTP_MOCKED, AUTH_SIGNUP_ENABLED } from '@/lib/auth/config';
+import {
+  AUTH_EMAIL_OTP_MOCKED,
+  AUTH_SIGNUP_ENABLED,
+} from '@/features/auth/config';
 import { DEFAULT_LANGUAGE_KEY } from '@/lib/i18n/constants';
 
 import locales from '@/locales';
