refactor!: Move captcha keys to app.module.ts / remove config files

apps/backend/.gitignore

@@ -66,5 +66,4 @@ report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 !/uploads/temp/index.html
 
 # Configuration
-/src/plugins/*/admin/database/migrations
 /src/plugins/core/

apps/backend/src/app.module.ts

@@ -17,6 +17,11 @@ import { PluginsModule } from './plugins/plugins.module';
         config: DATABASE_ENVS,
         schemaDatabase,
       },
+      // captcha: {
+      //   type: 'cloudflare_turnstile',
+      //   secret_key: '',
+      //   site_key: '',
+      // },
       // email: emailResend({
       //   api_key: process.env.EMAIL_RESEND_API_KEY,
       //   from: process.env.EMAIL_RESEND_FROM,

apps/frontend/src/plugins/admin/langs/en.json

@@ -141,28 +141,6 @@
             "send_testing_email": "Send Testing Email"
           }
         },
-        "security": {
-          "captcha": {
-            "title": "Captcha",
-            "desc": "Captcha is a security feature that requires users to complete a challenge to prove they are human. This helps prevent spam and abuse.",
-            "type": {
-              "title": "Type",
-              "none": {
-                "title": "None"
-              },
-              "recaptcha_desc": "Read more on <link>Google reCAPTCHA</link>.",
-              "recaptcha_v2_invisible": "reCAPTCHA v2 Invisible",
-              "recaptcha_v2_checkbox": "reCAPTCHA v2 Checkbox",
-              "recaptcha_v3": "reCAPTCHA v3",
-              "cloudflare_turnstile": {
-                "title": "Cloudflare Turnstile",
-                "desc": "Read more on <link>Cloudflare Turnstile</link>."
-              }
-            },
-            "site_key": "Site Key",
-            "secret_key": "Secret Key"
-          }
-        },
         "authorization": {
           "title": "Authorization",
           "desc": "Manage authorization settings for your website.",
@@ -569,30 +547,6 @@
             "submit": "Yes, delete file"
           }
         }
-      },
-      "security": {
-        "spam": {
-          "title": "Spam Protection",
-          "captcha": {
-            "title": "Captcha",
-            "type": {
-              "title": "Type",
-              "none": {
-                "title": "None"
-              },
-              "recaptcha_desc": "Read more on <link>Google reCAPTCHA</link>.",
-              "recaptcha_v2_invisible": "reCAPTCHA v2 Invisible",
-              "recaptcha_v2_checkbox": "reCAPTCHA v2 Checkbox",
-              "recaptcha_v3": "reCAPTCHA v3",
-              "cloudflare_turnstile": {
-                "title": "Cloudflare Turnstile",
-                "desc": "Read more on <link>Cloudflare Turnstile</link>."
-              }
-            },
-            "site_key": "Site Key",
-            "secret_key": "Secret Key"
-          }
-        }
       }
     },
     "members": {

apps/frontend/src/plugins/core/langs/en.json

@@ -358,8 +358,6 @@
       "settings_email": "Email",
       "settings_authorization": "Authorization",
       "settings_legal": "Legal & Policies",
-      "security": "Security",
-      "security_spam": "Spam Protection",
       "plugins": "Plugins",
       "styles": "Styles",
       "styles_theme-editor": "Theme Editor",
@@ -379,8 +377,6 @@
       "can_manage_settings_authorization": "Can manage authorization settings?",
       "can_manage_settings_legal": "Can manage legal settings?",
       "can_manage_plugins": "Can manage plugins?",
-      "security": "Security",
-      "can_manage_security_spam": "Can manage spam protection?",
       "styles": "Styles",
       "can_manage_styles_theme-editor": "Can manage theme editor?",
       "can_manage_styles_nav": "Can manage navigation?",

packages/backend/scripts/generate-manifest.ts

@@ -88,22 +88,6 @@ export const generateManifest = async ({
     process.exit(1);
   }
 
-  const configPath = join(
-    process.cwd(),
-    'src',
-    'plugins',
-    'core',
-    'utils',
-    'config.json',
-  );
-
-  if (!existsSync(configPath)) {
-    console.log(
-      `⛔️ Config file not found in 'backend/utils/config.json' directory. "${configPath}"`,
-    );
-    process.exit(1);
-  }
-
   const languages = await db.query.core_languages.findMany({
     columns: {
       code: true,

packages/backend/scripts/setup.ts

@@ -9,7 +9,6 @@ import coreSchemaDatabase from '../src/database';
 import { checkUpdateSchemaDatabase } from './check-update-schema-database';
 import { copyFiles } from './copy-files';
 import { generateDatabaseMigrations, runMigrations } from './database';
-import { generateConfig } from './generate-config';
 import { generateManifest } from './generate-manifest';
 import { updatePlugins } from './update-plugins';
 
@@ -37,12 +36,7 @@ const init = async () => {
 
   const pluginsPath = getPluginsPath();
   console.log(
-    `${initConsole} [1/${skipDatabase ? 2 : 7}] Setup the project. Generating the config file...`,
-  );
-  await generateConfig({ pluginsPath });
-
-  console.log(
-    `${initConsole} [2/${skipDatabase ? 2 : 7}] Copying files into backend...`,
+    `${initConsole} [1/${skipDatabase ? 1 : 6}] Copying files into backend...`,
   );
   await copyFiles({ pluginsPath });
 
@@ -51,7 +45,7 @@ const init = async () => {
     process.exit(0);
   }
 
-  console.log(`${initConsole} [3/7] Generating database migrations...`);
+  console.log(`${initConsole} [2/6] Generating database migrations...`);
   await generateDatabaseMigrations();
 
   const database = createClientDatabase({
@@ -60,17 +54,17 @@ const init = async () => {
   });
 
   console.log(
-    `${initConsole} [4/7] Create tables in database using migrations...`,
+    `${initConsole} [3/6] Create tables in database using migrations...`,
   );
   await runMigrations();
 
-  console.log(`${initConsole} [5/7] Updating plugins...`);
+  console.log(`${initConsole} [4/6] Updating plugins...`);
   await updatePlugins({ pluginsPath, db: database.db });
 
-  console.log(`${initConsole} [6/7] Checking and updating schema database...`);
+  console.log(`${initConsole} [5/6] Checking and updating schema database...`);
   await checkUpdateSchemaDatabase({ db: database.db });
 
-  console.log(`${initConsole} [7/7] Generating the manifest files...`);
+  console.log(`${initConsole} [6/6] Generating the manifest files...`);
   await generateManifest({ db: database.db });
 
   console.log(`${initConsole} ✅ Project setup complete.`);

packages/backend/src/app.module.ts

@@ -9,6 +9,7 @@ import { join } from 'path';
 
 import { CoreModule } from './core/core.module';
 import { SSOAuthItem } from './helpers/auth/sso/sso.service';
+import { CaptchaConfig } from './helpers/captcha/captcha.service';
 import { EmailSenderFunction } from './helpers/email/email-helpers.type';
 import { GlobalHelpersModule } from './helpers/helpers.module';
 import {
@@ -171,7 +172,9 @@ export class VitNodeCoreModule {
     database,
     email,
     ssoLoginMethod,
+    captcha,
   }: {
+    captcha?: CaptchaConfig;
     database: DatabaseModuleArgs;
     email?: EmailSenderFunction;
     ssoLoginMethod?: SSOAuthItem[];
@@ -207,7 +210,7 @@ export class VitNodeCoreModule {
             maxAge: 31536000,
           },
         }),
-        GlobalHelpersModule.register({ email, ssoLoginMethod }),
+        GlobalHelpersModule.register({ email, ssoLoginMethod, captcha }),
       ],
     };
   }

packages/backend/src/core/admin/admin.module.ts

@@ -6,7 +6,6 @@ import { DashboardAdminModule } from './dashboard/dashboard.module';
 import { LanguagesAdminModule } from './languages/languages.module';
 import { MembersAdminModule } from './members/members.module';
 import { PluginsAdminModule } from './plugins/plugins.module';
-import { SecurityAdminModule } from './security/security.module';
 import { SettingsAdminModule } from './settings/settings.module';
 import { StylesAdminModule } from './styles/styles.module';
 
@@ -19,7 +18,6 @@ import { StylesAdminModule } from './styles/styles.module';
     PluginsAdminModule,
     StylesAdminModule,
     AdvancedAdminModule,
-    SecurityAdminModule,
     DashboardAdminModule,
   ],
 })

packages/backend/src/core/admin/auth/services/nav/core.nav.ts

@@ -53,17 +53,6 @@ export const coreNav: ShowAuthAdminObj['nav'] = [
           },
         ],
       },
-      {
-        code: 'security',
-        icon: 'shield',
-        keywords: [],
-        children: [
-          {
-            code: 'spam',
-            keywords: ['spam', 'report', 'reporting', 'recaptcha'],
-          },
-        ],
-      },
       {
         code: 'styles',
         icon: 'paintbrush',

packages/backend/src/core/admin/members/staff/admin/helpers/core-admin-permissions.ts

@@ -19,10 +19,6 @@ export const coreAdminPermissions: PermissionsStaffObj[] = [
           'can_manage_settings_legal',
         ],
       },
-      {
-        id: 'security',
-        permissions: ['can_manage_security_spam'],
-      },
       {
         id: 'can_manage_plugins',
         permissions: [],