miolo 0.0.13 → 0.0.17

package/lib/config/defaults.js

@@ -16,8 +16,38 @@ module.exports = {
   session: {
     salt: 'SUPER_SALTY_YES?',
     secret: 'SUPER_SECRET_KEY_KERE',
-    expires: 9 * 3600 * 1000 // 9 hours
+    options: {
+      /** (number || 'session') maxAge in ms (default is 1 days) */
+
+      /** 'session' will result in a cookie that expires when session/browser is closed */
+
+      /** Warning: If a session cookie is stolen, this cookie will never expire */
+      maxAge: 86400000,
+
+      /** (boolean) automatically commit headers (default true) */
+      //autoCommit: true, 
+
+      /** (boolean) can overwrite or not (default true) */
+      //overwrite: true, 
+
+      /** (boolean) httpOnly or not (default true) */
+      //httpOnly: true, 
 
+      /** (boolean) signed or not (default true) */
+      //signed: true, 
+
+      /** (boolean) Force a session identifier cookie to be set on every response. The expiration is reset to the original maxAge, resetting the expiration countdown. (default is false) */
+      //rolling: false, 
+
+      /** (boolean) renew session when session is nearly expired, so we can always keep user logged in. (default is false)*/
+      //renew: false, 
+
+      /** (boolean) secure cookie*/
+      secure: process.env.NODE_ENV != 'development',
+
+      /** (string) session cookie sameSite options (default null, don't set it) */
+      sameSite: process.env.NODE_ENV != 'development' ? null : 'strict'
+    }
   },
   database: {
     connection: {

package/lib/server/engines/cron/syscheck.js

@@ -39,9 +39,9 @@ function init_sys_check_and_log(logger) {
       var free = Math.round(toGB(result.free), 2);
 
       if (free < 1) {
-        logger.error("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
+        logger.error("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " GB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
       } else {
-        logger.info("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " MB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
+        logger.info("[SERVER][".concat((0, _farrapaColors.cyan)('SysCheck'), "] DISK ").concat((0, _farrapaColors.yellow)(used), " GB used of ").concat((0, _farrapaColors.green)(total), " GB (").concat((0, _farrapaColors.yellow)(free), " GB free)"));
       }
     });
   }

package/lib/server/middleware/session/index.js

@@ -11,6 +11,12 @@ var _store = _interopRequireDefault(require("./store"));
 
 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; }
+
 /**
  * Middleware for session
  * @param ctx
@@ -18,7 +24,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 function init_session_middleware(app, config) {
   app.keys = [config.secret || '*secret*'];
-  app.use((0, _koaSession.default)({
-    redis_store: _store.default
-  }, app));
+
+  var options = _objectSpread({
+    store: _store.default
+  }, config.options || {});
+
+  app.use((0, _koaSession.default)(options, app));
 }

package/package.json

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

package/src/config/defaults.js

@@ -15,7 +15,36 @@ module.exports= {
   session: {
     salt: 'SUPER_SALTY_YES?',
     secret: 'SUPER_SECRET_KEY_KERE',
-    expires: 9 * 3600 * 1000 // 9 hours
+    options: {
+      /** (number || 'session') maxAge in ms (default is 1 days) */
+      /** 'session' will result in a cookie that expires when session/browser is closed */
+      /** Warning: If a session cookie is stolen, this cookie will never expire */
+      maxAge: 86400000,
+      
+      /** (boolean) automatically commit headers (default true) */
+      //autoCommit: true, 
+      
+      /** (boolean) can overwrite or not (default true) */
+      //overwrite: true, 
+      
+      /** (boolean) httpOnly or not (default true) */
+      //httpOnly: true, 
+      
+      /** (boolean) signed or not (default true) */
+      //signed: true, 
+      
+      /** (boolean) Force a session identifier cookie to be set on every response. The expiration is reset to the original maxAge, resetting the expiration countdown. (default is false) */
+      //rolling: false, 
+      
+      /** (boolean) renew session when session is nearly expired, so we can always keep user logged in. (default is false)*/
+      //renew: false, 
+
+      /** (boolean) secure cookie*/
+      secure: process.env.NODE_ENV != 'development', 
+      
+      /** (string) session cookie sameSite options (default null, don't set it) */
+      sameSite: process.env.NODE_ENV != 'development' ? null : 'strict', 
+    }
   },
   database: {
     connection : {

package/src/server/engines/cron/syscheck.js

@@ -35,9 +35,9 @@ function init_sys_check_and_log(logger) {
       const free = Math.round(toGB(result.free), 2)
 
       if (free<1) {
-        logger.error(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} MB (${yellow(free)} GB free)`)
+        logger.error(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} GB (${yellow(free)} GB free)`)
       } else {
-        logger.info(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} MB (${yellow(free)} GB free)`)
+        logger.info(`[SERVER][${cyan('SysCheck')}] DISK ${yellow(used)} GB used of ${green(total)} GB (${yellow(free)} GB free)`)
       }
     });  
   }

package/src/server/middleware/session/index.js

@@ -9,7 +9,13 @@ import redis_store from './store'
 function init_session_middleware(app, config) {
   
   app.keys = [config.secret || '*secret*']
-  app.use(koa_session({ redis_store }, app))
+
+  const options= {
+    store: redis_store,
+    ...config.options || {}
+  }
+
+  app.use(koa_session(options, app))
 
 }