@galadrim/galadmin 0.1.228 → 0.1.230

package/dist/types/config.d.ts

@@ -360,6 +360,7 @@ export type AuthRole = {
     useArgon2?: boolean;
 };
 export type Config = {
+    enriched?: boolean;
     name: string;
     sessionSecret: string;
     useMysql2?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.228",
+  "version": "0.1.230",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -41,7 +41,8 @@
     "@types/express": "^4.17.13",
     "@types/express-session": "1.17.0",
     "@types/mime": "^2.0.3",
-    "@types/node": "^16.18.11"
+    "@types/node": "^16.18.11",
+    "typescript": "^5.9.3"
   },
   "repository": {
     "type": "git",

package/src/api.ts

@@ -23,12 +23,55 @@ function generateUniqueIdForObject(obj) {
   return hash;
 }
 
-export default (db, config, user) => {
+declare global {
+  namespace Express {
+    interface Request {
+      config?: any;
+    }
+  }
+}
+
+export default (db, config) => {
   const app = express();
 
+  app.use((req, res, next) => {
+    req.config = {
+      ...config,
+      views: config.views
+        .filter(x => !x.roles
+          || (req.session.user && ([...(x.roles || []), ...(x.readRoles || [])].includes(req.session.user.role)))
+        )
+        .map(view => {
+          const readOnly = req.session.user && view.roles && !view.roles.includes(req.session.user.role)
+          if (readOnly) {
+            return {
+              ...view,
+              canEdit: false,
+              canCreate: false,
+              canDelete: false,
+              clickToEdit: false
+            }
+          } else {
+            return view;
+          }
+        })
+        .map(view => {
+          if (view.type === "table") {
+            return {
+              ...view,
+              columns: view.columns.filter(column => !column.roles || (req.session.user && column.roles.includes(req.session.user.role)))
+            }
+          } else {
+            return view;
+          }
+        })
+    }
+    next();
+  });
+
   app.use(async (req, res, next) => {
-    if (!config.enriched) {
-      await enrichConfig(config, db);
+    if (!req.config.enriched) {
+      await enrichConfig(req.config, db);
     }
     next();
   });
@@ -124,7 +167,7 @@ export default (db, config, user) => {
 
   app.get("/config", async (req, res) => {
     try {
-      const { mysql, auth, sessionSecret, ...safeConfig } = config;
+      const { mysql, auth, sessionSecret, ...safeConfig } = req.config;
       res.send({
         config: serializeJs(safeConfig),
       });
@@ -201,7 +244,7 @@ export default (db, config, user) => {
   };
 
   app.post("/foreignSelectRecords", async (req, res, next) => {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const column = [
       ...view.columns,
       ...(view.recordViewPanels
@@ -222,7 +265,7 @@ export default (db, config, user) => {
           ? `${column.searchableName} LIKE '${column.wholeSearch ? "%" : ""}${queryEscaped}%'`
           : null,
         column.filtersFromUser
-          ? column.filtersFromUser(user.userId, user.role)
+          ? column.filtersFromUser(req.session.user.userId, req.session.user.role)
           : null,
       ]),
       join: column.join,
@@ -256,7 +299,7 @@ export default (db, config, user) => {
   });
 
   app.post("/records", async function (req, res, next) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const isDesc = req.body.isDesc === null ? view.isDesc : req.body.isDesc;
     const subview =
       view.subviews && req.body.subviewIndex !== undefined
@@ -277,7 +320,7 @@ export default (db, config, user) => {
           subview?.filters,
           ...req.body.filters,
           view.filtersFromUser
-            ? view.filtersFromUser(user.userId, user.role)
+            ? view.filtersFromUser(req.session.user.userId, req.session.user.role)
             : null,
         ]),
         having: subview?.having,
@@ -352,11 +395,11 @@ export default (db, config, user) => {
           " = " +
           (typeof data[key] === "string"
             ? "'" +
-              data[key]
-                .replace(/'/g, "\\'")
-                .replace(/\n/g, "")
-                .replace(/\r/g, "") +
-              "'"
+            data[key]
+              .replace(/'/g, "\\'")
+              .replace(/\n/g, "")
+              .replace(/\r/g, "") +
+            "'"
             : typeof data[key] === "object"
               ? JSON.stringify(data[key])
               : data[key]) +
@@ -400,7 +443,7 @@ export default (db, config, user) => {
   }
 
   app.post("/recordsExport", async function (req, res) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const orderBy = req.body.orderBy || view.orderBy;
     const isDesc = req.body.isDesc === null ? view.isDesc : req.body.isDesc;
     const subview =
@@ -462,7 +505,7 @@ export default (db, config, user) => {
         return res.status(500).send(err);
       }
       // Get viewIndex in fields
-      const view = config.views[fields.viewIndex[0]];
+      const view = req.config.views[fields.viewIndex[0]];
       if (typeof view.parseImportFile !== "function") {
         return res
           .status(500)
@@ -553,7 +596,7 @@ export default (db, config, user) => {
         return res.status(500).send(err);
       }
       // Get viewIndex and panelIndex in fields
-      const view = config.views[fields.viewIndex[0]];
+      const view = req.config.views[fields.viewIndex[0]];
       const panel = view.recordViewPanels[fields.panelIndex[0]];
       if (typeof panel.parseImportFile !== "function") {
         return res
@@ -634,13 +677,13 @@ export default (db, config, user) => {
   });
 
   app.get("/record", async function (req, res) {
-    const view = config.views[req.query.viewIndex as string];
+    const view = req.config.views[req.query.viewIndex as string];
     const { err, rows } = await db.query(
       "SELECT " +
-        (view.selectExpression || "*") +
-        " FROM ?? " +
-        (view.join || "") +
-        " WHERE ?? = ?",
+      (view.selectExpression || "*") +
+      " FROM ?? " +
+      (view.join || "") +
+      " WHERE ?? = ?",
       [
         view.tableName,
         view.tableName + "." + view.primaryId,
@@ -665,7 +708,7 @@ export default (db, config, user) => {
   });
 
   app.post("/updateRecord", async function (req, res, next) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     for (let key in req.body.data) {
       if (
         req.body.data[key] == "NULL" ||
@@ -703,7 +746,7 @@ export default (db, config, user) => {
           data: req.body.data,
           previousData: req.body.previousData,
         });
-      } catch (e) {}
+      } catch (e) { }
     }
     if (view.editCallbackFunction) {
       await view.editCallbackFunction({
@@ -715,20 +758,20 @@ export default (db, config, user) => {
   });
 
   app.post("/customAction", async function (req, res, next) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const action = view.customActions[req.body.actionIndex];
     for (const recordId of req.body.selectedRecordIds) {
       try {
         const { rows } = await db.query(
           "SELECT " +
-            (view.selectExpression || "*") +
-            " FROM ?? " +
-            (view.join || "") +
-            " WHERE ?? = ?",
+          (view.selectExpression || "*") +
+          " FROM ?? " +
+          (view.join || "") +
+          " WHERE ?? = ?",
           [view.tableName, view.tableName + "." + view.primaryId, recordId]
         );
         const record = rows[0];
-        const actionResult = await action.action(record, user.userId);
+        const actionResult = await action.action(record, req.session.user.userId);
         if (actionResult) {
           return res.send({
             success: true,
@@ -750,13 +793,13 @@ export default (db, config, user) => {
   });
 
   app.post("/deleteRecord", async function (req, res) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const { rows, err: err2 } = await db.query(
       "SELECT " +
-        (view.selectExpression || "*") +
-        " FROM ?? " +
-        (view.join || "") +
-        " WHERE ?? = ?",
+      (view.selectExpression || "*") +
+      " FROM ?? " +
+      (view.join || "") +
+      " WHERE ?? = ?",
       [
         view.tableName,
         view.tableName + "." + view.primaryId,
@@ -783,7 +826,7 @@ export default (db, config, user) => {
         await axios.post(view.deleteCallback, {
           id: req.body.primaryValue,
         });
-      } catch (e) {}
+      } catch (e) { }
     }
     if (view.deleteCallbackFunction) {
       await view.deleteCallbackFunction({
@@ -795,7 +838,7 @@ export default (db, config, user) => {
   });
 
   app.post("/deleteRecordFromPanel", async function (req, res) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const panel = view.recordViewPanels.find(
       (x) => x.__id__ === req.body.panelId
     );
@@ -820,7 +863,7 @@ export default (db, config, user) => {
         await axios.post(panel.deleteCallback, {
           id: req.body.primaryValue,
         });
-      } catch (e) {}
+      } catch (e) { }
     }
     if (panel.deleteCallbackFunction) {
       await panel.deleteCallbackFunction({
@@ -832,7 +875,7 @@ export default (db, config, user) => {
   });
 
   app.post("/deleteRecords", async function (req, res, next) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const { err } = await db.query(
       `DELETE FROM ?? WHERE ?? IN(${req.body.primaryValues.map((x) => "'" + x + "'").join(",")})`,
       [view.tableName, view.primaryId]
@@ -866,7 +909,7 @@ export default (db, config, user) => {
       }
     }
 
-    for (const view of config.views) {
+    for (const view of req.config.views) {
       await checkAndGetNotificationBadge(view);
       if (view.subviews) {
         for (const subview of view.subviews) {
@@ -923,7 +966,7 @@ export default (db, config, user) => {
   });
 
   app.post("/createRecord", async function (req, res, next) {
-    const view = config.views[req.body.viewIndex];
+    const view = req.config.views[req.body.viewIndex];
     const panel = req.body.panelIndex
       ? view.recordViewPanels[req.body.panelIndex]
       : null;
@@ -982,7 +1025,7 @@ export default (db, config, user) => {
             id: r.insertId,
             data: req.body.data,
           });
-        } catch (e) {}
+        } catch (e) { }
       }
       if (panel ? panel.createCallbackFunction : view.createCallbackFunction) {
         await (
@@ -1015,8 +1058,8 @@ export default (db, config, user) => {
     }
     if (req.query.viewIndex && req.query.panelIndex) {
       const panel =
-        config.views[req.query.viewIndex as string].recordViewPanels[
-          req.query.panelIndex as string
+        req.config.views[req.query.viewIndex as string].recordViewPanels[
+        req.query.panelIndex as string
         ];
       if (panel.formatValue) {
         for (const row of rows) {
@@ -1171,9 +1214,9 @@ export default (db, config, user) => {
           await sftp.fastPut(
             files[fileParamName][0].path,
             column.publicPath +
-              (column.subdirectory ? "/" + column.subdirectory : "") +
-              "/" +
-              filename
+            (column.subdirectory ? "/" + column.subdirectory : "") +
+            "/" +
+            filename
           );
           await sftp.end();
           res.send({
@@ -1211,7 +1254,7 @@ export default (db, config, user) => {
   );
 
   app.post("/uploadFile", async function (req, res, next) {
-    const view = config.views[req.query.viewIndex as string];
+    const view = req.config.views[req.query.viewIndex as string];
     const column = [
       ...view.columns,
       ...(view.recordViewPanels

package/src/index.ts

@@ -151,39 +151,7 @@ export default (config: Config): any => {
         }
     })
 
-    app.use("/api", (req, res, next) => {
-        return api(db, {
-            ...config,
-            views: config.views
-                .filter(x => !x.roles
-                    || (req.session.user && ([...(x.roles || []), ...(x.readRoles || [])].includes(req.session.user.role)))
-                )
-                .map(view => {
-                    const readOnly = req.session.user && view.roles && !view.roles.includes(req.session.user.role)
-                    if (readOnly) {
-                        return {
-                            ...view,
-                            canEdit: false,
-                            canCreate: false,
-                            canDelete: false,
-                            clickToEdit: false
-                        }
-                    } else {
-                        return view;
-                    }
-                })
-                .map(view => {
-                    if (view.type === "table") {
-                        return {
-                            ...view,
-                            columns: view.columns.filter(column => !column.roles || (req.session.user && column.roles.includes(req.session.user.role)))
-                        }
-                    } else {
-                        return view;
-                    }
-                })
-        }, req.session.user)(req, res, next)
-    })
+    app.use("/api", api(db, config))
 
     // Serve static files
     app.get("*", (req, res) => {

package/src/types/config.ts

@@ -429,6 +429,9 @@ export type AuthRole = {
 };
 
 export type Config = {
+  /** Ne pas renseigner !!! */
+  enriched?: boolean;
+
   /** Nom du projet */
   name: string;
 

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "module": "commonjs",
+    "skipLibCheck": true,
     "declaration": true,
     "removeComments": true,
     "emitDecoratorMetadata": true,