chore: 🧹 eslint fixes

pages/api/v1/account/email.test.ts

@@ -6,7 +6,7 @@ import { ConfigService } from '~/services';
 vi.mock('next-auth/next');
 vi.mock('~/services');
 
-describe('PUT /api/account/updateEmail', () => {
+describe('PUT on email API', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.spyOn(console, 'log').mockImplementation(() => {});

pages/api/v1/account/email.ts

@@ -3,6 +3,7 @@ import { authOptions } from '../auth/[...nextauth]';
 import { getServerSession } from 'next-auth/next';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { EmailSettingDTO, ErrorResponse } from '~/types';
+import ApiResponse from '~/helpers/functions/apiResponse';
 
 export default async function handler(
   req: NextApiRequest & { body: EmailSettingDTO },
@@ -43,14 +44,7 @@ export default async function handler(
 
     await ConfigService.updateUsersList(updatedUsersList);
     return res.status(200).json({ message: 'Successful API send' });
-  } catch (error: any) {
-    console.log(error);
-    return res.status(500).json({
-      status: 500,
-      message:
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator',
-    });
+  } catch (error) {
+    return ApiResponse.serverError(res, error);
   }
 }

pages/api/v1/account/password.ts

@@ -3,6 +3,7 @@ import { ConfigService, AuthService } from '~/services';
 import { getServerSession } from 'next-auth/next';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { ErrorResponse, PasswordSettingDTO } from '~/types';
+import ApiResponse from '~/helpers/functions/apiResponse';
 
 export default async function handler(
   req: NextApiRequest & { body: PasswordSettingDTO },
@@ -47,14 +48,7 @@ export default async function handler(
     await ConfigService.updateUsersList(updatedUsersList);
 
     return res.status(200).json({ message: 'Successful API send' });
-  } catch (error: any) {
-    console.log(error);
-    return res.status(500).json({
-      status: 500,
-      message:
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator',
-    });
+  } catch (error) {
+    return ApiResponse.serverError(res, error);
   }
 }

pages/api/v1/account/username.ts

@@ -3,6 +3,7 @@ import { authOptions } from '../auth/[...nextauth]';
 import { getServerSession } from 'next-auth/next';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { ErrorResponse, UsernameSettingDTO } from '~/types';
+import ApiResponse from '~/helpers/functions/apiResponse';
 
 export default async function handler(
   req: NextApiRequest & { body: UsernameSettingDTO },
@@ -18,7 +19,7 @@ export default async function handler(
   }
 
   //The data we expect to receive
-  let { username } = req.body;
+  const { username } = req.body;
 
   if (typeof username !== 'string') {
     return res.status(422).json({ message: 'Unexpected data' });
@@ -51,14 +52,7 @@ export default async function handler(
     await ConfigService.updateUsersList(updatedUsersList);
 
     return res.status(200).json({ message: 'Successful API send' });
-  } catch (error: any) {
-    console.log(error);
-    return res.status(500).json({
-      status: 500,
-      message:
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator',
-    });
+  } catch (error) {
+    return ApiResponse.serverError(res, error);
   }
 }

pages/api/v1/account/wizard-env.ts

@@ -2,6 +2,7 @@ import { authOptions } from '~/pages/api/v1/auth/[...nextauth]';
 import { getServerSession } from 'next-auth/next';
 import { NextApiRequest, NextApiResponse } from 'next';
 import { ErrorResponse, WizardEnvEnum, WizardEnvType } from '~/types';
+import ApiResponse from '~/helpers/functions/apiResponse';
 
 export default async function handler(
   req: NextApiRequest,
@@ -37,7 +38,6 @@ export default async function handler(
     res.status(200).json(wizardEnv);
     return;
   } catch (error) {
-    console.log(error);
-    return res.status(500);
+    return ApiResponse.serverError(res, error);
   }
 }

pages/api/v1/cron/status.test.ts

@@ -2,6 +2,7 @@ import { createMocks } from 'node-mocks-http';
 import handler from '~/pages/api/v1/cron/status';
 import { ConfigService, NotifService, ShellService } from '~/services';
 import { AppriseModeEnum } from '~/types/domain/config.types';
+import * as childProcess from 'node:child_process';
 
 vi.mock('~/services', () => ({
   NotifService: {
@@ -157,7 +158,9 @@ describe('Cronjob API Handler', () => {
   });
 
   it('should return 500 if an error occurs', async () => {
-    vi.mocked(ConfigService.getRepoList).mockRejectedValue(new Error('Test error'));
+    vi.mocked(ConfigService.getRepoList).mockRejectedValue(
+      new Error('Repo list could not be fetched')
+    );
 
     const { req, res } = createMocks({
       method: 'POST',
@@ -168,7 +171,7 @@ describe('Cronjob API Handler', () => {
     expect(res._getStatusCode()).toBe(500);
     expect(res._getJSONData()).toEqual({
       status: 500,
-      message: 'API error, contact the administrator.',
+      message: 'Repo list could not be fetched',
     });
   });
 
@@ -253,7 +256,7 @@ describe('Cronjob API Handler', () => {
     ]);
 
     // Spy on exec to check if it is called
-    const execSpy = vi.spyOn(require('node:child_process'), 'exec');
+    const execSpy = vi.spyOn(childProcess, 'exec');
     const { req, res } = createMocks({
       method: 'POST',
       headers: { authorization: 'Bearer test-key' },

pages/api/v1/cron/status.ts

@@ -102,7 +102,7 @@ export default async function handler(
     if (error instanceof Error && error.message === 'The check status service is already running') {
       return ApiResponse.conflict(res, error.message);
     } else {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   }
 }

pages/api/v1/cron/storage.ts

@@ -44,7 +44,7 @@ export default async function handler(
     if (error instanceof Error && error.message === 'The storage used service is already running') {
       return ApiResponse.conflict(res, error.message);
     } else {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   }
 }

pages/api/v1/integration/token-manager.ts

@@ -61,7 +61,7 @@ export default async function handler(
       return res.status(200).json({ token: newToken.token });
     } catch (error) {
       console.log(error);
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'GET') {
     try {
@@ -81,7 +81,7 @@ export default async function handler(
       return res.status(200).json(tokenList);
     } catch (error) {
       console.log(error);
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'DELETE') {
     try {
@@ -91,7 +91,7 @@ export default async function handler(
         return ApiResponse.unauthorized(res);
       }
 
-      let { name } = req.body;
+      const { name } = req.body;
       if (!name) {
         return ApiResponse.badRequest(res, 'Missing token name');
       }

pages/api/v1/notif/apprise/alert.ts

@@ -28,14 +28,8 @@ export default async function handler(
       }
 
       res.status(200).json({ appriseAlert: user.appriseAlert });
-    } catch (error: any) {
-      console.log(error);
-      const errorMessage =
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator';
-
-      res.status(500).json({ status: 500, message: errorMessage });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'PUT') {
     const { appriseAlert } = req.body;
@@ -59,15 +53,8 @@ export default async function handler(
 
       await ConfigService.updateUsersList(updatedUsersList);
       return res.status(200).json({ message: 'Successful API send' });
-    } catch (error: any) {
-      console.log(error);
-      return res.status(500).json({
-        status: 500,
-        message:
-          error.code === 'ENOENT'
-            ? 'No such file or directory'
-            : 'API error, contact the administrator',
-      });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else {
     return ApiResponse.methodNotAllowed(res);

pages/api/v1/notif/apprise/mode.ts

@@ -30,14 +30,8 @@ export default async function handler(
         appriseMode: user.appriseMode,
         appriseStatelessURL: user.appriseStatelessURL,
       });
-    } catch (error: any) {
-      console.log(error);
-      const errorMessage =
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator';
-
-      res.status(500).json({ status: 500, message: errorMessage });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'PUT') {
     const { appriseMode, appriseStatelessURL } = req.body;
@@ -62,15 +56,8 @@ export default async function handler(
 
       await ConfigService.updateUsersList(updatedUsersList);
       return res.status(200).json({ message: 'Successful API send' });
-    } catch (error: any) {
-      console.log(error);
-      return res.status(500).json({
-        status: 500,
-        message:
-          error.code === 'ENOENT'
-            ? 'No such file or directory'
-            : 'API error, contact the administrator',
-      });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else {
     return ApiResponse.methodNotAllowed(res);

pages/api/v1/notif/apprise/services.ts

@@ -30,14 +30,8 @@ export default async function handler(
       res.status(200).json({
         appriseServices: user.appriseServices,
       });
-    } catch (error: any) {
-      console.log(error);
-      const errorMessage =
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator';
-
-      res.status(500).json({ status: 500, message: errorMessage });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'PUT') {
     const { appriseURLs } = req.body;
@@ -64,15 +58,8 @@ export default async function handler(
 
       await ConfigService.updateUsersList(updatedUsersList);
       return res.status(200).json({ message: 'Successful API send' });
-    } catch (error: any) {
-      console.log(error);
-      return res.status(500).json({
-        status: 500,
-        message:
-          error.code === 'ENOENT'
-            ? 'No such file or directory'
-            : 'API error, contact the administrator',
-      });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else {
     return ApiResponse.methodNotAllowed(res);

pages/api/v1/notif/email/alert.ts

@@ -26,14 +26,8 @@ export default async function handler(
         return;
       }
       res.status(200).json({ emailAlert: user.emailAlert });
-    } catch (error: any) {
-      console.log(error);
-      const errorMessage =
-        error.code === 'ENOENT'
-          ? 'No such file or directory'
-          : 'API error, contact the administrator';
-
-      res.status(500).json({ status: 500, message: errorMessage });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'PUT') {
     const { emailAlert } = req.body;
@@ -58,15 +52,8 @@ export default async function handler(
 
       await ConfigService.updateUsersList(updatedUsersList);
       return res.status(200).json({ message: 'Successful API send' });
-    } catch (error: any) {
-      console.log(error);
-      return res.status(500).json({
-        status: 500,
-        message:
-          error.code === 'ENOENT'
-            ? 'No such file or directory'
-            : 'API error, contact the administrator',
-      });
+    } catch (error) {
+      return ApiResponse.serverError(res, error);
     }
   } else {
     return ApiResponse.methodNotAllowed(res);

pages/api/v1/repositories/[slug]/index.test.ts

@@ -449,7 +449,7 @@ describe('Repository DELETE by repositoryName', () => {
     expect(res._getStatusCode()).toBe(500);
     expect(res._getJSONData()).toEqual({
       status: 500,
-      message: 'API error, contact the administrator.',
+      message: 'API error, contact the administrator',
     });
     expect(ConfigService.updateRepoList).not.toHaveBeenCalled();
   });

pages/api/v1/repositories/[slug]/index.ts

@@ -38,7 +38,7 @@ export default async function handler(
         }
       }
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
 
     try {
@@ -51,7 +51,7 @@ export default async function handler(
 
       return res.status(200).json({ repo });
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'PATCH') {
     try {
@@ -65,7 +65,7 @@ export default async function handler(
         }
       }
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
 
     try {
@@ -139,7 +139,7 @@ export default async function handler(
         }
       }
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
 
     if (process.env.DISABLE_DELETE_REPO === 'true') {
@@ -158,7 +158,7 @@ export default async function handler(
 
       if (stderr) {
         console.log('Delete repository error: ', stderr);
-        return ApiResponse.serverError(res);
+        return ApiResponse.serverError(res, undefined, 'Error deleting repository');
       }
 
       const updatedRepoList = repoList.filter((repo) => repo.repositoryName !== slug);
@@ -170,7 +170,7 @@ export default async function handler(
       );
     } catch (error) {
       console.log(error);
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   } else {
     return ApiResponse.methodNotAllowed(res);

pages/api/v1/repositories/index.ts

@@ -31,7 +31,7 @@ export default async function handler(
         }
       }
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
 
     try {
@@ -39,7 +39,7 @@ export default async function handler(
 
       return res.status(200).json({ repoList });
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
   } else if (req.method == 'POST') {
     try {
@@ -53,7 +53,7 @@ export default async function handler(
         }
       }
     } catch (error) {
-      return ApiResponse.serverError(res);
+      return ApiResponse.serverError(res, error);
     }
 
     try {

pages/api/v1/version/index.ts

@@ -1,4 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
+import ApiResponse from '~/helpers/functions/apiResponse';
 import packageInfo from '~/package.json';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -7,9 +8,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   }
   try {
     return res.status(200).json({ version: packageInfo.version });
-  } catch (error: any) {
-    return res.status(500).json({
-      status: 500,
-    });
+  } catch (error) {
+    return ApiResponse.serverError(res, error);
   }
 }