miolo 0.0.35 → 0.0.38

package/lib/config/defaults.js

@@ -70,7 +70,19 @@ module.exports = {
     body_field: undefined,
     getUserId: ctx => {
       try {
-        return ctx.state.user.id;
+        var from_pport = ctx.state.user.id;
+
+        if (from_pport != undefined) {
+          return from_pport;
+        }
+      } catch (e) {}
+
+      try {
+        var from_auth = ctx.user.id;
+
+        if (from_auth != undefined) {
+          return from_auth;
+        }
       } catch (e) {}
 
       var uid = ctx.headers['user-id'];
@@ -220,7 +232,8 @@ module.exports = {
       to: 'devel@afialapis.com'
     }
   },
-  auth: {//basic: {
+  auth: {
+    //basic: {
     //  auth_user: async (username, password) => { return {id: 1} },
     //  realm: '',
     //  paths: [],
@@ -235,6 +248,10 @@ module.exports = {
     //  url_login_redirect: undefined
     //  url_logout_redirect: '/'
     //}
+    guest: {
+      make_guest_token: undefined // (session) => ''
+
+    }
   },
   middlewares: [// async (ctx) => {}
   ]

package/lib/server/index.js

@@ -55,7 +55,7 @@ function miolo(_x, _x2, _x3) {
 
 function _miolo() {
   _miolo = _asyncToGenerator(function* (sconfig, render, callback) {
-    var _config$http, _config$auth, _config$auth2;
+    var _config$http, _config$auth, _config$auth2, _config$auth3;
 
     // Init some pieces
     var config = (0, _config.init_config)(sconfig);
@@ -87,7 +87,15 @@ function _miolo() {
 
     (0, _catch_js_error.init_route_catch_js_error)(app, '/sys/jserror'); // auth middleware
 
-    if (config !== null && config !== void 0 && (_config$auth = config.auth) !== null && _config$auth !== void 0 && _config$auth.basic) {
+    if (config !== null && config !== void 0 && (_config$auth = config.auth) !== null && _config$auth !== void 0 && _config$auth.guest) {
+      var {
+        init_guest_auth_middleware
+      } = require("./middleware/auth/guest");
+
+      init_guest_auth_middleware(app, config.auth.guest, config === null || config === void 0 ? void 0 : config.session, logger);
+    }
+
+    if (config !== null && config !== void 0 && (_config$auth2 = config.auth) !== null && _config$auth2 !== void 0 && _config$auth2.basic) {
       var {
         init_basic_auth_middleware
       } = require("./middleware/auth/basic");
@@ -95,7 +103,7 @@ function _miolo() {
       init_basic_auth_middleware(app, config.auth.basic);
     }
 
-    if (config !== null && config !== void 0 && (_config$auth2 = config.auth) !== null && _config$auth2 !== void 0 && _config$auth2.passport) {
+    if (config !== null && config !== void 0 && (_config$auth3 = config.auth) !== null && _config$auth3 !== void 0 && _config$auth3.passport) {
       var {
         init_passport_auth_middleware
       } = require("./middleware/auth/passport");

package/lib/server/middleware/auth/guest.js

@@ -0,0 +1,83 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.init_guest_auth_middleware = void 0;
+
+var _jwtSimple = _interopRequireDefault(require("jwt-simple"));
+
+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 _guest_token_make_with_jwt(session, logger) {
+  var _session$options;
+
+  var buid = Math.random().toString();
+  var secret = session === null || session === void 0 ? void 0 : session.secret;
+
+  if (!secret) {
+    secret = 'miolo_unsafe_secret';
+    logger.error('Guest token made with an unsafe secret string. Please, configure your own through session.secret.');
+  }
+
+  var maxAge = session === null || session === void 0 ? void 0 : (_session$options = session.options) === null || _session$options === void 0 ? void 0 : _session$options.maxAge;
+
+  if (isNaN(maxAge)) {
+    maxAge = 86400;
+  }
+
+  var payload = {
+    admin: false,
+    buid: buid,
+    expires: Date.now() + maxAge
+  };
+  return _jwtSimple.default.encode(payload, secret);
+}
+
+var init_guest_auth_middleware = (app, options, session, logger) => {
+  var _make_guest_token = () => {
+    try {
+      var {
+        make_guest_token
+      } = options;
+
+      if (make_guest_token != undefined) {
+        return make_guest_token(session || {});
+      }
+    } catch (_) {}
+
+    return _guest_token_make_with_jwt(session || {}, logger);
+  };
+
+  function guest_auth_middleware(_x, _x2) {
+    return _guest_auth_middleware.apply(this, arguments);
+  }
+
+  function _guest_auth_middleware() {
+    _guest_auth_middleware = _asyncToGenerator(function* (ctx, next) {
+      // Try to get our token from headers (server) or cookies (client)
+      var token = ctx.cookies.get('token') || ctx.headers['token'];
+
+      if (token) {
+        token = yield _make_guest_token();
+        logger.debug("Guest token conceeded");
+      }
+
+      ctx.cookies.set('token', token);
+      ctx.user = {
+        name: 'guest',
+        token
+      };
+      yield next();
+    });
+    return _guest_auth_middleware.apply(this, arguments);
+  }
+
+  app.use(guest_auth_middleware);
+};
+
+exports.init_guest_auth_middleware = init_guest_auth_middleware;

package/lib/server/middleware/request.js

@@ -31,8 +31,6 @@ function init_request_middleware(app) {
 
   function _request_middleware() {
     _request_middleware = _asyncToGenerator(function* (ctx, next) {
-      var _ctx$state;
-
       var logger = ctx.miolo.logger;
       REQUEST_COUNTER += 1;
       ctx.requestId = REQUEST_COUNTER; // Patch for koa-better-body
@@ -45,10 +43,33 @@ function init_request_middleware(app) {
       ctx.request.ip = ip;
       logger.info("req begin ".concat(ctx.requestId, " - ip ").concat(ip, " - ").concat((0, _farrapaColors.cyan)(ctx.request.method), " ").concat((0, _farrapaColors.cyan)(ctx.request.url), " ").concat(ctx.request.body != undefined ? JSON.stringify(ctx.request.body) : ''));
       yield next();
-      var user = (ctx === null || ctx === void 0 ? void 0 : (_ctx$state = ctx.state) === null || _ctx$state === void 0 ? void 0 : _ctx$state.user) || {};
+      var user = undefined;
+
+      try {
+        user = ctx.state.user;
+      } catch (_) {
+        user = ctx === null || ctx === void 0 ? void 0 : ctx.user;
+      }
+
+      var uid_desc = '';
+
+      if (user != undefined) {
+        var _user, _user3;
+
+        if ((_user = user) !== null && _user !== void 0 && _user.id) {
+          var _user2;
+
+          uid_desc = " - uid ".concat((_user2 = user) === null || _user2 === void 0 ? void 0 : _user2.id);
+        } else if ((_user3 = user) !== null && _user3 !== void 0 && _user3.token) {
+          var _user4;
+
+          uid_desc = " - token ".concat((_user4 = user) === null || _user4 === void 0 ? void 0 : _user4.token);
+        }
+      }
+
       var elapsed = parseFloat((_perf_hooks.performance.now() - started) / 1000.0).toFixed(2);
       var tcolor = elapsed < 1.0 ? _farrapaColors.green : elapsed < 2.0 ? _farrapaColors.yellow : _farrapaColors.red;
-      logger.info("req end ".concat(ctx.requestId, " ").concat(user ? " - uid ".concat(user.id) : '', " => ").concat(tcolor("DONE in ".concat(elapsed, " seconds"))));
+      logger.info("req end ".concat(ctx.requestId).concat(uid_desc, " => ").concat(tcolor("DONE in ".concat(elapsed, " seconds"))));
     });
     return _request_middleware.apply(this, arguments);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.35",
+  "version": "0.0.38",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",

package/src/config/defaults.js

@@ -65,8 +65,17 @@ module.exports= {
   
     getUserId: (ctx) => {
       try {
-        return ctx.state.user.id
+        const from_pport= ctx.state.user.id
+        if (from_pport!=undefined) {
+          return from_pport
+        }
       } catch(e) {}
+      try {
+        const from_auth= ctx.user.id
+        if (from_auth!=undefined) {
+          return from_auth
+        }
+      } catch(e) {}      
       let uid= ctx.headers['user-id']
       if (uid!=undefined) {
         return uid
@@ -231,6 +240,9 @@ module.exports= {
     //  url_login_redirect: undefined
     //  url_logout_redirect: '/'
     //}
+    guest: {
+      make_guest_token: undefined // (session) => ''
+    }
   },
   middlewares: [
     // async (ctx) => {}

package/src/server/index.js

@@ -62,6 +62,11 @@ async function miolo(sconfig, render, callback) {
   init_route_catch_js_error(app, '/sys/jserror')
 
   // auth middleware
+  if (config?.auth?.guest) {
+    const {init_guest_auth_middleware} = require('./middleware/auth/guest')
+    init_guest_auth_middleware(app, config.auth.guest, config?.session, logger)
+  }  
+
   if (config?.auth?.basic) {
     const {init_basic_auth_middleware} = require('./middleware/auth/basic')
     init_basic_auth_middleware(app, config.auth.basic)

package/src/server/middleware/auth/guest.js

@@ -0,0 +1,59 @@
+import jwt from 'jwt-simple'
+
+function _guest_token_make_with_jwt(session, logger) {
+  const buid= Math.random().toString()
+  let secret = session?.secret
+  if (!secret) {
+    secret= 'miolo_unsafe_secret'
+    logger.error('Guest token made with an unsafe secret string. Please, configure your own through session.secret.')
+  }
+  let maxAge = session?.options?.maxAge
+  if (isNaN(maxAge)) {
+    maxAge= 86400
+  }
+  const payload = {
+    admin  : false,
+    buid   : buid,
+    expires: Date.now() + maxAge
+  }
+  return jwt.encode(payload, secret)
+}
+
+
+const init_guest_auth_middleware = ( app, options, session, logger ) => {
+  
+  const _make_guest_token = () => {
+    try {
+      let {make_guest_token} = options
+      if (make_guest_token!=undefined) {
+        return make_guest_token(session || {})
+      }
+    } catch(_) {}
+
+    return _guest_token_make_with_jwt(session || {}, logger)
+  }
+
+  async function guest_auth_middleware(ctx, next) {
+
+    // Try to get our token from headers (server) or cookies (client)
+    let token= ctx.cookies.get('token') || ctx.headers['token']
+
+    if (token) {
+      token = await _make_guest_token()
+      logger.debug(`Guest token conceeded`)
+    }
+
+    ctx.cookies.set('token', token)
+    ctx.user = {
+      name: 'guest',
+      token
+    }    
+    
+    await next()
+  }
+
+  app.use(guest_auth_middleware)
+
+}
+
+export {init_guest_auth_middleware}

package/src/server/middleware/request.js

@@ -28,8 +28,22 @@ function init_request_middleware(app) {
 
     await next()
     
-    
-    const user = ctx?.state?.user || {}
+
+    let user = undefined
+    try {
+      user= ctx.state.user
+    } catch(_) {
+      user= ctx?.user
+    }  
+
+    let uid_desc= ''
+    if (user != undefined) {
+      if (user?.id) {
+        uid_desc= ` - uid ${user?.id}`
+      } else if (user?.token) {
+        uid_desc= ` - token ${user?.token}`
+      }
+    }
 
     const elapsed = parseFloat( (performance.now() - started) / 1000.0 ).toFixed(2)
 
@@ -39,7 +53,7 @@ function init_request_middleware(app) {
                     ? yellow
                     : red
 
-    logger.info(`req end ${ctx.requestId} ${user ? ` - uid ${user.id}` : ''} => ${tcolor(`DONE in ${elapsed} seconds`)}`)
+    logger.info(`req end ${ctx.requestId}${uid_desc} => ${tcolor(`DONE in ${elapsed} seconds`)}`)
   }
 
   app.use(request_middleware)