@sassoftware/viya-serverjs 0.5.2 → 0.5.4

package/.env

@@ -8,7 +8,7 @@ APPNAME=mcpserver
 AUTHFLOW=code
 CLIENTID=mcpserver
 CLIENTSECRET=jellico
-USELOGON=TRUE
+USELOGON=FALSE
 USETOKEN=TRUE
 
 //REDIRECT=mcp

package/lib/handlers/logon.js

@@ -29,8 +29,9 @@ function _logon() {
           return (0, _setCookies["default"])(req, h, null);
         case 1:
           r = _context.v;
+          console.log('logon setcookie result:', r);
           debug(r.redirect);
-          debug('in logon after setcookie', r.redirect);
+          console.log('in logon after setcookie', r.redirect);
           return _context.a(2, h.redirect(r.redirect));
       }
     }, _callee);

package/lib/handlers/setCookies.js

@@ -25,30 +25,26 @@ function _setCookies() {
         case 0:
           debugger;
           credentials = req.auth.credentials;
-          debug('setcookie', credentials);
-          if (!(credentials != null && req.auth.error != null)) {
-            _context.n = 1;
-            break;
+          debug('setcookie', credentials != null);
+          if (credentials != null && req.auth.error != null) {
+            console.log('setcookie credentials', credentials);
+            debug('setcookie error', req.auth.error);
+            console.log('Authentication error:', req.auth.error);
+            process.exit(0);
+            // return { status: false, error: req.auth.error, redirect: '/error' };
           }
-          debug('setcookie credentials', credentials);
-          debug('setcookie error', req.auth.error);
-          debug('logon failed');
-          return _context.a(2, {
-            status: false,
-            error: req.auth.error
-          });
-        case 1:
+
           // create a cookie(sid) and save credentials in cache
           sid = uuid.v4();
           credentials.sid = sid;
           if (options != null) {
             options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-            debug(options.allAppEnv.LOGONPAYLOAD);
+            //  debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          _context.n = 2;
+          _context.n = 1;
           return req.server.app.cache.set(sid, credentials, 0);
-        case 2:
+        case 1:
           // Can we get away without setting cookie for this session?
           // Need to also modify keepAlive
           if (process.env.COOKIES !== 'NO') {

package/lib/iService.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _console = require("console");
 var _setupAuth = _interopRequireDefault(require("./plugins/setupAuth"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
@@ -104,7 +105,8 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             };
             if (process.env.HAPIDEBUG === 'YES') {
               sConfig.debug = {
-                request: '*'
+                request: '*',
+                log: '*'
               };
             }
             debug(JSON.stringify(sConfig, null, 4));
@@ -449,6 +451,7 @@ function _getTls() {
             cert: pems.cert,
             key: pems["private"]
           };
+          console.log('Self-signed certificates created', tls);
           return _context3.a(2, tls);
       }
     }, _callee3);

package/lib/plugins/setDefaultRoutes.js

@@ -90,8 +90,8 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName),
     options: {
-      //auth: (process.env.USELOGON.toUpperCase() === 'TRUE') ? null : options.serverMode === "app" ? authLogon : authDefault,
-      auth: null,
+      auth: process.env.USELOGON.toUpperCase() === 'TRUE' ? null : options.serverMode === "app" ? authLogon : authDefault,
+      //  auth: null,
       handler: function () {
         var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
           return _regenerator().w(function (_context2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",

package/src/handlers/logon.js

@@ -11,8 +11,9 @@ async function logon (req, h) {
    
    
    let r = await setCookies(req, h, null);
+   console.log('logon setcookie result:', r);
    debug(r.redirect);
-   debug('in logon after setcookie', r.redirect);
+   console.log('in logon after setcookie', r.redirect);
    return h.redirect(r.redirect);
 }
 

package/src/handlers/setCookies.js

@@ -8,13 +8,14 @@ let debug = require('debug')('setcookies');
 async function setCookies (req, h, options) {
     debugger;
     let credentials = req.auth.credentials;
-    debug('setcookie', credentials);
+    debug('setcookie', credentials != null);
  
     if (credentials != null && req.auth.error != null) {
-        debug('setcookie credentials', credentials);
+        console.log('setcookie credentials', credentials);
         debug('setcookie error', req.auth.error);
-        debug('logon failed');
-        return { status: false, error: req.auth.error };
+        console.log('Authentication error:', req.auth.error);
+        process.exit(0);
+       // return { status: false, error: req.auth.error, redirect: '/error' };
     }
         
     // create a cookie(sid) and save credentials in cache
@@ -23,7 +24,7 @@ async function setCookies (req, h, options) {
     if (options != null) {
         options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
         options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-        debug(options.allAppEnv.LOGONPAYLOAD);
+      //  debug(options.allAppEnv.LOGONPAYLOAD);
     }
     
     

package/src/iService.js

@@ -28,6 +28,7 @@ let Vision = require('@hapi/vision');
 let inert = require('@hapi/inert');
 let selfsigned = require('selfsigned');
 
+import { log } from 'console';
 import setupAuth from './plugins/setupAuth';
 
 let os = require('os');
@@ -89,7 +90,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
 			},
 		};
 		if (process.env.HAPIDEBUG === 'YES') {
-			sConfig.debug = { request: '*' };
+			sConfig.debug = { request: '*' ,log: '*'};
 		}
 		debug(JSON.stringify(sConfig, null, 4));
 		if (process.env.HTTPS === 'true') {

package/src/plugins/setDefaultRoutes.js

@@ -90,8 +90,8 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `${appName}`,
 
       options: {
-        //auth: (process.env.USELOGON.toUpperCase() === 'TRUE') ? null : options.serverMode === "app" ? authLogon : authDefault,
-        auth: null,
+        auth: (process.env.USELOGON.toUpperCase() === 'TRUE') ? null : options.serverMode === "app" ? authLogon : authDefault,
+      //  auth: null,
         handler: async (req,h) => {
           console.log(`>>>>>>>>>>>>>>>>>>>>>>>in ${appName}`);
           return getAppb(req, h);