@sassoftware/viya-serverjs 0.3.0 → 0.5.0

package/lib/iService.js

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _file = require("@hapi/inert/lib/file");
 var _setupAuth = _interopRequireDefault(require("./plugins/setupAuth"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, 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; }
@@ -21,22 +23,22 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-/*
- *  ------------------------------------------------------------------------------------
- *  * Copyright (c) SAS Institute Inc.
- *  *  Licensed under the Apache License, Version 2.0 (the "License");
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  * http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  *  Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an "AS IS" BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  limitations under the License.
- * ----------------------------------------------------------------------------------------
- *
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * Copyright (c) SAS Institute Inc.
+ *  *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *  Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * ----------------------------------------------------------------------------------------
+ *
  */
 
 var fs = require('fs');
@@ -54,10 +56,10 @@ var os = require('os');
 function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, userInfo) {
   // process.env.APPHOST_ADDR = process.env.APPHOST;
   var init = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    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;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (process.env.APPHOST === '*') {
               process.env.APPHOST = os.hostname();
@@ -93,10 +95,10 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
                   origin: ['*'],
                   credentials: true,
                   "headers": ["Accept", "Authorization", "Content-Type", "If-None-Match", "Accept-language"]
-                  /*
-                  'Access-Control-Allow-Methods': ['GET', 'POST', 'OPTIONS'],
-                  additionalHeaders             : ['multipart/form-data', 'content-disposition'],
-                  additionalExposedHeaders      : ['location'],
+                  /*
+                  'Access-Control-Allow-Methods': ['GET', 'POST', 'OPTIONS'],
+                  additionalHeaders             : ['multipart/form-data', 'content-disposition'],
+                  additionalExposedHeaders      : ['location'],
                   */
                 }
               }
@@ -108,19 +110,19 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             }
             debug(JSON.stringify(sConfig, null, 4));
             if (!(process.env.HTTPS === 'true')) {
-              _context.next = 16;
+              _context.n = 2;
               break;
             }
-            _context.next = 12;
+            _context.n = 1;
             return getCertificates();
-          case 12:
-            sConfig.tls = _context.sent;
+          case 1:
+            sConfig.tls = _context.v;
             debug('Setup of SSL certificates completed');
-            _context.next = 17;
+            _context.n = 3;
             break;
-          case 16:
+          case 2:
             debug('Running with no SSL certificates');
-          case 17:
+          case 3:
             if (asset !== null) {
               sConfig.routes.files = {
                 relativeTo: asset
@@ -128,9 +130,9 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             }
             debug2("Application information: \n\t\tAPPLOC  : ".concat(process.env.APPLOC, "\n\t\tAPPENTRY: ").concat(process.env.APPENTRY, "\n"));
             hapiServer = Hapi.server(sConfig);
-            /*
-            const cache = hapiServer.cache({ segment: 'sessions', expiresIn: 3 * 24 * 60 * 60 * 1000 });
-            hapiServer.app.cache = cache;
+            /*
+            const cache = hapiServer.cache({ segment: 'sessions', expiresIn: 3 * 24 * 60 * 60 * 1000 });
+            hapiServer.app.cache = cache;
             */
             nodeCacheOptions = {
               stdTTL: 24 * 60 * 60 * 1000,
@@ -150,34 +152,34 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               relativeTo: __dirname,
               path: '.'
             };
-            _context.next = 26;
+            _context.n = 4;
             return hapiServer.register(Vision);
-          case 26:
+          case 4:
             hapiServer.views(visionOptions);
-            _context.next = 29;
+            _context.n = 5;
             return hapiServer.register(inert);
-          case 29:
+          case 5:
             if (!(process.env.HTTPS === 'true')) {
-              _context.next = 32;
+              _context.n = 6;
               break;
             }
-            _context.next = 32;
+            _context.n = 6;
             return hapiServer.register({
               plugin: require('hapi-require-https'),
               options: {}
             });
-          case 32:
-            _context.next = 34;
+          case 6:
+            _context.n = 7;
             return hapiServer.register(H202);
-          case 34:
-            /*
-            await hapiServer.register({
-            	plugin : require('hapi-pino'),
-            	options: {
-            		prettyPrint: process.env.NODE_ENV !== 'production',
-            		level      : process.env.LOGLEVEL == null ? 'silent' : process.env.LOGLEVEL,
-            	},
-            });
+          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,
+            	},
+            });
             */
             // setup authentication related plugins
             options = {
@@ -191,6 +193,7 @@ 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,
@@ -208,12 +211,12 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             };
             debug2('Options', options);
             if (!(process.env.AUTHFLOW != null)) {
-              _context.next = 40;
+              _context.n = 9;
               break;
             }
-            _context.next = 39;
+            _context.n = 8;
             return (0, _setupAuth["default"])(hapiServer, options);
-          case 39:
+          case 8:
             if (process.env.PREAUTH === 'YES') {
               console.log('Preauth enabled');
               hapiServer.ext('onPreAuth', function (request, h) {
@@ -229,10 +232,10 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
                 return h["continue"];
               });
             }
-          case 40:
+          case 9:
             console.log('Plugin', process.env.PLUGIN);
             if (!(process.env.PLUGIN === 'hapi-swagger' && serverMode === 'api')) {
-              _context.next = 49;
+              _context.n = 11;
               break;
             }
             swaggerOptions = {
@@ -257,27 +260,27 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               swaggerOptions = _objectSpread(_objectSpread({}, swaggerOptions), override);
             }
             debug('Swagger Options:', swaggerOptions);
-            _context.next = 47;
+            _context.n = 10;
             return hapiServer.register({
               plugin: serverMode,
               options: swaggerOptions
             });
-          case 47:
-            _context.next = 50;
+          case 10:
+            _context.n = 12;
             break;
-          case 49:
+          case 11:
             if (process.env.PLUGIN == 'hapi-openapi' && serverMode === 'api') {
               console.log('hapi-openapi', 'coming soon');
             }
-          case 50:
+          case 12:
             //
             // Start server
             //
             // eslint-disable-next-line no-unused-vars
             allRoutes = hapiServer.table();
-            _context.next = 53;
+            _context.n = 13;
             return hapiServer.start();
-          case 53:
+          case 13:
             hh = hapiServer.info.uri;
             hh = hh.replace(/0.0.0.0/, 'localhost');
             console.log('====================================================================================');
@@ -288,9 +291,8 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             process.env.APPSERVER = "".concat(hh, "/").concat(process.env.APPNAME);
             process.env.HEALTH = 'true';
             console.log('====================================================================================');
-          case 63:
-          case "end":
-            return _context.stop();
+          case 14:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -308,60 +310,63 @@ function getCertificates() {
   return _getCertificates.apply(this, arguments);
 }
 function _getCertificates() {
-  _getCertificates = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  _getCertificates = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
     var options, tlsdir;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           options = null;
           tlsdir = process.env.SSLCERT;
           if (!(tlsdir != null && tlsdir.trim().length > 0)) {
-            _context2.next = 7;
+            _context2.n = 1;
             break;
           }
-          console.log('ssl CERTIFICATES', tlsdir);
-          if (fs.existsSync("".concat(tlsdir, "/key.pem")) === true) {
-            options = {};
-            options.key = fs.readFileSync("".concat(tlsdir, "/key.pem"), {
-              encoding: 'utf8'
-            });
-            options.cert = fs.readFileSync("".concat(tlsdir, "/crt.pem"), {
-              encoding: 'utf8'
-            });
-            if (fs.existsSync("".concat(tlsdir, "/ca.pem")) === true) {
-              options.ca = fs.readFileSync("".concat(tlsdir, "/ca.pem"), {
-                encoding: 'utf8'
-              });
-            }
-            options.rejectUnauthorized = true;
-          }
-          _context2.next = 12;
+          options = readTLS(tlsdir);
+          options.rejectUnauthorized = true;
+          _context2.n = 3;
           break;
-        case 7:
+        case 1:
           console.log('No SSL certificates found, generating self-signed certificates');
-          _context2.next = 10;
+          _context2.n = 2;
           return getTls();
-        case 10:
-          options = _context2.sent;
+        case 2:
+          options = _context2.v;
           options.rejectUnauthorized = false;
-        case 12:
-          return _context2.abrupt("return", options);
-        case 13:
-        case "end":
-          return _context2.stop();
+        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'
+    });
+  }
+  console.log('TLS FILES', Object.keys(options));
+  return options;
+}
 function getTls() {
   return _getTls.apply(this, arguments);
 }
 function _getTls() {
-  _getTls = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+  _getTls = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
     var options, subjt, subj, d, attr, pems, tls;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
           options = {
             keySize: 2048,
@@ -428,10 +433,7 @@ function _getTls() {
             cert: pems.cert,
             key: pems["private"]
           };
-          return _context3.abrupt("return", tls);
-        case 11:
-        case "end":
-          return _context3.stop();
+          return _context3.a(2, tls);
       }
     }, _callee3);
   }));

package/lib/index.js

@@ -5,29 +5,31 @@ require("regenerator-runtime/runtime");
 var _fs = _interopRequireDefault(require("fs"));
 var _iService = _interopRequireDefault(require("./iService"));
 var _config = _interopRequireDefault(require("./config"));
+var _yargs = _interopRequireDefault(require("yargs"));
+var _helpers = require("yargs/helpers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-/*
- *  ------------------------------------------------------------------------------------
- *  * Copyright (c) SAS Institute Inc.
- *  *  Licensed under the Apache License, Version 2.0 (the 'License');
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  * http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  *  Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an 'AS IS' BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  limitations under the License.
- * ----------------------------------------------------------------------------------------
- *
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * Copyright (c) SAS Institute Inc.
+ *  *  Licensed under the Apache License, Version 2.0 (the 'License');
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *  Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an 'AS IS' BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * ----------------------------------------------------------------------------------------
+ *
  */
 
 var debug = require("debug")("startup");
 module.exports = function core(uTable, useDefault, serverMode, customize, swaggerfcn) {
-  var argv = require("yargs").argv;
-  var env = argv.env == null ? null : argv.env;
+  var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).argv;
+  var env = argv.env == null ? '.env' : 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";
@@ -93,20 +95,11 @@ 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");
-  if (authflow === "authorization_code" || authflow === "code") {
+  var pkce = authflow === "pkce" ? true : false;
+  if (authflow === "authorization_code" || authflow === "code" || authflow === "server" || authflow === "null" || authflow === "pkce") {
     authflow = "server";
   }
-  if (authflow === null) {
-    host = null;
-  }
   if (host === null) {
     authflow = null;
     console.log('Note: setting authflow to null');
@@ -117,7 +110,7 @@ function getAllEnv(userData) {
   var clientID = trimit("CLIENTID");
 
   // eslint-disable-next-line no-unused-vars
-  var clientSecret = trimit("CLIENTSECRET");
+  //let clientSecret = trimit("CLIENTSECRET");
   var keepAlive = trimit("KEEPALIVE");
   var appName = trimit("APPNAME");
   var ns = trimit("NAMESPACE");
@@ -128,6 +121,7 @@ function getAllEnv(userData) {
     host: host,
     clientID: clientID,
     appName: appName,
+    pkce: pkce,
     keepAlive: null,
     useToken: process.env.USETOKEN,
     ns: ns,
@@ -184,6 +178,7 @@ function getAllEnv(userData) {
       }
     }
   }
+  userData.APPNAME = l.appName;
   env = {
     LOGONPAYLOAD: l,
     APPENV: userData

package/lib/parseDocker.js

@@ -1,6 +1,6 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
+/*
+ * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 'use strict';