chore: Move auth store to features/auth

dawsontoth · dawsontoth · commit fb8c8741f89a · 2025-11-10T17:03:33.000-05:00
https://harperdb.atlassian.net/browse/STUDIO-588
diff --git a/src/config/getInstanceClient.ts b/src/config/getInstanceClient.ts
@@ -1,5 +1,5 @@
+import { authStore, EntityIds, OverallAppSignIn } from '@/features/auth/store/authStore';
 import { rejectReplicationFailures } from '@/lib/api/replication';
-import { authStore, EntityIds, OverallAppSignIn } from '@/lib/authStore';
 import axios from 'axios';
 
 interface InstanceClient {
diff --git a/src/config/instanceClientConfig.ts b/src/config/instanceClientConfig.ts
@@ -1,4 +1,4 @@
-import { EntityIds } from '@/lib/authStore';
+import { EntityIds } from '@/features/auth/store/authStore';
 import type { AxiosInstance } from 'axios';
 
 export interface InstanceClientConfig {
diff --git a/src/config/useInstanceClient.tsx b/src/config/useInstanceClient.tsx
@@ -1,7 +1,7 @@
 import { isLocalStudio } from '@/config/constants';
 import { getInstanceClient } from '@/config/getInstanceClient';
 import { InstanceClientConfig, InstanceClientIdConfig, InstanceTypeConfig } from '@/config/instanceClientConfig';
-import { OverallAppSignIn } from '@/lib/authStore';
+import { OverallAppSignIn } from '@/features/auth/store/authStore';
 import { useParams } from '@tanstack/react-router';
 
 export function useInstanceClient(operationsUrl?: string | null, port?: number, secure?: boolean) {
diff --git a/src/features/auth/ClusterInstanceSignIn.tsx b/src/features/auth/ClusterInstanceSignIn.tsx
@@ -11,13 +11,11 @@ import { activeClusterStatuses } from '@/config/clusterStatuses';
 import { defaultInstanceRoute, defaultInstanceRouteUpOne, isLocalStudio } from '@/config/constants';
 import { calculateCreateClusterDeepLink } from '@/config/deepLinks';
 import { useInstanceClientIdParams } from '@/config/useInstanceClient';
-import { currentUserQueryKey } from '@/features/auth/queries/getCurrentUser';
 import { getClusterInfoQueryOptions } from '@/features/cluster/queries/getClusterInfoQuery';
 import { useInstanceLoginMutation } from '@/features/instance/operations/mutations/useInstanceLoginMutation';
 import { getInstanceHealthQueryOptions } from '@/features/instance/operations/queries/getInstanceHealth';
 import { getInstanceUserInfo } from '@/features/instance/operations/queries/getInstanceUserInfo';
 import { SignInSchema } from '@/features/instance/operations/schemas/signInSchema';
-import { authStore, OverallAppSignIn } from '@/lib/authStore';
 import { CrossLocalhostIssueType, detectCrossLocalhostUrls } from '@/lib/urls/detectCrossLocalhostUrls';
 import { getOperationsUrlForCluster } from '@/lib/urls/getOperationsUrlForCluster';
 import { getOperationsUrlForInstance } from '@/lib/urls/getOperationsUrlForInstance';
@@ -28,6 +26,8 @@ import { useCallback, useEffect, useMemo } from 'react';
 import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 import { z } from 'zod';
+import { currentUserQueryKey } from './queries/getCurrentUser';
+import { authStore, OverallAppSignIn } from './store/authStore';
 
 export function ClusterInstanceSignIn() {
 	const navigate = useNavigate();
diff --git a/src/features/auth/ForgotPassword.tsx b/src/features/auth/ForgotPassword.tsx
@@ -1,19 +1,19 @@
+import { Button } from '@/components/ui/button';
 import { Form } from '@/components/ui/form/Form';
 import { FormControl } from '@/components/ui/form/FormControl';
 import { FormField } from '@/components/ui/form/FormField';
 import { FormItem } from '@/components/ui/form/FormItem';
 import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
+import { Input } from '@/components/ui/input';
 import { zodRequireEmail } from '@/lib/zod/email';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { Link, useNavigate, useSearch } from '@tanstack/react-router';
-import { useForgotPasswordMutation } from '@/features/auth/hooks/useForgotPassword';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
 import { toast } from 'sonner';
+import { z } from 'zod';
+import { useForgotPasswordMutation } from './hooks/useForgotPassword';
 
 const ForgotPasswordSchema = z.object({
 	email: zodRequireEmail,
diff --git a/src/features/auth/SignIn.tsx b/src/features/auth/SignIn.tsx
@@ -6,10 +6,8 @@ import { FormItem } from '@/components/ui/form/FormItem';
 import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
-import { useLoginMutation } from '@/features/auth/hooks/useSignIn';
-import { currentUserQueryKey } from '@/features/auth/queries/getCurrentUser';
+import { loginSuccessDatadogAction } from '@/integrations/datadog/datadog';
 import { reoClient } from '@/integrations/reo/reo';
-import { authStore, OverallAppSignIn } from '@/lib/authStore';
 import { parseCompanyFromEmail } from '@/lib/string/parseCompanyFromEmail';
 import { getDefaultSignedInCloudRouteForUser } from '@/lib/urls/getDefaultSignedInCloudRouteForUser';
 import { zodRequireEmail } from '@/lib/zod/email';
@@ -20,7 +18,9 @@ import { Link, useNavigate, useRouter, useSearch } from '@tanstack/react-router'
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
-import { loginSuccessDatadogAction } from '@/integrations/datadog/datadog';
+import { useLoginMutation } from './hooks/useSignIn';
+import { currentUserQueryKey } from './queries/getCurrentUser';
+import { authStore, OverallAppSignIn } from './store/authStore';
 
 const SignInSchema = z.object({
 	email: zodRequireEmail,
diff --git a/src/features/auth/SignUp.tsx b/src/features/auth/SignUp.tsx
@@ -6,7 +6,6 @@ import { FormItem } from '@/components/ui/form/FormItem';
 import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
-import { useSignUpMutation } from '@/features/auth/hooks/useSignUp';
 import { reoClient } from '@/integrations/reo/reo';
 import { parseCompanyFromEmail } from '@/lib/string/parseCompanyFromEmail';
 import { zodRequireEmail } from '@/lib/zod/email';
@@ -16,6 +15,7 @@ import { Link, useNavigate, useSearch } from '@tanstack/react-router';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
+import { useSignUpMutation } from './hooks/useSignUp';
 
 const SignInSchema = z.object({
 	email: zodRequireEmail
diff --git a/src/features/auth/VerifyEmail.tsx b/src/features/auth/VerifyEmail.tsx
@@ -6,7 +6,6 @@ import { FormItem } from '@/components/ui/form/FormItem';
 import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
-import { useVerifyEmailMutation, VerifyEmailToken } from '@/features/auth/hooks/useVerifyEmail';
 import { zodRequireEmail } from '@/lib/zod/email';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useNavigate, useSearch } from '@tanstack/react-router';
@@ -15,6 +14,7 @@ import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 import { z } from 'zod';
 import { useResendEmailVerification } from './hooks/useResendEmailVerification';
+import { useVerifyEmailMutation, VerifyEmailToken } from './hooks/useVerifyEmail';
 
 const VerifyEmailSchema = z.object({
 	email: zodRequireEmail,
diff --git a/src/features/auth/Verifying.tsx b/src/features/auth/Verifying.tsx
@@ -1,7 +1,7 @@
-import { useResendEmailVerification } from '@/features/auth/hooks/useResendEmailVerification';
 import { Link, useSearch } from '@tanstack/react-router';
 import { MouseEvent, useCallback } from 'react';
 import { toast } from 'sonner';
+import { useResendEmailVerification } from './hooks/useResendEmailVerification';
 
 export function Verifying() {
 	const { email }: { email?: string; } = useSearch({ strict: false });
diff --git a/src/features/auth/handlers/logoutOnSuccess.ts b/src/features/auth/handlers/logoutOnSuccess.ts
@@ -1,4 +1,4 @@
-import { authStore, OverallAppSignIn } from '@/lib/authStore';
+import { authStore, OverallAppSignIn } from '@/features/auth/store/authStore';
 import { clearLocalStorage } from '@/lib/storage/clearLocalStorage';
 import { clearSessionStorage } from '@/lib/storage/clearSessionStorage';
 import { queryClient } from '@/react-query/queryClient';
diff --git a/src/features/auth/hooks/useLogout.ts b/src/features/auth/hooks/useLogout.ts
@@ -3,8 +3,8 @@ import { isLocalStudio } from '@/config/constants';
 import { InstanceClientConfig } from '@/config/instanceClientConfig';
 import { useInstanceClient } from '@/config/useInstanceClient';
 import { logoutOnSuccess } from '@/features/auth/handlers/logoutOnSuccess';
+import { authStore } from '@/features/auth/store/authStore';
 import { onInstanceLogoutSubmit } from '@/features/instance/operations/mutations/onInstanceLogoutSubmit';
-import { authStore } from '@/lib/authStore';
 import { useMutation } from '@tanstack/react-query';
 
 async function onLogoutSubmit(instanceClientConfig: InstanceClientConfig) {
diff --git a/src/features/auth/routes.ts b/src/features/auth/routes.ts
@@ -1,16 +1,16 @@
 import { defaultInstanceRoute } from '@/config/constants';
-import { AuthLayout } from '@/features/auth/AuthLayout';
-import { ClusterInstanceSignIn } from '@/features/auth/ClusterInstanceSignIn';
-import { ForgotPassword } from '@/features/auth/ForgotPassword';
-import { ResetPassword } from '@/features/auth/ResetPassword';
-import { SignIn } from '@/features/auth/SignIn';
-import { SignUp } from '@/features/auth/SignUp';
-import { VerifyEmail } from '@/features/auth/VerifyEmail';
-import { Verifying } from '@/features/auth/Verifying';
-import { OverallAppSignIn } from '@/lib/authStore';
 import { getDefaultSignedInCloudRouteForUser } from '@/lib/urls/getDefaultSignedInCloudRouteForUser';
 import { rootRoute } from '@/router/rootRoute';
 import { createRoute, redirect } from '@tanstack/react-router';
+import { AuthLayout } from './AuthLayout';
+import { ClusterInstanceSignIn } from './ClusterInstanceSignIn';
+import { ForgotPassword } from './ForgotPassword';
+import { ResetPassword } from './ResetPassword';
+import { SignIn } from './SignIn';
+import { SignUp } from './SignUp';
+import { OverallAppSignIn } from './store/authStore';
+import { VerifyEmail } from './VerifyEmail';
+import { Verifying } from './Verifying';
 
 const authLayout = createRoute({
 	getParentRoute: () => rootRoute,
diff --git a/src/features/auth/store/authStore.ts b/src/features/auth/store/authStore.ts
diff --git a/src/features/cluster/FinishSetup.tsx b/src/features/cluster/FinishSetup.tsx
@@ -9,13 +9,13 @@ import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
 import { defaultClusterUsername, defaultInstanceRouteUpOne } from '@/config/constants';
 import { useInstanceClient } from '@/config/useInstanceClient';
+import { authStore } from '@/features/auth/store/authStore';
 import {
 	useInstanceResetPasswordMutation,
 } from '@/features/instance/operations/mutations/useInstanceResetPasswordMutation';
 import { getInstanceUserInfo } from '@/features/instance/operations/queries/getInstanceUserInfo';
 import { AddUserFormSchema } from '@/features/instance/operations/schemas/addUserFormSchema';
 import { useCloudAuth } from '@/hooks/useAuth';
-import { authStore } from '@/lib/authStore';
 import { getOperationsUrlForCluster } from '@/lib/urls/getOperationsUrlForCluster';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useQuery } from '@tanstack/react-query';
diff --git a/src/features/cluster/InstanceLogInCell.tsx b/src/features/cluster/InstanceLogInCell.tsx
@@ -1,10 +1,10 @@
 import { Button } from '@/components/ui/button';
 import { defaultInstanceRoute } from '@/config/constants';
 import { useInstanceClient } from '@/config/useInstanceClient';
+import { authStore } from '@/features/auth/store/authStore';
 import { onInstanceLogoutSubmit } from '@/features/instance/operations/mutations/onInstanceLogoutSubmit';
 import { useInstanceAuth } from '@/hooks/useAuth';
 import { Instance } from '@/lib/api.patch';
-import { authStore } from '@/lib/authStore';
 import { getOperationsUrlForInstance } from '@/lib/urls/getOperationsUrlForInstance';
 import { Link } from '@tanstack/react-router';
 import { LoaderCircleIcon } from 'lucide-react';
diff --git a/src/features/clusters/components/ClusterCard.tsx b/src/features/clusters/components/ClusterCard.tsx
@@ -11,6 +11,7 @@ import {
 } from '@/components/ui/dropdownMenu';
 import { activeClusterStatuses, deletedClusterStatuses } from '@/config/clusterStatuses';
 import { useInstanceClient } from '@/config/useInstanceClient';
+import { authStore } from '@/features/auth/store/authStore';
 import { getClusterInfo } from '@/features/cluster/queries/getClusterInfoQuery';
 import { ClusterCardAction } from '@/features/clusters/components/ClusterCardAction';
 import { ClusterProgress } from '@/features/clusters/components/ClusterProgress';
@@ -21,7 +22,6 @@ import { useCopyToClipboard } from '@/hooks/useCopyToClipboard';
 import { useOrganizationClusterPermissions } from '@/hooks/usePermissions';
 import { Cluster } from '@/lib/api.patch';
 import { excludeFalsy } from '@/lib/arrays/excludeFalsy';
-import { authStore } from '@/lib/authStore';
 import { getOperationsUrlForCluster } from '@/lib/urls/getOperationsUrlForCluster';
 import { useQueryClient } from '@tanstack/react-query';
 import { Link, useRouter } from '@tanstack/react-router';
diff --git a/src/features/instance/applications/context/editorFileContent.ts b/src/features/instance/applications/context/editorFileContent.ts
@@ -1,6 +1,6 @@
 import { isLocalStudio } from '@/config/constants';
+import { OverallAppSignIn } from '@/features/auth/store/authStore';
 import { useSessionStorage } from '@/hooks/useSessionStorage';
-import { OverallAppSignIn } from '@/lib/authStore';
 import { useParams } from '@tanstack/react-router';
 import { useMemo } from 'react';
 
diff --git a/src/features/instance/operations/mutations/installUsageLicense.ts b/src/features/instance/operations/mutations/installUsageLicense.ts
@@ -1,5 +1,5 @@
 import { InstanceClientConfig } from '@/config/instanceClientConfig';
-import { EntityIds } from '@/lib/authStore';
+import { EntityIds } from '@/features/auth/store/authStore';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 
 interface InstallUsageLicenseFormData extends InstanceClientConfig {
diff --git a/src/features/organizations/components/NewOrgForm.tsx b/src/features/organizations/components/NewOrgForm.tsx
@@ -8,10 +8,10 @@ import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
 import { currentUserQueryKey } from '@/features/auth/queries/getCurrentUser';
+import { authStore, OverallAppSignIn } from '@/features/auth/store/authStore';
 import { useCreateNewOrganizationMutation } from '@/features/organizations/hooks/useCreateNewOrganization';
 import { NewOrganizationSchema } from '@/features/organizations/mutations/newOrganizationSchema';
 import { useCloudAuth } from '@/hooks/useAuth';
-import { authStore, OverallAppSignIn } from '@/lib/authStore';
 import { collapseKebabsToMaxLength } from '@/lib/string/collapseKebabsToMaxLength';
 import { toKebabCase } from '@/lib/string/to-kebab-case';
 import { zodResolver } from '@hookform/resolvers/zod';
diff --git a/src/features/profile/index.tsx b/src/features/profile/index.tsx
@@ -7,10 +7,10 @@ import { FormLabel } from '@/components/ui/form/FormLabel';
 import { FormMessage } from '@/components/ui/form/FormMessage';
 import { Input } from '@/components/ui/input';
 import { logoutOnSuccess } from '@/features/auth/handlers/logoutOnSuccess';
+import { authStore, OverallAppSignIn } from '@/features/auth/store/authStore';
 import { useUpdateUserMutation } from '@/features/profile/mutations/updateUserMutation';
 import { UpdateUserSchema } from '@/features/profile/mutations/updateUserSchema';
 import { useCloudAuth } from '@/hooks/useAuth';
-import { authStore, OverallAppSignIn } from '@/lib/authStore';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useNavigate, useRouter } from '@tanstack/react-router';
 import { Save } from 'lucide-react';
diff --git a/src/hooks/useAuth.ts b/src/hooks/useAuth.ts
@@ -6,7 +6,7 @@ import {
 	authStore,
 	EntityIds,
 	OverallAppSignIn,
-} from '@/lib/authStore';
+} from '@/features/auth/store/authStore';
 import { useParams } from '@tanstack/react-router';
 import { useEffect, useState } from 'react';
 
diff --git a/src/hooks/usePermissions.ts b/src/hooks/usePermissions.ts
@@ -1,11 +1,11 @@
+import { EntityIds } from '@/features/auth/store/authStore';
 import { useCloudAuth, useInstanceAuth } from '@/hooks/useAuth';
 import {
 	LocalLegacyRolePermissionTable,
 	LocalRoleAttributePermissionAction,
 	LocalRolePermissionAction,
 	LocalRolePermissionTable,
 } from '@/lib/api.patch';
-import { EntityIds } from '@/lib/authStore';
 import { useParams } from '@tanstack/react-router';
 
 export function useOrganizationPermissions(orgId?: string): { update: boolean; remove: boolean; } {
diff --git a/src/router/dashboardRoute.ts b/src/router/dashboardRoute.ts
@@ -1,5 +1,5 @@
+import { OverallAppSignIn } from '@/features/auth/store/authStore';
 import { Dashboard } from '@/features/layouts/Dashboard';
-import { OverallAppSignIn } from '@/lib/authStore';
 import { buildRedirectInSearch } from '@/lib/urls/buildRedirectInSearch';
 import { rootRoute } from '@/router/rootRoute';
 import { createRoute, redirect } from '@tanstack/react-router';
diff --git a/src/router/rootRoute.ts b/src/router/rootRoute.ts
@@ -1,7 +1,7 @@
 import { StudioCloud } from '@/components/StudioCloud';
 import { StudioLocal } from '@/components/StudioLocal';
 import { isLocalStudio } from '@/config/constants';
-import { AuthenticatedConnection, EntityIds } from '@/lib/authStore';
+import { AuthenticatedConnection, EntityIds } from '@/features/auth/store/authStore';
 import { QueryClient } from '@tanstack/react-query';
 import { createRootRouteWithContext } from '@tanstack/react-router';
 
diff --git a/src/router/useNewRouter.ts b/src/router/useNewRouter.ts
@@ -1,6 +1,6 @@
 import { ErrorComponent } from '@/components/ErrorComponent';
 import { NotFoundComponent } from '@/components/NotFoundComponent';
-import { AuthenticatedConnection, EntityIds } from '@/lib/authStore';
+import { AuthenticatedConnection, EntityIds } from '@/features/auth/store/authStore';
 import { browserIsTouchBased } from '@/lib/browserIsTouchBased';
 import { queryClient } from '@/react-query/queryClient';
 import { rootRouteTree } from '@/router/rootRouteTree';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { EntityIds } from '@/lib/authStore';`
	`1`	`+import { EntityIds } from '@/features/auth/store/authStore';`
`2`	`2`	`import type { AxiosInstance } from 'axios';`
`3`	`3`
`4`	`4`	`export interface InstanceClientConfig {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { authStore, OverallAppSignIn } from '@/lib/authStore';`
	`1`	`+import { authStore, OverallAppSignIn } from '@/features/auth/store/authStore';`
`2`	`2`	`import { clearLocalStorage } from '@/lib/storage/clearLocalStorage';`
`3`	`3`	`import { clearSessionStorage } from '@/lib/storage/clearSessionStorage';`
`4`	`4`	`import { queryClient } from '@/react-query/queryClient';`