miolo 0.0.17 → 0.0.20

package/lib/config/defaults.js

@@ -70,9 +70,11 @@ module.exports = {
   },
   routes: {//  crud: {
     //    path: '/crud',
+    //    options: {...},
     //    routes: [
     //      {
     //        name: 'todos',
+    //        auth: {...},
     //        options: {
     //          useDates: true,
     //          checkBeforeDelete: ["edition.agent_id"],

package/lib/server/routes/crud.js

@@ -9,6 +9,12 @@ 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); }); }; }
@@ -23,9 +29,24 @@ function _init_crud_router() {
       return undefined;
     }
 
-    var router = yield (0, _calustraRouter.default)(conn, config.routes, config.path, 'public', {
-      body_field: 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.17",
+  "version": "0.0.20",
   "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.19",
-    "calustra-router": "0.0.19",
+    "calustra": "0.0.24",
+    "calustra-router": "0.0.24",
     "cron": "^1.8.2",
     "diskspace": "^2.0.0",
     "eslint": "^8.9.0",

package/src/config/defaults.js

@@ -65,9 +65,11 @@ module.exports= {
   routes: {
     //  crud: {
     //    path: '/crud',
+    //    options: {...},
     //    routes: [
     //      {
     //        name: 'todos',
+    //        auth: {...},
     //        options: {
     //          useDates: true,
     //          checkBeforeDelete: ["edition.agent_id"],

package/src/server/routes/crud.js

@@ -5,8 +5,23 @@ 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', {body_field: undefined})
+  const router= await calustraRouter(conn, config.routes, config.path, 'public', routerOptions)
   app.use(router.routes())
   
 }