Merge branch 'main' of https://github.com/API-200/api200-selfhosted

Author: rangoku

Diff for: packages/backend/src/api-handler.ts

@@ -20,7 +20,7 @@ import Sentry from '@sentry/node';
 import { getFullUrlWithParams } from './modules/base/mapUrlParams';
 import { applyThirdPartyAuth } from './modules/applyThirdPartyAuth';
 import { prepareAxiosConfig } from './modules/base/prepareAxiosConfig';
-import FEATURES from './features';
+import FEATURES from '@config/features';
 
 export const createApiHandlerRouter = () => {
     const router = new Router();

Diff for: packages/backend/src/features.ts renamed to packages/backend/src/config/features.ts

@@ -10,8 +10,8 @@ import Sentry, { captureException } from '@sentry/node';
 import { supabase } from '@utils/supabase';
 import { sendEmailWithHtml } from '@modules/mailer';
 import { prepareHtml } from '@utils/templatesProcessor';
-import { getIncidentTemplate } from 'src/emails';
-import FEATURES from 'src/features';
+import { getIncidentTemplate } from '@emails/index';
+import FEATURES from '@config/features';
 import { Tables } from '@utils/database.types';
 
 const isValidHttpStatusCode = (status: unknown): boolean => {
@@ -136,4 +136,4 @@ async function saveIfIncident(
     catch (error) {
         captureException(error);
     }
-}
+}

Diff for: packages/backend/src/modules/base/handleGlobalError.ts

@@ -4,8 +4,8 @@ import { AssertionError, deepStrictEqual } from 'assert';
 import { sendEmailWithHtml } from './mailer';
 import { prepareHtml } from '@utils/templatesProcessor';
 import { Tables } from '@utils/database.types';
-import { getIncidentTemplate } from 'src/emails';
-import FEATURES from 'src/features';
+import { getIncidentTemplate } from '@emails/index';
+import FEATURES from '@config/features';
 
 export async function checkResponseSchema(userId: string, endpointData: Tables<'endpoints'>, responseSchema: any) {
     try {
@@ -76,4 +76,4 @@ export async function checkResponseSchema(userId: string, endpointData: Tables<'
     catch (e: any) {
         captureException(e);
     }
-}
+}

Diff for: packages/backend/src/modules/checkResponseSchema.ts

@@ -41,6 +41,12 @@
       ],
       "@test/*": [
         "src/test/*"
+      ],
+      "@emails/*": [
+        "src/emails/*"
+      ],
+      "@config/*": [
+        "src/config/*"
       ]
     },
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */