Merge pull request #647 from devforth/next

Next

Author: SerVitasik

adminforth/commands/createApp/templates/.env.prod.hbs

@@ -1,8 +1,4 @@
 # Add only non-sensitive production environment variables here so deployed applications can use them
 # Deliver sensitive production environment variables via your deployment platform's process environment
 
-NODE_ENV=production
-DATABASE_URL={{dbUrlProd}}
-{{#if prismaDbUrlProd}}
-PRISMA_DATABASE_URL={{prismaDbUrlProd}}
-{{/if}}
+NODE_ENV=production

adminforth/documentation/docs/tutorial/04-deploy.md

@@ -37,6 +37,7 @@ docker run -p 3500:3500 \
 ```
 
 > `-v $(pwd)/db:/code/db` is needed only if you are using SQLite database.
+> Pay attention, that ADMINFORTH_SECRET environment should be in deployed app as well
 
 Now open your browser and go to `http://localhost:3500` to see your AdminForth application running in Docker container.
 

adminforth/modules/configValidator.ts

@@ -1255,6 +1255,14 @@ export default class ConfigValidator implements IConfigValidator {
       throw new Error(`Invalid AdminForth config: ${errors.join(', ')}`);
     }
 
+    const adminforthSecret = process.env.ADMINFORTH_SECRET;
+    if (!adminforthSecret) {
+      throw new Error(`ADMINFORTH_SECRET environment not set
+        Please set ADMINFORTH_SECRET environment variable to a random string to secure your admin panel.
+        ADMINFORTH_SECRET variable is used to sign JWT tokens
+      `);
+    }
+
     this.adminforth.config = newConfig as AdminForthConfig;
   }
 

adminforth/modules/restApi.ts

@@ -946,7 +946,8 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           if (menuItem.label) {
             translateRoutines.push(
               (async () => {
-                menuItem.label = await tr(menuItem.label, `menu.${menuItem.itemId}`);
+                const rawLabel = typeof menuItem.label === 'function' ? await menuItem.label(adminUser, this.adminforth) : menuItem.label;
+                menuItem.label = await tr(rawLabel, `menu.${menuItem.itemId}`);
               })()
             );
           }

adminforth/types/Common.ts

@@ -1104,8 +1104,16 @@ export interface AdminForthConfigMenuItem {
 
   /**
    * Label for menu item which will be displayed in the admin panel.
+   * Can be a static string or a callback which receives the current admin user
+   * and returns the label dynamically.
+   *
+   * Example:
+   *
+   * ```ts
+   * label: (adminUser) => adminUser.dbUser.role === 'superadmin' ? 'Dashboard (CRS)' : 'Dashboard',
+   * ```
    */
-  label?: string,
+  label?: string | ((user: AdminUser, adminForth: IAdminForth) => Promise<string> | string),
 
   /**
    * Icon for menu item which will be displayed in the admin panel.