miolo 0.0.21 → 0.0.24

package/lib/config/defaults.js

@@ -68,35 +68,32 @@ module.exports = {
       log: 'info'
     }
   },
-  routes: {//  crud: {
-    //    path: '/crud',
-    //    options: {...},
-    //    routes: [
-    //      {
-    //        name: 'todos',
-    //        auth: {...},
-    //        options: {
-    //          useDates: true,
-    //          checkBeforeDelete: ["edition.agent_id"],
-    //          customHooks: {
-    //            beforeInsert: beforeInsertTest,
-    //            beforeUpdate: beforeUpdateTest
-    //          }
-    //        }
-    //      }
-    //    ],  
-    //  },
-    //  queries: {
-    //    options: {...},
-    //    routes: [    
-    //      {
-    //        path: '/crud/fo/bar',
-    //        auth: {...},
-    //        method: 'GET',
-    //        callback: method_receiving_params_ctx_conn
-    //      }
-    //    ]
-    //  }
+  routes: {
+    body_field: undefined,
+    getUserId: ctx => {
+      try {
+        return ctx.state.user.id;
+      } catch (e) {}
+
+      var uid = ctx.headers['user-id'];
+
+      if (uid != undefined) {
+        return uid;
+      }
+
+      return undefined;
+    },
+    // authUser: {
+    //   require: false,     // true / false / 'read-only'
+    //   action: 'redirect', // 'error'
+    //   redirect_url: '/',
+    //   error_code: 401
+    // }, 
+    crud: {
+      prefix: '',
+      routes: '*'
+    },
+    queries: undefined
   },
   cacher: {
     redis: {

package/lib/server/index.js

@@ -49,7 +49,7 @@ function miolo(_x, _x2, _x3) {
 
 function _miolo() {
   _miolo = _asyncToGenerator(function* (sconfig, render, callback) {
-    var _config$http, _config$auth, _config$auth2, _config$routes, _config$routes2;
+    var _config$http, _config$auth, _config$auth2;
 
     // Init some pieces
     var config = (0, _config.init_config)(sconfig);
@@ -96,21 +96,12 @@ function _miolo() {
     } // Routes to /crud
 
 
-    if (config !== null && config !== void 0 && (_config$routes = config.routes) !== null && _config$routes !== void 0 && _config$routes.crud) {
+    if (config !== null && config !== void 0 && config.routes) {
       var {
-        init_crud_router
-      } = require("./routes/crud");
+        init_calustra_router
+      } = require("./routes/calustra");
 
-      yield init_crud_router(app, conn, config.routes.crud);
-    } // Queries routes
-
-
-    if (config !== null && config !== void 0 && (_config$routes2 = config.routes) !== null && _config$routes2 !== void 0 && _config$routes2.queries) {
-      var {
-        init_queries_router
-      } = require("./routes/queries");
-
-      yield init_queries_router(app, conn, config.routes.queries);
+      yield init_calustra_router(app, conn, config.routes);
     } // Socket.io
     // const io= init_socket(logger)
     // io.attach(app)

package/lib/server/routes/calustra.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.init_calustra_router = init_calustra_router;
+
+var _calustraRouter = _interopRequireDefault(require("calustra-router"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function init_calustra_router(_x, _x2, _x3) {
+  return _init_calustra_router.apply(this, arguments);
+}
+
+function _init_calustra_router() {
+  _init_calustra_router = _asyncToGenerator(function* (app, conn, config) {
+    if (!config) {
+      return undefined;
+    }
+
+    var router = yield (0, _calustraRouter.default)(conn, config);
+    app.use(router.routes());
+  });
+  return _init_calustra_router.apply(this, arguments);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.21",
+  "version": "0.0.24",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",
@@ -14,8 +14,8 @@
     "assign-deep": "^1.0.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "basic-auth": "^2.0.1",
-    "calustra": "0.0.24",
-    "calustra-router": "0.0.24",
+    "calustra": "0.0.26",
+    "calustra-router": "0.0.26",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",

package/src/config/defaults.js

@@ -63,35 +63,31 @@ module.exports= {
     },
   },
   routes: {
-    //  crud: {
-    //    path: '/crud',
-    //    options: {...},
-    //    routes: [
-    //      {
-    //        name: 'todos',
-    //        auth: {...},
-    //        options: {
-    //          useDates: true,
-    //          checkBeforeDelete: ["edition.agent_id"],
-    //          customHooks: {
-    //            beforeInsert: beforeInsertTest,
-    //            beforeUpdate: beforeUpdateTest
-    //          }
-    //        }
-    //      }
-    //    ],  
-    //  },
-    //  queries: {
-    //    options: {...},
-    //    routes: [    
-    //      {
-    //        path: '/crud/fo/bar',
-    //        auth: {...},
-    //        method: 'GET',
-    //        callback: method_receiving_params_ctx_conn
-    //      }
-    //    ]
-    //  }
+    body_field: undefined,
+  
+    getUserId: (ctx) => {
+      try {
+        return ctx.state.user.id
+      } catch(e) {}
+      let uid= ctx.headers['user-id']
+      if (uid!=undefined) {
+        return uid
+      }      
+      return undefined
+    },
+  
+    // authUser: {
+    //   require: false,     // true / false / 'read-only'
+    //   action: 'redirect', // 'error'
+    //   redirect_url: '/',
+    //   error_code: 401
+    // }, 
+    
+    crud: {
+      prefix: '',
+      routes: '*'
+    },
+    queries: undefined
   },
   cacher: {
     redis: {

package/src/server/index.js

@@ -70,17 +70,10 @@ async function miolo(sconfig, render, callback) {
   }
 
   // Routes to /crud
-  if (config?.routes?.crud) {
-    const {init_crud_router} = require('./routes/crud')
-    await init_crud_router(app, conn, config.routes.crud)
+  if (config?.routes) {
+    const {init_calustra_router} = require('./routes/calustra')
+    await init_calustra_router(app, conn, config.routes)
   }
-
-  // Queries routes
-  if (config?.routes?.queries) {
-    const {init_queries_router} = require('./routes/queries')
-    await init_queries_router(app, conn, config.routes.queries)
-  }
-
   // Socket.io
   // const io= init_socket(logger)
   // io.attach(app)

package/src/server/routes/calustra.js

@@ -0,0 +1,14 @@
+import calustraRouter from 'calustra-router'
+
+async function init_calustra_router (app, conn, config) {
+
+  if (! config) {
+    return undefined
+  }
+  
+  const router= await calustraRouter(conn, config)
+  app.use(router.routes())
+  
+}
+
+export {init_calustra_router}

package/lib/server/routes/crud.js

@@ -1,53 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.init_crud_router = init_crud_router;
-
-var _calustraRouter = _interopRequireDefault(require("calustra-router"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function init_crud_router(_x, _x2, _x3) {
-  return _init_crud_router.apply(this, arguments);
-}
-
-function _init_crud_router() {
-  _init_crud_router = _asyncToGenerator(function* (app, conn, config) {
-    if (!config) {
-      return undefined;
-    }
-
-    var routerOptions = _objectSpread({
-      body_field: undefined,
-      get_user_id: ctx => {
-        try {
-          return ctx.state.user.id;
-        } catch (e) {}
-
-        var uid = ctx.headers['user-id'];
-
-        if (uid != undefined) {
-          return uid;
-        }
-
-        return undefined;
-      }
-    }, config.options);
-
-    var router = yield (0, _calustraRouter.default)(conn, config.routes, config.path, 'public', routerOptions);
-    app.use(router.routes());
-  });
-  return _init_crud_router.apply(this, arguments);
-}

package/lib/server/routes/queries.js

@@ -1,87 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.init_queries_router = init_queries_router;
-
-var _router = _interopRequireDefault(require("@koa/router"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function _check_auth(ctx, auth, method) {
-  var check = auth.require === true || auth.require === 'read-only' && method === 'POST';
-
-  if (check) {
-    var uid = undefined;
-
-    try {
-      uid = ctx.state.user.id;
-    } catch (e) {}
-
-    if (uid === undefined) {
-      if (auth.action == 'error') {
-        ctx.miolo.logger.error("Unauthorized access. Throwing error ".concat(auth.error_code || 401));
-        return ctx.throw(auth.error_code || 401, null, {});
-      } else {
-        ctx.miolo.logger.error("Unauthorized access. Redirecting to ".concat(auth.redirect_path || '/'));
-        ctx.redirect(auth.redirect_path || '/');
-      }
-    }
-  }
-}
-
-function init_queries_router(_x, _x2, _x3) {
-  return _init_queries_router.apply(this, arguments);
-}
-
-function _init_queries_router() {
-  _init_queries_router = _asyncToGenerator(function* (app, conn, queries) {
-    var routes = (queries === null || queries === void 0 ? void 0 : queries.routes) || [];
-
-    if (routes.length == 0) {
-      return;
-    }
-
-    var options = (queries === null || queries === void 0 ? void 0 : queries.options) || {};
-    var global_auth = (options === null || options === void 0 ? void 0 : options.auth) || {
-      require: false
-    };
-    var router = new _router.default();
-    routes.map(route => {
-      function route_callback(_x4) {
-        return _route_callback.apply(this, arguments);
-      }
-
-      function _route_callback() {
-        _route_callback = _asyncToGenerator(function* (ctx) {
-          var auth = _objectSpread(_objectSpread({}, global_auth), route.auth || {});
-
-          _check_auth(ctx, auth, route.method);
-
-          var result = yield route.callback(ctx, conn);
-          return result;
-        });
-        return _route_callback.apply(this, arguments);
-      }
-
-      if (route.method == 'POST') {
-        router.post(route.path, route_callback);
-      } else {
-        router.get(route.path, route_callback);
-      }
-    });
-    app.use(router.routes());
-  });
-  return _init_queries_router.apply(this, arguments);
-}

package/src/server/routes/crud.js

@@ -1,29 +0,0 @@
-import calustraRouter from 'calustra-router'
-
-async function init_crud_router (app, conn, config) {
-
-  if (! config) {
-    return undefined
-  }
-
-  const routerOptions= {
-    body_field: undefined,
-    get_user_id: (ctx) => {
-      try {
-        return ctx.state.user.id
-      } catch(e) {}
-      let uid= ctx.headers['user-id']
-      if (uid!=undefined) {
-        return uid
-      }      
-      return undefined
-    },
-    ...config.options
-  }
-  
-  const router= await calustraRouter(conn, config.routes, config.path, 'public', routerOptions)
-  app.use(router.routes())
-  
-}
-
-export {init_crud_router}

package/src/server/routes/queries.js

@@ -1,70 +0,0 @@
-import Router    from '@koa/router'
-
-
-function _check_auth(ctx, auth, method) {
-  const check= (auth.require===true) || (auth.require==='read-only' && method==='POST')
-
-  if (check) {
-    let uid= undefined
-    try {
-      uid= ctx.state.user.id
-    } catch(e) {}
-
-    if (uid===undefined) {
-
-      if (auth.action=='error') {
-        
-       ctx.miolo.logger.error(`Unauthorized access. Throwing error ${auth.error_code || 401}`)
-        return ctx.throw(
-          auth.error_code || 401,
-          null,
-          {}
-        )
-
-      } else {
-       ctx.miolo.logger.error(`Unauthorized access. Redirecting to ${auth.redirect_path || '/'}`)
-        ctx.redirect(auth.redirect_path || '/')
-      }
-    }
-  }
-}
-
-
-async function init_queries_router (app, conn, queries) {
-
-  const routes= queries?.routes || []
-  if (routes.length==0) {
-    return
-  }
-
-  const options= queries?.options || {}
-  const global_auth = options?.auth || {require: false}
-
-  const router = new Router()
-
-  routes.map(route => {
-    
-    async function route_callback(ctx) {
-      const auth= {
-        ...global_auth,
-        ...route.auth || {}
-      }
-      _check_auth(ctx, auth, route.method)
-
-      const result= await route.callback(ctx, conn)
-      return result
-    }
-
-    if (route.method == 'POST') {
-      router.post(route.path, route_callback)
-    } else {
-      router.get(route.path, route_callback)
-    }
-
-  })
-
-  app.use(router.routes())
-
-}
-
-export {init_queries_router}