yaml-admin-api 0.0.52 → 0.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/chart-api-generator.js

@@ -8,7 +8,7 @@ const { makeMongoSortFromYml } = require('./crud-common.js');
  * @param {*} db 
  * @param {*} yml 
  */
-const generateChartApi = async (app, db, yml) => {
+const generateChartApi = async (app, db, yml, prefix) => {
     const { front } = yml;
     const dashboard = front?.dashboard;
     if (!dashboard)
@@ -281,7 +281,7 @@ const generateChartApi = async (app, db, yml) => {
        /**
         * TODO : globalFilterDelegate not implemented
         */
-        app.get(`/api/chart/${id}`, auth.isAuthenticated, async (req, res) => {
+        app.get(`${prefix}/api/chart/${id}`, auth.isAuthenticated, async (req, res) => {
             try {
                 const { x } = chart;
                 let r

package/src/crud/login-api-generator.js

@@ -1,8 +1,8 @@
 const member = require('../member/member.js');
 
-const generateLoginApi = async(app, db, yml) => {
+const generateLoginApi = async(app, db, yml, prefix) => {
     console.log('generateLoginApi', yml.login["jwt-secret"])
-    await member(app, db, yml)
+    await member(app, db, yml, prefix)
 }
 
 module.exports = {

package/src/member/member.js

@@ -1,32 +1,36 @@
 const {withConfig} = require('../login/auth.js');
 
-module.exports = async function (app, db, yml, delegate) {
+module.exports = async function (app, db, yml, prefix) {
     const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"], passwordEncoding: yml.login["password-encoding"] });
 
-    app.get('/member/login',
+    app.get(prefix + '/member/login',
         auth.authenticate,
         function (req, res) {
             res.json({ r: true, token: req.token, member: req.user });
         }
     );
 
-    app.get('/member/islogin',
+    app.get(prefix + '/member/islogin',
         auth.isAuthenticated,
         async function (req, res) {
             res.json({ r: true, member: req.user });
         }
     );
 
-    app.post('/member/login',
+    app.post(prefix + '/member/login',
         auth.authenticate,
         function (req, res) {
             res.json({ r: true, token: req.token, member: req.user });
         }
     );
 
-    app.get('/member/logout', async (req, res) => {
+    app.get(prefix + '/member/logout', async (req, res) => {
         req.logout();
         res.json({ r: true });
     });
 
+    app.get(prefix + '/member/test', async (req, res) => {
+        res.json({ r: true });
+    });
+
 };

package/src/yml-admin-api.js

@@ -18,7 +18,7 @@ const changeEnv = (yamlString, env = {}) => {
 }
 
 async function registerRoutes(app, options = {}) {
-  const { yamlPath, yamlString, env, yamlJson } = options;
+  const { yamlPath, yamlString, env, yamlJson, prefix } = options;
   let yml;
 
   if(yamlJson) {
@@ -50,8 +50,8 @@ async function registerRoutes(app, options = {}) {
     }
   }
 
-  await generateLoginApi(app, db, yml)
-  await generateChartApi(app, db, yml)
+  await generateLoginApi(app, db, yml, prefix)
+  await generateChartApi(app, db, yml, prefix)
   
   entity && Object.keys(entity).forEach(async (entity_name) => {
     await generateEntityApi({