prevent circular dependencies

.eslintrc.cjs

@@ -44,6 +44,7 @@ module.exports = {
             patterns: ['@/features/*/*'],
           },
         ],
+        'import/no-cycle': 'error',
         'linebreak-style': ['error', 'unix'],
         'react/prop-types': 'off',
         'import/order': [

src/components/Layout/MainLayout.tsx

@@ -12,8 +12,7 @@ import * as React from 'react';
 import { NavLink, Link } from 'react-router-dom';
 
 import logo from '@/assets/logo.svg';
-import { useLogout } from '@/lib/auth';
-import { useAuthorization, ROLES } from '@/lib/authorization';
+import { useLogout, useAuthorization, ROLES } from '@/features/auth';
 
 type SideNavigationItem = {
   name: string;

src/features/auth/components/LoginForm.tsx

@@ -3,7 +3,8 @@ import * as z from 'zod';
 
 import { Button } from '@/components/Elements';
 import { Form, InputField } from '@/components/Form';
-import { useLogin } from '@/lib/auth';
+
+import { useLogin } from '../lib/auth';
 
 const schema = z.object({
   email: z.string().min(1, 'Required'),

src/features/auth/components/RegisterForm.tsx

@@ -6,7 +6,8 @@ import * as z from 'zod';
 import { Button } from '@/components/Elements';
 import { Form, InputField, SelectField } from '@/components/Form';
 import { useTeams } from '@/features/teams';
-import { useRegister } from '@/lib/auth';
+
+import { useRegister } from '../lib/auth';
 
 const schema = z
   .object({

src/features/auth/index.ts

@@ -1,7 +1,5 @@
-export * from './api/getUser';
-export * from './api/login';
-export * from './api/register';
-export * from './api/logout';
+export * from './lib/auth';
+export * from './lib/authorization';
 
 export * from './routes';
 

src/lib/auth.tsx → src/features/auth/lib/auth.tsx

@@ -1,14 +1,10 @@
 import { configureAuth } from 'react-query-auth';
 
-import {
-  loginWithEmailAndPassword,
-  getUser,
-  registerWithEmailAndPassword,
-  UserResponse,
-  LoginCredentialsDTO,
-  RegisterCredentialsDTO,
-  logout,
-} from '@/features/auth';
+import { getUser } from '../api/getUser';
+import { LoginCredentialsDTO, loginWithEmailAndPassword } from '../api/login';
+import { logout } from '../api/logout';
+import { RegisterCredentialsDTO, registerWithEmailAndPassword } from '../api/register';
+import { UserResponse } from '../types';
 
 async function handleUserResponse(data: UserResponse) {
   const { user } = data;

src/lib/authorization.tsx → src/features/auth/lib/authorization.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 
-import { Comment } from '@/features/comments';
-import { User } from '@/features/users';
+import { type Comment } from '@/features/comments';
+import { type User } from '@/features/users';
 
 import { useUser } from './auth';
 

src/features/comments/components/CommentsList.tsx

@@ -1,9 +1,8 @@
 import { ArchiveBoxIcon } from '@heroicons/react/16/solid';
 
 import { Spinner, MDPreview } from '@/components/Elements';
+import { useUser, POLICIES, Authorization } from '@/features/auth';
 import { User } from '@/features/users';
-import { useUser } from '@/lib/auth';
-import { POLICIES, Authorization } from '@/lib/authorization';
 import { formatDate } from '@/utils/format';
 
 import { useComments } from '../api/getComments';

src/features/discussions/components/CreateDiscussion.tsx

@@ -3,7 +3,7 @@ import * as z from 'zod';
 
 import { Button } from '@/components/Elements';
 import { Form, FormDrawer, InputField, TextAreaField } from '@/components/Form';
-import { Authorization, ROLES } from '@/lib/authorization';
+import { Authorization, ROLES } from '@/features/auth';
 
 import { CreateDiscussionDTO, useCreateDiscussion } from '../api/createDiscussion';
 

src/features/discussions/components/DeleteDiscussion.tsx

@@ -1,7 +1,7 @@
 import { TrashIcon } from '@heroicons/react/16/solid';
 
 import { Button, ConfirmationDialog } from '@/components/Elements';
-import { Authorization, ROLES } from '@/lib/authorization';
+import { Authorization, ROLES } from '@/features/auth';
 
 import { useDeleteDiscussion } from '../api/deleteDiscussion';
 

src/features/discussions/components/UpdateDiscussion.tsx

@@ -3,7 +3,7 @@ import * as z from 'zod';
 
 import { Button } from '@/components/Elements';
 import { Form, FormDrawer, InputField, TextAreaField } from '@/components/Form';
-import { Authorization, ROLES } from '@/lib/authorization';
+import { Authorization, ROLES } from '@/features/auth';
 
 import { useDiscussion } from '../api/getDiscussion';
 import { UpdateDiscussionDTO, useUpdateDiscussion } from '../api/updateDiscussion';

src/features/misc/routes/Dashboard.tsx

@@ -1,6 +1,5 @@
 import { ContentLayout } from '@/components/Layout';
-import { useUser } from '@/lib/auth';
-import { ROLES } from '@/lib/authorization';
+import { useUser, ROLES } from '@/features/auth';
 
 export const Dashboard = () => {
   const user = useUser();

src/features/misc/routes/Landing.tsx

@@ -3,7 +3,7 @@ import { useNavigate } from 'react-router';
 import logo from '@/assets/logo.svg';
 import { Button } from '@/components/Elements';
 import { Head } from '@/components/Head';
-import { useUser } from '@/lib/auth';
+import { useUser } from '@/features/auth';
 
 export const Landing = () => {
   const navigate = useNavigate();

src/features/users/api/updateProfile.ts

@@ -1,6 +1,6 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { useUser } from '@/lib/auth';
+import { useUser } from '@/features/auth';
 import { axios } from '@/lib/axios';
 import { MutationConfig } from '@/lib/react-query';
 import { useNotificationStore } from '@/stores/notifications';

src/features/users/components/DeleteUser.tsx

@@ -1,5 +1,5 @@
 import { Button, ConfirmationDialog } from '@/components/Elements';
-import { useUser } from '@/lib/auth';
+import { useUser } from '@/features/auth';
 
 import { useDeleteUser } from '../api/deleteUser';
 

src/features/users/components/UpdateProfile.tsx

@@ -3,7 +3,7 @@ import * as z from 'zod';
 
 import { Button } from '@/components/Elements';
 import { Form, FormDrawer, InputField, TextAreaField } from '@/components/Form';
-import { useUser } from '@/lib/auth';
+import { useUser } from '@/features/auth';
 
 import { UpdateProfileDTO, useUpdateProfile } from '../api/updateProfile';
 

src/features/users/routes/Profile.tsx

@@ -1,5 +1,5 @@
 import { ContentLayout } from '@/components/Layout';
-import { useUser } from '@/lib/auth';
+import { useUser } from '@/features/auth';
 
 import { UpdateProfile } from '../components/UpdateProfile';
 

src/features/users/routes/Users.tsx

@@ -1,5 +1,5 @@
 import { ContentLayout } from '@/components/Layout';
-import { Authorization, ROLES } from '@/lib/authorization';
+import { Authorization, ROLES } from '@/features/auth';
 
 import { UsersList } from '../components/UsersList';
 

src/providers/app.tsx

@@ -8,8 +8,7 @@ import { BrowserRouter as Router } from 'react-router-dom';
 
 import { Button, Spinner } from '@/components/Elements';
 import { Notifications } from '@/components/Notifications/Notifications';
-// import { AuthLoader } from '@/lib/auth';
-import { AuthLoader } from '@/lib/auth';
+import { AuthLoader } from '@/features/auth';
 import { queryConfig } from '@/lib/react-query';
 
 const ErrorFallback = () => {

src/routes/index.tsx

@@ -1,7 +1,7 @@
 import { useRoutes } from 'react-router-dom';
 
+import { useUser } from '@/features/auth';
 import { Landing } from '@/features/misc';
-import { useUser } from '@/lib/auth';
 
 import { protectedRoutes } from './protected';
 import { publicRoutes } from './public';

src/test/server/utils.ts

@@ -53,7 +53,6 @@ export function requireAuth(cookies: Record<string, string>, shouldThrow = true)
   try {
     // todo: fix once tests in Github Actions are fixed
     // const encodedToken = cookies[AUTH_COOKIE];
-    console.log('cookies', cookies);
     const encodedToken = Cookies.get(AUTH_COOKIE);
     if (!encodedToken) {
       if (shouldThrow) {