@sassoftware/viya-serverjs 0.5.4 → 0.6.1-0

package/lib/iService.js

@@ -1,20 +1,14 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _console = require("console");
 var _setupAuth = _interopRequireDefault(require("./plugins/setupAuth"));
+var _readCerts = _interopRequireDefault(require("./readCerts"));
 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 }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -53,11 +47,11 @@ var Vision = require('@hapi/vision');
 var inert = require('@hapi/inert');
 var selfsigned = require('selfsigned');
 var os = require('os');
-function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, userInfo) {
+function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, userCache) {
   // process.env.APPHOST_ADDR = process.env.APPHOST;
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var defaultMaxBytes, maxBytes, isSameSite, isSecure, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, swaggerOptions, override, allRoutes, hh, msg;
+      var defaultMaxBytes, maxBytes, isSameSite, isSecure, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, allRoutes, hh, msg;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -105,25 +99,16 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             };
             if (process.env.HAPIDEBUG === 'YES') {
               sConfig.debug = {
-                request: '*',
-                log: '*'
+                request: '*'
               };
             }
             debug(JSON.stringify(sConfig, null, 4));
-            if (!(process.env.HTTPS === 'true')) {
-              _context.n = 2;
-              break;
+            if (process.env.HTTPS === 'true') {
+              sConfig.tls = getCertificates();
+              debug('Setup of SSL certificates completed');
+            } else {
+              debug('Running with no SSL certificates');
             }
-            _context.n = 1;
-            return getCertificates();
-          case 1:
-            sConfig.tls = _context.v;
-            debug('Setup of SSL certificates completed');
-            _context.n = 3;
-            break;
-          case 2:
-            debug('Running with no SSL certificates');
-          case 3:
             if (asset !== null) {
               sConfig.routes.files = {
                 relativeTo: asset
@@ -153,42 +138,31 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               relativeTo: __dirname,
               path: '.'
             };
-            _context.n = 4;
+            _context.n = 1;
             return hapiServer.register(Vision);
-          case 4:
+          case 1:
             hapiServer.views(visionOptions);
-            _context.n = 5;
+            _context.n = 2;
             return hapiServer.register(inert);
-          case 5:
+          case 2:
             if (!(process.env.HTTPS === 'true')) {
-              _context.n = 6;
+              _context.n = 3;
               break;
             }
-            _context.n = 6;
+            _context.n = 3;
             return hapiServer.register({
               plugin: require('hapi-require-https'),
               options: {}
             });
-          case 6:
-            _context.n = 7;
+          case 3:
+            _context.n = 4;
             return hapiServer.register(H202);
-          case 7:
-            /*
-            await hapiServer.register({
-            	plugin : require('hapi-pino'),
-            	options: {
-            		prettyPrint: process.env.NODE_ENV !== 'production',
-            		level      : process.env.LOGLEVEL == null ? 'silent' : process.env.LOGLEVEL,
-            	},
-            });
-            */
-            //
+          case 4:
             // setup authentication related plugins
             options = {
               serverMode: serverMode,
               authFlow: process.env.AUTHFLOW,
               host: process.env.VIYA_SERVER,
-              useLogon: process.env.USELOGON != null && process.env.USELOGON.toUpperCase() === 'FALSE' ? false : true,
               isSameSite: isSameSite,
               isSecure: isSecure,
               ns: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.ns : null,
@@ -196,7 +170,6 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               redirect: process.env.REDIRECT,
               clientId: process.env.CLIENTID,
               clientSecret: process.env.CLIENTSECRET,
-              pkce: allAppEnv.LOGONPAYLOAD.pkce,
               redirectTo: "/".concat(process.env.APPNAME, "/logon"),
               allAppEnv: allAppEnv,
               useHapiCookie: true,
@@ -206,7 +179,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               userRouteTable: userRouteTable,
               useDefault: useDefault,
               /* not used - left here for potential reuse */
-              userInfo: userInfo,
+              userCache: userCache || {},
               https: process.env.HTTPS,
               authDefault: false,
               /* set later in setDefaultRoutes */
@@ -214,12 +187,12 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             };
             debug2('Options', options);
             if (!(process.env.AUTHFLOW != null)) {
-              _context.n = 9;
+              _context.n = 6;
               break;
             }
-            _context.n = 8;
+            _context.n = 5;
             return (0, _setupAuth["default"])(hapiServer, options);
-          case 8:
+          case 5:
             if (process.env.PREAUTH === 'YES') {
               console.log('Preauth enabled');
               hapiServer.ext('onPreAuth', function (request, h) {
@@ -235,55 +208,17 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
                 return h["continue"];
               });
             }
-          case 9:
+          case 6:
             console.log('Plugin', process.env.PLUGIN);
-            if (!(process.env.PLUGIN === 'hapi-swagger' && serverMode === 'api')) {
-              _context.n = 11;
-              break;
-            }
-            swaggerOptions = {
-              "info": {
-                "title": "API for ".concat(process.env.APPNAME),
-                "version": "0.0.1",
-                "description": "This document was auto-generated at run time"
-              },
-              "schemes": ["http", "https"],
-              "cors": true,
-              "debug": true,
-              "jsonPath": "/".concat(options.appName, "/swagger.json"),
-              "jsonRoutePath": "/".concat(options.appName, "/swagger.json"),
-              "documentationPage": true,
-              "documentationPath": "/".concat(options.appName, "/documentation"),
-              "swaggerUI": true,
-              "swaggerUIPath": "/".concat(options.appName, "/swaggerui"),
-              auth: options.authDefault
-            };
-            if (userInfo != null) {
-              override = userInfo(options, 'SWAGGEROPTIONS');
-              swaggerOptions = _objectSpread(_objectSpread({}, swaggerOptions), override);
-            }
-            debug('Swagger Options:', swaggerOptions);
-            _context.n = 10;
-            return hapiServer.register({
-              plugin: serverMode,
-              options: swaggerOptions
-            });
-          case 10:
-            _context.n = 12;
-            break;
-          case 11:
-            if (process.env.PLUGIN == 'hapi-openapi' && serverMode === 'api') {
-              console.log('hapi-openapi', 'coming soon');
-            }
-          case 12:
+
             //
             // Start server
             //
             // eslint-disable-next-line no-unused-vars
             allRoutes = hapiServer.table();
-            _context.n = 13;
+            _context.n = 7;
             return hapiServer.start();
-          case 13:
+          case 7:
             hh = hapiServer.info.uri;
             hh = hh.replace(/0.0.0.0/, 'localhost');
             console.log('====================================================================================');
@@ -294,7 +229,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             process.env.APPSERVER = "".concat(hh, "/").concat(process.env.APPNAME);
             process.env.HEALTH = 'true';
             console.log('====================================================================================');
-          case 14:
+          case 8:
             return _context.a(2);
         }
       }, _callee);
@@ -310,152 +245,81 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
   init();
 }
 function getCertificates() {
-  return _getCertificates.apply(this, arguments);
-}
-function _getCertificates() {
-  _getCertificates = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-    var options, tlsdir;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          options = null;
-          tlsdir = process.env.SSLCERT;
-          console.log('Reading SSL certificates from ', tlsdir);
-          if (!(tlsdir != null && tlsdir.trim().length > 0)) {
-            _context2.n = 1;
-            break;
-          }
-          options = readTLS(tlsdir);
-          options.rejectUnauthorized = true;
-          _context2.n = 3;
-          break;
-        case 1:
-          console.log('No SSL certificates found, generating self-signed certificates');
-          _context2.n = 2;
-          return getTls();
-        case 2:
-          options = _context2.v;
-          options.rejectUnauthorized = false;
-        case 3:
-          return _context2.a(2, options);
-      }
-    }, _callee2);
-  }));
-  return _getCertificates.apply(this, arguments);
-}
-function readTLS(tlsdir) {
-  console.log("[Note] Using TLS dir: " + tlsdir);
-  if (fs.existsSync(tlsdir) === false) {
-    console.log("[Warning] Specified TLS dir does not exist: " + tlsdir);
-    return null;
-  }
-  var listOfFiles = fs.readdirSync(tlsdir);
-  console.log("[Note] TLS/SSL files found: " + listOfFiles);
-  var options = {};
-  for (var i = 0; i < listOfFiles.length; i++) {
-    var fname = listOfFiles[i];
-    var name = tlsdir + '/' + listOfFiles[i];
-    var key = fname.split('.')[0];
-    options[key] = fs.readFileSync(name, {
-      encoding: 'utf8'
-    });
+  var tlsdir = process.env.SSLCERT;
+  var options = (0, _readCerts["default"])(tlsdir);
+  if (options === null) {
+    console.log('No SSL certificates found, generating self-signed certificates');
+    options = getTls();
+    options.rejectUnauthorized = false;
   }
-  console.log('TLS FILES', Object.keys(options));
   return options;
 }
 function getTls() {
-  return _getTls.apply(this, arguments);
-}
-function _getTls() {
-  _getTls = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-    var options, subjt, subj, d, attr, pems, tls;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
-        case 0:
-          options = {
-            keySize: 2048,
-            days: 360,
-            algorithm: "sha256",
-            clientCertificate: true,
-            extensions: {}
-          };
-          subjt = process.env.TLS_CREATE.replaceAll('"', '').trim();
-          subj = subjt.split(',');
-          d = {};
-          subj.map(function (c) {
-            var r = c.split(':');
-            d[r[0]] = r[1];
-            return {
-              value: r[1]
-            };
-          });
+  var options = {
+    keySize: 2048,
+    days: 360,
+    algorithm: "sha256",
+    clientCertificate: true,
+    extensions: {}
+  };
+  var subjt = process.env.TLS_CREATE.replaceAll('"', '').trim();
+  var subj = subjt.split(',');
+  var d = {};
+  subj.map(function (c) {
+    var r = c.split(':');
+    d[r[0]] = r[1];
+    return {
+      value: r[1]
+    };
+  });
 
-          //  TLS_CREATE=C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost,ALT:na.sas.com
-          attr = [{
-            name: 'commonName',
-            value: d.CN /*process.env.APPHOST*/
-          }, {
-            name: 'countryName',
-            value: d.C
-          }, {
-            shortName: 'ST',
-            value: d.ST
-          }, {
-            name: 'localityName',
-            value: d.L
-          }, {
-            name: 'organizationName',
-            value: d.O
-          }, {
-            shortName: 'OU',
-            value: d.OU
-          }];
-          /*
-          	options.extensions.altNames = [
-          		//	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
-          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
-          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/api` },
-          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/logon` },
-          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}` },
-          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/api` },
-          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/logon` },
-          	];
-          	
-          	options.extensions.altNames = [
-          		  { type: 2, value: 'localhost' },     // DNS
-          		  { type: 7, ip: '127.0.0.1' },        // IPv4
-          		  { type: 7, ip: '::1' }               // IPv6
-          		];
-          */
-          options.extensions = [{
-            name: 'subjectAltName',
-            altNames: [{
-              type: 2,
-              value: 'localhost'
-            },
-            // DNS
-            {
-              type: 7,
-              ip: '127.0.0.1'
-            },
-            // IPv4
-            {
-              type: 7,
-              ip: '::1'
-            } // IPv6
-            ]
-          }];
-          console.log('tls options ', JSON.stringify(options, null, 4));
-          pems = selfsigned.generate(attr, options);
-          tls = {
-            cert: pems.cert,
-            key: pems["private"]
-          };
-          console.log('Self-signed certificates created', tls);
-          return _context3.a(2, tls);
-      }
-    }, _callee3);
-  }));
-  return _getTls.apply(this, arguments);
+  //  TLS_CREATE=C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost,ALT:na.sas.com
+  var attr = [{
+    name: 'commonName',
+    value: d.CN /*process.env.APPHOST*/
+  }, {
+    name: 'countryName',
+    value: d.C
+  }, {
+    shortName: 'ST',
+    value: d.ST
+  }, {
+    name: 'localityName',
+    value: d.L
+  }, {
+    name: 'organizationName',
+    value: d.O
+  }, {
+    shortName: 'OU',
+    value: d.OU
+  }];
+  options.extensions.altNames = [
+  //	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
+  {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME)
+  }, {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/api")
+  }, {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/logon")
+  }, {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME)
+  }, {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/api")
+  }, {
+    type: 6,
+    value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/logon")
+  }];
+  debug('tls options ', JSON.stringify(options, null, 4));
+  var pems = selfsigned.generate(attr, options);
+  var tls = {
+    cert: pems.cert,
+    key: pems["private"]
+  };
+  return tls;
 }
 var _default = exports["default"] = iService;

package/lib/index.js

@@ -5,6 +5,7 @@ require("regenerator-runtime/runtime");
 var _fs = _interopRequireDefault(require("fs"));
 var _iService = _interopRequireDefault(require("./iService"));
 var _config = _interopRequireDefault(require("./config"));
+var _readCerts = _interopRequireDefault(require("./readCerts"));
 var _yargs = _interopRequireDefault(require("yargs"));
 var _helpers = require("yargs/helpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -27,9 +28,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
  */
 
 var debug = require("debug")("startup");
-module.exports = function core(uTable, useDefault, serverMode, customize, swaggerfcn) {
+module.exports = function core(uTable, useDefault, serverMode, customize, userCache) {
   var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).argv;
-  var env = argv.env == null ? '.env' : argv.env;
+  var env = argv.env == null ? null : argv.env;
   var appenv = argv.appenv == null ? null : argv.appenv;
   var docker = argv.docker == null ? null : argv.docker;
   //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
@@ -40,9 +41,9 @@ module.exports = function core(uTable, useDefault, serverMode, customize, swagge
   console.log("Initialization started ============================================================");
   console.log("version: 2, Build Date: ", Date());
   console.log("\nCommand Line Configuration:\n          Dockerfile: ".concat(docker, "\n          env file  : ").concat(env, "\n          appenv    : ").concat(appenv, "\n          customize : ").concat(customize != null, "\n          "));
-  iapp(null, env, docker, uTable, useDefault, serverMode, customize);
+  iapp(null, env, docker, uTable, useDefault, serverMode, customize, userCache);
 };
-function iapp(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, customize) {
+function iapp(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, customize, userCache) {
   var asset = setup(rafEnv, dockerFile);
   if (appSrc == null) {
     appSrc = process.env.APPENV == null ? null : process.env.APPENV;
@@ -55,12 +56,12 @@ function iapp(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, custom
         console.log("createPayload failed");
         process.exit(1);
       } else {
-        (0, _iService["default"])(uTable, useDefault, asset, r, serverMode, customize);
+        (0, _iService["default"])(uTable, useDefault, asset, r, serverMode, customize, userCache);
       }
     });
   } else {
     var appEnv = getAllEnv({});
-    (0, _iService["default"])(uTable, useDefault, asset, appEnv, serverMode, customize);
+    (0, _iService["default"])(uTable, useDefault, asset, appEnv, serverMode, customize, userCache);
   }
 }
 function setup(rafEnv, dockerFile) {
@@ -87,7 +88,7 @@ function createPayload(srcName, cb) {
     cb(err);
   }
 }
-function getAllEnv(userData) {
+function getAllEnv(userInfo) {
   var env;
   var l = null;
   var host = trimit("VIYA_SERVER");
@@ -95,11 +96,20 @@ function getAllEnv(userData) {
     console.log('Note: setting host to null');
     host = null;
   }
+
+  /*
+  if (process.env.AUTHTYPE != null) {
+    process.env.AUTHFLOW = process.env.AUTHTYPE;
+  }
+    */
+
   var authflow = trimit("AUTHFLOW");
-  var pkce = authflow === "pkce" ? true : false;
-  if (authflow === "authorization_code" || authflow === "code" || authflow === "server" || authflow === "null" || authflow === "pkce") {
+  if (authflow === "authorization_code" || authflow === "code") {
     authflow = "server";
   }
+  if (authflow === null) {
+    host = null;
+  }
   if (host === null) {
     authflow = null;
     console.log('Note: setting authflow to null');
@@ -110,7 +120,7 @@ function getAllEnv(userData) {
   var clientID = trimit("CLIENTID");
 
   // eslint-disable-next-line no-unused-vars
-  //let clientSecret = trimit("CLIENTSECRET");
+  var clientSecret = trimit("CLIENTSECRET");
   var keepAlive = trimit("KEEPALIVE");
   var appName = trimit("APPNAME");
   var ns = trimit("NAMESPACE");
@@ -121,7 +131,6 @@ function getAllEnv(userData) {
     host: host,
     clientID: clientID,
     appName: appName,
-    pkce: pkce,
     keepAlive: null,
     useToken: process.env.USETOKEN,
     ns: ns,
@@ -172,16 +181,17 @@ function getAllEnv(userData) {
         if (v.startsWith('$')) {
           v = process.env[v.substring(1)];
         }
-        userData[k] = v != null ? v.trim() : null;
+        userInfo[k] = v != null ? v.trim() : null;
       } else {
-        userData[k] = null;
+        userInfo[k] = null;
       }
     }
   }
-  userData.APPNAME = l.appName;
+  userInfo.viyaCert = (0, _readCerts["default"])(process.env.VIYACERT);
+  userInfo.appName = appName;
   env = {
     LOGONPAYLOAD: l,
-    APPENV: userData
+    APPENV: userInfo
   };
   console.log("Final APPENV configuration for the server");
   console.log(JSON.stringify(env, null, 4));
@@ -195,4 +205,8 @@ function trimit(e) {
   }
   a = a.trim();
   return a.length === 0 ? null : a;
+}
+function readVIYACERT() {
+  var certs = null;
+  var certfile = process.env.VIYACERT;
 }

package/lib/plugins/SASauth.js

@@ -79,13 +79,11 @@ function _iSASauth() {
             provider: provider,
             password: uuid.v4(),
             clientId: options.clientId,
-            clientSecret: options.clientSecret == null ? '' : options.clientSecret,
+            clientSecret: options.clientSecret,
             //   isSameSite  : options.isSameSite,
             isSecure: options.isSecure
           };
-          if (options.pkce === true) {
-            bellAuthOptions.pkce = 'S256';
-          }
+          // console.log('SASAuth options', bellAuthOptions);
           debug('belloptions', bellAuthOptions);
           server.log('SASAuth', bellAuthOptions);
           _context2.n = 1;

package/lib/plugins/appCookie.js

@@ -16,7 +16,7 @@ module.exports = /*#__PURE__*/function () {
           return server.register(require('@hapi/cookie'));
         case 1:
           debug('in appCookie');
-          debug('redirecTo', options.redirectTo);
+          debug(options.redirectTo);
           cookieOptions = {
             cookie: {
               name: 'cookie',
@@ -34,8 +34,7 @@ module.exports = /*#__PURE__*/function () {
                 return _regenerator().w(function (_context) {
                   while (1) switch (_context.n) {
                     case 0:
-                      debugger;
-                      debug('Cookie validate', "path - ".concat(req.path));
+                      debug('Cookie validateFunc', "path - ".concat(req.path));
                       if (!(session == null)) {
                         _context.n = 1;
                         break;
@@ -68,7 +67,7 @@ module.exports = /*#__PURE__*/function () {
                         isValid: false
                       });
                     case 4:
-                      debug('Cookie validate', sid);
+                      debug('Cookie validateFunc', sid);
                       return _context.a(2, {
                         isValid: true,
                         credentials: credentials

package/lib/plugins/setContext.js

@@ -35,7 +35,8 @@ function _setContext() {
       while (1) switch (_context.n) {
         case 0:
           credentials = req.auth.credentials;
-          console.log('+++++++++++++++++++setContext', credentials != null);
+          console.log('in setContext');
+          console.log('credentials=', credentials);
           context = {
             path: req.path,
             params: req.params,
@@ -43,6 +44,7 @@ function _setContext() {
             payload: req.payload,
             queryOrig: credentials != null ? credentials.query : {},
             token: credentials != null ? "bearer ".concat(credentials.token) : null,
+            credentials: credentials,
             host: process.env.VIYA_SERVER
           };
           return _context.a(2, context);