miolo 0.0.37 → 0.0.40

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

@@ -14,8 +14,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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;
 
@@ -24,18 +22,28 @@ function _guest_token_make_with_jwt(session, logger) {
     logger.error('Guest token made with an unsafe secret string. Please, configure your own through session.secret.');
   }
 
+  var payload = {
+    admin: false,
+    buid: buid
+  };
+  return _jwtSimple.default.encode(payload, secret);
+}
+
+function _get_cookie_properties(session) {
+  var _session$options;
+
   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
+  var expires = new Date();
+  expires.setSeconds(expires.getSeconds() + maxAge);
+  return {
+    expires,
+    httpOnly: false
   };
-  return _jwtSimple.default.encode(payload, secret);
 }
 
 var init_guest_auth_middleware = (app, options, session, logger) => {
@@ -62,12 +70,14 @@ var init_guest_auth_middleware = (app, options, session, logger) => {
       // Try to get our token from headers (server) or cookies (client)
       var token = ctx.cookies.get('token') || ctx.headers['token'];
 
-      if (token) {
+      if (token === undefined || token.length == 0) {
         token = yield _make_guest_token();
         logger.debug("Guest token conceeded");
       }
 
-      ctx.cookies.set('token', token);
+      var options = _get_cookie_properties(session);
+
+      ctx.cookies.set('token', token, options);
       ctx.user = {
         name: 'guest',
         token

package/lib/server/middleware/request.js

@@ -46,10 +46,16 @@ function init_request_middleware(app) {
       var user = undefined;
 
       try {
-        user = ctx.state.user;
-      } catch (_) {
-        user = ctx === null || ctx === void 0 ? void 0 : ctx.user;
-      }
+        if (ctx.state.user != undefined) {
+          user = ctx.state.user;
+        }
+      } catch (_) {}
+
+      try {
+        if (ctx.user != undefined) {
+          user = ctx.user;
+        }
+      } catch (_) {}
 
       var uid_desc = '';
 

package/package.json

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

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

@@ -7,16 +7,26 @@ function _guest_token_make_with_jwt(session, logger) {
     secret= 'miolo_unsafe_secret'
     logger.error('Guest token made with an unsafe secret string. Please, configure your own through session.secret.')
   }
+  
+  const payload = {
+    admin  : false,
+    buid   : buid
+  }
+  return jwt.encode(payload, secret)
+}
+
+function _get_cookie_properties(session) {
   let maxAge = session?.options?.maxAge
   if (isNaN(maxAge)) {
     maxAge= 86400
   }
-  const payload = {
-    admin  : false,
-    buid   : buid,
-    expires: Date.now() + maxAge
+  let expires = new Date()
+  expires.setSeconds(expires.getSeconds() + maxAge)
+
+  return {
+    expires,
+    httpOnly: false
   }
-  return jwt.encode(payload, secret)
 }
 
 
@@ -38,12 +48,13 @@ const init_guest_auth_middleware = ( app, options, session, logger ) => {
     // Try to get our token from headers (server) or cookies (client)
     let token= ctx.cookies.get('token') || ctx.headers['token']
 
-    if (token) {
+    if (token===undefined || token.length==0) {
       token = await _make_guest_token()
       logger.debug(`Guest token conceeded`)
     }
 
-    ctx.cookies.set('token', token)
+    const options= _get_cookie_properties(session)
+    ctx.cookies.set('token', token, options)
     ctx.user = {
       name: 'guest',
       token

package/src/server/middleware/request.js

@@ -31,10 +31,16 @@ function init_request_middleware(app) {
 
     let user = undefined
     try {
-      user= ctx.state.user
-    } catch(_) {
-      user= ctx?.user
-    }  
+      if (ctx.state.user != undefined) {
+        user= ctx.state.user
+      }
+    } catch(_) {}
+
+    try {
+      if (ctx.user != undefined) {
+        user= ctx.user
+      }
+    } catch(_) {} 
 
     let uid_desc= ''
     if (user != undefined) {