@sassoftware/viya-serverjs 0.2.0 → 0.2.2

package/Dockerfile

@@ -23,7 +23,7 @@ ENV APPNAME=appBuilder
 ENV AUTHFLOW=
 ENV CLIENTID=appBuilder
 ENV CLIENTSECRET=jellico
-ENV HAPIDEBUG=YES
+ENV HAPIDEBUG=NO
 # ENV LOGLEVEL=info
 # ENV USETOKEN=YES
 
@@ -31,8 +31,8 @@ ENV HAPIDEBUG=YES
 ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 
 # You can specify your own cet and key
-# ENV TLS_CERT=../../../certs/cert64.cer
-# ENV TLS_KEY=../../../certs/pubkey64.pem
+ENV TLS_CRT=./tls/tls.crt
+ENV TLS_KEY=./tls/tls.key
 
 # Samesite specification
 ENV SAMESITE=None,secure

package/cli.js

@@ -1,9 +1,9 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /*
 * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 //let appServer = require('./lib/index.js');
-let appServer = require('./lib/index.js');
-console.log('Starting the cli for @sassoftware/viya-appserverjs');
-appServer(null, true, 'app', null);
+let core = require('./lib/index.js');
+console.log('Starting the cli for @sassoftware/viya-serverjs');
+core(null, true, 'app', null);

package/lib/config.js

@@ -26,7 +26,7 @@ var _parseDocker = _interopRequireDefault(require("./parseDocker"));
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 var fs = require('fs');
-var configDebug = (0, _debug["default"])('config');
+var configDebug = (0, _debug["default"])('configserver');
 function config(appEnv, dockerFile) {
   if (dockerFile != null) {
     (0, _parseDocker["default"])(dockerFile);

package/lib/handlers/appCallback.js

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

package/lib/handlers/codeAuth.js

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

package/lib/handlers/decodeJwt.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 var _jwtDecode = _interopRequireDefault(require("jwt-decode"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 /*
-* Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 

package/lib/handlers/getApp.js

@@ -10,7 +10,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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 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 © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 var debug = require('debug')('getapp');

package/lib/handlers/getUser.js

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

package/lib/handlers/index.js

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

package/lib/handlers/keepAlive.js

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

package/lib/handlers/keepAlive2.js

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

package/lib/handlers/logon.js

@@ -10,7 +10,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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 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 © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 var debug = require('debug')('logon');
@@ -25,15 +25,14 @@ function _logon() {
         case 0:
           debugger;
           debug('.................................................in logon');
-          req.log('in logon');
-          _context.next = 5;
+          _context.next = 4;
           return (0, _setCookies["default"])(req, h, null);
-        case 5:
+        case 4:
           r = _context.sent;
           debug(r.redirect);
-          req.log('in logon after setcookie', r.redirect);
+          debug('in logon after setcookie', r.redirect);
           return _context.abrupt("return", h.redirect(r.redirect));
-        case 9:
+        case 8:
         case "end":
           return _context.stop();
       }

package/lib/handlers/logout.js

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

package/lib/handlers/proxyMapUri.js

@@ -18,28 +18,26 @@ function _proxyMapUri() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           credentials = req.auth.credentials;
+          console.log('------------------------------------------');
           if (credentials != null) {
             sid = credentials.sid;
-            console.log(credentials);
             console.log('sid=', sid);
           }
           path = process.env.PROXYSERVER;
-          console.log('-----------------------------------------------------------');
-          console.log('Proxying to ', path);
+          console.log('proxying to= ', path);
           params = req.params;
-          console.log('Incoming params ', params);
+          console.log('params=', params);
           search = req.url.search;
-          console.log('Incoming query ', search);
+          console.log('query=', search);
           uri = path + '/' + params.param;
           if (search != null && search.trim().length > 0) {
             uri = uri + search;
           }
-          console.log('Final configuration ', uri);
-          console.log('-----------------------------------------------------------');
+          console.log('destination= ', uri);
           return _context.abrupt("return", {
             uri: uri
           });
-        case 14:
+        case 13:
         case "end":
           return _context.stop();
       }

package/lib/handlers/setCookies.js

@@ -9,7 +9,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 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 © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 var uuid = require('uuid');
@@ -25,9 +25,9 @@ function _setCookies() {
         case 0:
           credentials = req.auth.credentials;
           debug('setcookie', credentials);
-          // req.log('setcookie', credentials);
+          debug('setcookie', credentials);
           if (!(credentials != null && req.auth.error != null)) {
-            _context.next = 5;
+            _context.next = 6;
             break;
           }
           debug('logon failed');
@@ -35,7 +35,7 @@ function _setCookies() {
             status: false,
             error: req.auth.error
           });
-        case 5:
+        case 6:
           // create a cookie(sid) and save credentials in cache
           sid = uuid.v4();
           credentials.sid = sid;
@@ -44,9 +44,11 @@ function _setCookies() {
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
             debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          _context.next = 10;
+          _context.next = 11;
           return req.server.app.cache.set(sid, credentials, 0);
-        case 10:
+        case 11:
+          // Can we get away without setting cookie for this session?
+          // Need to also modify keepAlive
           if (process.env.COOKIES !== 'NO') {
             debugger;
             req.cookieAuth.set({
@@ -62,7 +64,7 @@ function _setCookies() {
             error: null,
             redirect: redirect
           });
-        case 16:
+        case 17:
         case "end":
           return _context.stop();
       }

package/lib/iService.js

@@ -133,7 +133,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             hapiServer.app.cache = cache;
             */
             nodeCacheOptions = {
-              stdTTL: 1 * 24 * 60 * 60 * 1000,
+              stdTTL: 24 * 60 * 60 * 1000,
               checkPeriod: 3600,
               errorOnMissing: true,
               useClones: false,
@@ -314,81 +314,32 @@ function _getCertificates() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           tls = {};
-          debug2('Getting tls certificates');
-          debug2('tls.crt', process.env['tls.crt'] != null);
-          debug2('tls.key', process.env['tls.key'] != null);
-          debug2('TLS_PFX', process.env.TLS_PFX != null);
-          debug2('TLS_PW', process.env.TLS_PW != null);
-          debug2('TLS_CERT', process.env.TLS_CERT != null);
           debug2('TLS_CRT', process.env.TLS_CRT != null);
           debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-          if (!(process.env.TLS_CERT != null && process.env.TLS_CERT.length > 0)) {
-            _context2.next = 15;
-            break;
-          }
-          /* backward compatability */
-          debug2('TLS set: TLS_CERT');
-          tls.cert = fs.readFileSync(process.env.TLS_CERT);
-          tls.key = fs.readFileSync(process.env.TLS_KEY);
-          _context2.next = 37;
-          break;
-        case 15:
-          if (!(process.env.TLS_PFX != null)) {
-            _context2.next = 21;
-            break;
-          }
-          debug2('TLS set: PFX');
-          tls.pfx = fs.readFileSync(process.env.TLS_PFX);
-          if (process.env.TLS_PW != null) {
-            tls.passphrase = process.env.TLS_PW;
-          }
-          _context2.next = 37;
-          break;
-        case 21:
-          if (!(process.env.TLS_CRT != null && process.env.TLS_CRT.trim().length > 0)) {
-            _context2.next = 27;
-            break;
-          }
-          /* new key names to conform to k8s*/
-          debug2('TLS set: TLS_CRT');
-          tls.cert = process.env.TLS_CRT;
-          tls.key = process.env.TLS_KEY;
-          _context2.next = 37;
-          break;
-        case 27:
-          if (!(process.env['tls.crt'] != null)) {
-            _context2.next = 32;
-            break;
+          if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
+            if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
+              console.log('TLS_CRT and TLS_KEY exist');
+              tls.cert = fs.readFileSync(process.env.TLS_CRT);
+              tls.key = fs.readFileSync(process.env.TLS_KEY);
+            }
           }
-          tls.cert = process.env['tls.crt'];
-          tls.key = process.env['tls.key'];
-          _context2.next = 37;
-          break;
-        case 32:
-          if (!(process.env.TLS_CREATE != null)) {
-            _context2.next = 37;
+          if (!(tls.cert == null && process.env.TLS_CREATE != null)) {
+            _context2.next = 10;
             break;
           }
           /* unsigned certificate */
+          console.log('Creating selfsigned certificate');
           debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
-          _context2.next = 36;
+          _context2.next = 9;
           return getTls();
-        case 36:
+        case 9:
           tls = _context2.sent;
-        case 37:
-          if (process.env.TLS_CABUNDLE != null) {
-            tls.CA = fs.readFileSync(process.env.TLS_CABUNDLE);
+        case 10:
+          if (Object.keys(tls).length === 0) {
+            console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
           }
-          debug2('TLS', tls);
-          if (!(Object.keys(tls).length > 0)) {
-            _context2.next = 43;
-            break;
-          }
-          return _context2.abrupt("return", tls);
-        case 43:
-          console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
           return _context2.abrupt("return", tls);
-        case 45:
+        case 12:
         case "end":
           return _context2.stop();
       }

package/lib/index.js

@@ -25,19 +25,19 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
  */
 
 var debug = require("debug")("startup");
-module.exports = function appServer(uTable, useDefault, serverMode, customize) {
+module.exports = function core(uTable, useDefault, serverMode, customize, swaggerfcn) {
   var argv = require("yargs").argv;
   var env = argv.env == null ? null : argv.env;
   var appenv = argv.appenv == null ? null : argv.appenv;
   var docker = argv.docker == null ? null : argv.docker;
-  serverMode = serverMode == null ? "app" : serverMode;
-  process.env.SERVERMODE = serverMode;
+  //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
+
   if (useDefault == null) {
     useDefault = true;
   }
   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          serverMode: ").concat(serverMode, "\n          "));
+  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);
 };
 function iapp(appSrc, rafEnv, dockerFile, uTable, useDefault, serverMode, customize) {
@@ -93,13 +93,20 @@ function getAllEnv(userData) {
     console.log('Note: setting host to null');
     host = null;
   }
-  if (process.env.AUTHTYPE != null) {
-    process.env.AUTHFLOW = process.env.AUTHTYPE;
-  }
+
+  /*
+  if (process.env.AUTHTYPE != null) {
+    process.env.AUTHFLOW = process.env.AUTHTYPE;
+  }
+    */
+
   var authflow = trimit("AUTHFLOW");
   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');

package/lib/parseDocker.js

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

package/lib/plugins/setDefaultRoutes.js

@@ -166,7 +166,6 @@ module.exports = function setDefaultRoutes(server, options) {
         allAppEnv.credentials = options.credentials;
         var s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
         if (process.env.SHOWENV != null) {
-          console.log(options.allAppEnv);
           console.log(s);
         }
         debug(s);
@@ -189,21 +188,25 @@ module.exports = function setDefaultRoutes(server, options) {
         allAppEnv.credentials = options.credentials;
         var s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
         if (process.env.SHOWENV != null) {
-          console.log(options.allAppEnv);
-          console.log(s);
+          debug(options.allAppEnv);
         }
         debug(s);
         return s;
       }
     }
-  }, {
-    method: ["GET"],
-    path: "".concat(appName, "/{param*}"),
-    options: {
-      auth: authDefault,
-      handler: _handlers.getApp2
-    }
-  }, {
+  },
+  /*
+    {
+      method: ["GET"],
+      path: `${appName}/{param*}`,
+        options: {
+        auth: authDefault,
+        handler: getApp2,
+      },
+    },
+    */
+
+  {
     method: ["GET"],
     path: "/{param*}",
     options: {
@@ -225,24 +228,21 @@ module.exports = function setDefaultRoutes(server, options) {
       handler: _handlers.keepAlive2
     }
   }];
-  if (process.env.PROXYSERVER != null) {
-    var pr = {
-      method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
-      path: "".concat(appName, "/proxy/{param*}"),
-      options: {
-        handler: {
-          proxy: {
-            mapUri: _handlers.proxyMapUri,
-            xforward: true,
-            passThrough: true
-          }
+  var pr = {
+    method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
+    path: "".concat(appName, "/proxy/{param*}"),
+    options: {
+      handler: {
+        proxy: {
+          mapUri: _handlers.proxyMapUri,
+          xforward: true,
+          passThrough: true
         }
       }
-    };
-    console.log(pr);
-    defaultTable.push(pr);
-  }
-  console.log(uTable);
+    }
+  };
+  debug(pr);
+  defaultTable.push(pr);
   var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);
 };

package/package.json

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

package/server.js

@@ -2,161 +2,191 @@
  * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-let appServer = require('./lib/index.js');
+let core = require('./lib/index.js');
 debugger;
-appServer(getCustomHandler, true, 'app', customize);
+core(getCustomHandler, true, 'app', customize);
 function customize(key, _options) {
-  debugger;
-  let info = {
-    SWAGGEROPTIONS: {},
-    APPENV: null,
-  };
-  return info[key];
+	debugger;
+	let info = {
+		SWAGGEROPTIONS: {},
+		APPENV: null,
+	};
+	return info[key];
 }
 
 function getCustomHandler() {
-  let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
-  debugger;
-  let routes = [
-    {
-      method: ["GET"],
-      path: `${appName}/new`,
-      options: {
+	let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
+	debugger;
+	let routes = [
+		{
+			method: ["GET"],
+			path: "/help",
+			options: {
 				files: {
-          relativeTo: process.env.APPDIR,
-        },
-        handler: async (req, h) => {
+					relativeTo: "./public",
+				},
+				handler: async (req, h) => {
+					debugger;
+					let hf = 'help.html';
+					return h.file(hf);
+				},
+				auth: false,
+				description: "Help",
+				notes: "Help",
+				tags: ["app"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/new`,
+			options: {
+				files: {
+					relativeTo: process.env.APPDIR,
+				},
+				handler: async (req, h) => {
 					console.log('in new');
 					let q = req.pre.context;
 					console.log('query', q.query);
 					console.log('queryOrig', q.queryOrig);
 					let hf = null;
-					if (q.query != null ) {
+					if (q.query != null) {
 						let app = q.query;
 						if (app.edit != null) {
-							hf = app.edit+ '/design.html';
+							hf = app.edit + '/design.html';
 						} else if (app.view != null) {
-							hf= app.view + '/index.html';
-						} 
+							hf = app.view + '/index.html';
+						}
 					}
 					console.log('hf=', hf);
 					if (hf === null) {
 						hf = getIndex();
-						return h.response(hf).header('contentType','text/html'); 
+						return h.response(hf).header('contentType', 'text/html');
 					} else {
-					   return h.file(hf); 
+						return h.file(hf);
 					}
-					
-        },
-       // auth: 'logon',
-        description: "Create new application",
-        notes: "Index file created from env data",
-        tags: ["app"],
-      },
-    },
+
+				},
+				// auth: 'logon',
+				description: "Create new application",
+				notes: "Index file created from env data",
+				tags: ["app"],
+			},
+		},
 		{
-      method: ["GET"],
-      path: `${appName}/ntest/{app?}`,
-      options: {
-        
-        handler: async (req, h) => {
+			method: ["GET"],
+			path: `${appName}/ntest/{app?}`,
+			options: {
+
+				handler: async (req, h) => {
 					params = req.params;
 					console.log('params', params.app);
-          let hf = req.pre.context.queryOrig.app;
-          console.log('hf=', hf);
-          return h.file('help.html');
-        },
-       // auth: 'logon',
-        description: "App Route",
-        notes: "Default App Route",
-        tags: ["app"],
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}/view`,
-      options: {
-        
-        handler: async (req, h) => {
-          let hf = req.pre.context.queryOrig.app;
-          console.log('hf=', hf);
-          return h.file('help.html');
-        },
-       // auth: 'logon',
-        description: "App Route",
-        notes: "Default App Route",
-        tags: ["app"],
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}/edit`,
-      options: {
-        files: {
-          relativeTo: process.env.APPDIR,
-        },
-        handler: async (req, h) => {
-          let hf = req.pre.context.queryOrig.app;
-          console.log('hf=', hf);
-          return h.file(hf + '/design.html');
-        },
-      //  auth: 'logon',
-        description: "App Route",
-        notes: "Default App Route",
-        tags: ["app"],
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}/test`,
-      options: {
-        handler: async (req, h) => {
-          debugger;
-          console.log("++++++++++++++++++++++ in post");
-          let context = req.pre.context;
-          console.log(context);
-          let loc = req.context.queryOrig.h;
-          console.log(loc);
-          return h.file(loc);
-        },
-        auth: false,
-        description:
-          "Another test",
-        notes: "second test",
-        tags: ["api"],
-      },
-    },
-  ];
-  return routes;
+					let hf = req.pre.context.queryOrig.app;
+					console.log('hf=', hf);
+					return h.file('help.html');
+				},
+				// auth: 'logon',
+				description: "App Route",
+				notes: "Default App Route",
+				tags: ["app"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/view`,
+			options: {
+
+				handler: async (req, h) => {
+					let hf = req.pre.context.queryOrig.app;
+					console.log('hf=', hf);
+					return h.file('help.html');
+				},
+				// auth: 'logon',
+				description: "App Route",
+				notes: "Default App Route",
+				tags: ["app"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/edit`,
+			options: {
+				files: {
+					relativeTo: process.env.APPDIR,
+				},
+				handler: async (req, h) => {
+					let hf = req.pre.context.queryOrig.app;
+					console.log('hf=', hf);
+					return h.file(hf + '/design.html');
+				},
+				//  auth: 'logon',
+				description: "App Route",
+				notes: "Default App Route",
+				tags: ["app"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/test`,
+			options: {
+				handler: async (req, h) => {
+					debugger;
+					console.log("++++++++++++++++++++++ in post");
+					let context = req.pre.context;
+					console.log(context);
+					let loc = req.context.queryOrig.h;
+					console.log(loc);
+					return h.file(loc);
+				},
+				auth: false,
+				description:
+					"Another test",
+				notes: "second test",
+				tags: ["api"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/{param*}`,
+
+			options: {
+				handler: async (req, h) => {
+					console.log('in get param');
+					console.log(req.params);
+					return ('hi');
+				},
+			}
+		},
+	];
+	return routes;
 }
 function customize(key, options) {
-  let info = {
-    swaggerOptions: {
-      info: {
-        title: "Test API",
-        version: "0.0.1",
-        description: "This document was auto-generated at run time",
-      },
-      documentationPage: true,
-      documentationPath: `/${process.env.APPNAME}/documentation`,
-      swaggerUI: true,
-      swaggerUIPath: `/${process.env.APPNAME}/swaggerui`,
-      schemes: ["https", "http"],
-      cors: true,
-      auth: options.authDefault,
-    },
-    APPENV: {
-      x: 1,
-      y: 2,
-    },
-  };
-  let r = info[key];
-  return r == null ? {} : r;
+	let info = {
+		swaggerOptions: {
+			info: {
+				title: "Test API",
+				version: "0.0.1",
+				description: "This document was auto-generated at run time",
+			},
+			documentationPage: true,
+			documentationPath: `/${process.env.APPNAME}/documentation`,
+			swaggerUI: true,
+			swaggerUIPath: `/${process.env.APPNAME}/swaggerui`,
+			schemes: ["https", "http"],
+			cors: true,
+			auth: options.authDefault,
+		},
+		APPENV: {
+			x: 1,
+			y: 2,
+		},
+	};
+	let r = info[key];
+	return r == null ? {} : r;
 }
 
 function getIndex() {
 
-  let template = `
+	let template = `
   <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
@@ -440,5 +470,5 @@ function getIndex() {
 	</body>
 </html>
   `;
-return template;
+	return template;
 }

package/src/config.js

@@ -21,7 +21,7 @@
 let fs = require('fs');
 import parseDocker from './parseDocker';
 import debug from 'debug';
-let configDebug = debug('config');
+let configDebug = debug('configserver');
 
 function config(appEnv, dockerFile) {
 

package/src/handlers/appCallback.js

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

package/src/handlers/codeAuth.js

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

package/src/handlers/decodeJwt.js

@@ -1,5 +1,5 @@
 /*
-* Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 

package/src/handlers/getApp.js

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import codeAuth from './codeAuth';

package/src/handlers/getUser.js

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

package/src/handlers/index.js

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

package/src/handlers/keepAlive.js

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

package/src/handlers/keepAlive2.js

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

package/src/handlers/logon.js

@@ -1,5 +1,5 @@
 /*
-* Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 
@@ -8,11 +8,11 @@ let debug = require('debug')('logon');
 async function logon (req, h) {
    debugger;
    debug('.................................................in logon');
-   req.log('in logon');
+   
    
    let r = await setCookies(req, h, null);
    debug(r.redirect);
-   req.log('in logon after setcookie', r.redirect);
+   debug('in logon after setcookie', r.redirect);
    return h.redirect(r.redirect);
 }
 

package/src/handlers/logout.js

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

package/src/handlers/proxyMapUri.js

@@ -1,25 +1,22 @@
 async function proxyMapUri (req) {
   let credentials = req.auth.credentials;
- 
+  console.log('------------------------------------------');
   if (credentials != null) {
     let sid = credentials.sid;
-    console.log(credentials);
     console.log('sid=', sid);
   }
-  
+ 
   let path = process.env.PROXYSERVER;
-  console.log('-----------------------------------------------------------');
-  console.log('Proxying to ', path);
+  console.log('proxying to= ', path);
   let params = req.params;
-  console.log('Incoming params ', params);
+  console.log('params=', params);
   let search = req.url.search;
-  console.log('Incoming query ', search);
+  console.log('query=', search);
   let uri = path + '/' + params.param;
   if (search != null && search.trim().length > 0) {
     uri = uri + search;
   } 
-  console.log('Final configuration ',uri);
-  console.log('-----------------------------------------------------------');
+  console.log('destination= ',uri);
   return {
     uri: uri
   };

package/src/handlers/setCookies.js

@@ -1,5 +1,5 @@
 /*
-* Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
 let uuid      = require('uuid');
@@ -8,7 +8,7 @@ let debug = require('debug')('setcookies');
 async function setCookies (req, h, options) {
     let credentials = req.auth.credentials;
     debug('setcookie', credentials);
-    // req.log('setcookie', credentials);
+    debug('setcookie', credentials);
     if (credentials != null && req.auth.error != null) {
         debug('logon failed');
         return { status: false, error: req.auth.error };
@@ -25,6 +25,8 @@ async function setCookies (req, h, options) {
     
     
     await req.server.app.cache.set(sid, credentials, 0);
+    // Can we get away without setting cookie for this session?
+    // Need to also modify keepAlive
     if (process.env.COOKIES !== 'NO') {
         debugger;
         req.cookieAuth.set({ sid });

package/src/iService.js

@@ -116,7 +116,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		*/
 
 		let nodeCacheOptions = {
-			stdTTL        : 1 * 24 * 60 * 60 * 1000,
+			stdTTL        : 24*60*60*1000, 
 			checkPeriod   : 3600,
 			errorOnMissing: true,
 			useClones     : false,
@@ -197,7 +197,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		}
 		hapiServer.log('Plugin', process.env.PLUGIN);
 		
-		if (process.env.PLUGIN === 'hapi-swagger' && serverMode === 'api') {
+		if (process.env.PLUGIN === 'hapi-swagger' && serverMode ==='api') {
 			let	swaggerOptions = {
 				"info": {
 					"title"      : `API for ${process.env.APPNAME}`,
@@ -259,49 +259,26 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 async function getCertificates () {
 
 	let tls = {};
-	debug2('Getting tls certificates');
-	debug2('tls.crt', process.env['tls.crt'] != null);
-	debug2('tls.key', process.env['tls.key'] != null);
-	debug2('TLS_PFX', process.env.TLS_PFX != null);
-	debug2('TLS_PW', process.env.TLS_PW != null);
-	debug2('TLS_CERT', process.env.TLS_CERT != null);
 	debug2('TLS_CRT', process.env.TLS_CRT != null);
 	debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-	if (process.env.TLS_CERT != null && process.env.TLS_CERT.length > 0) {
-		/* backward compatability */
-		debug2('TLS set: TLS_CERT');
-		tls.cert = fs.readFileSync(process.env.TLS_CERT);
-		tls.key = fs.readFileSync(process.env.TLS_KEY);
-	} else if (process.env.TLS_PFX != null) {
-		debug2('TLS set: PFX');
-		tls.pfx = fs.readFileSync(process.env.TLS_PFX);
-		if (process.env.TLS_PW != null) {
-			tls.passphrase = process.env.TLS_PW;
+	if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
+		if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
+			console.log('TLS_CRT and TLS_KEY exist');
+			tls.cert = fs.readFileSync(process.env.TLS_CRT);
+			tls.key = fs.readFileSync(process.env.TLS_KEY);
 		}
-	} else if (process.env.TLS_CRT != null && process.env.TLS_CRT.trim().length > 0) {
-		/* new key names to conform to k8s*/
-		debug2('TLS set: TLS_CRT');
-		tls.cert = process.env.TLS_CRT;
-		tls.key = process.env.TLS_KEY;
-	} else if (process.env['tls.crt'] != null) {
-		tls.cert = process.env['tls.crt'];
-		tls.key = process.env['tls.key'];
-	} else if (process.env.TLS_CREATE != null) {
+
+	} 
+	if (tls.cert == null && process.env.TLS_CREATE != null) {
 		/* unsigned certificate */
+		console.log('Creating selfsigned certificate');
 		debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
 		tls = await getTls();
 	}
-
-	if (process.env.TLS_CABUNDLE != null) {
-		tls.CA = fs.readFileSync(process.env.TLS_CABUNDLE);
-	}
-	debug2('TLS', tls);
-	if (Object.keys(tls).length > 0) {
-		return tls;
-	} else {
+	if (Object.keys(tls).length === 0){
 		console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
-		return tls;
-	}
+  }
+return tls;
 }
 
 async function getTls () {

package/src/index.js

@@ -23,18 +23,19 @@ import iService from "./iService";
 import config from "./config";
 let debug = require("debug")("startup");
 
-module.exports = function appServer(
+module.exports = function core(
   uTable,
   useDefault,
   serverMode,
-  customize
+  customize,
+  swaggerfcn
 ) {
   let argv = require("yargs").argv;
   let env = argv.env == null ? null : argv.env;
   let appenv = argv.appenv == null ? null : argv.appenv;
   let docker = argv.docker == null ? null : argv.docker;
-  serverMode = serverMode == null ? "app": serverMode;
-  process.env.SERVERMODE = serverMode;
+  //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
+
 
   if (useDefault == null) {
     useDefault = true;
@@ -48,8 +49,7 @@ module.exports = function appServer(
           Dockerfile: ${docker}
           env file  : ${env}
           appenv    : ${appenv}
-          customize : ${customize != null},
-          serverMode: ${serverMode}
+          customize : ${customize != null}
           `
   );
 
@@ -122,13 +122,19 @@ function getAllEnv(userData) {
     host = null;
   }
 
+  /*
   if (process.env.AUTHTYPE != null) {
     process.env.AUTHFLOW = process.env.AUTHTYPE;
   }
+    */ 
 
   let authflow = trimit("AUTHFLOW");
   if (authflow === "authorization_code" || authflow === "code") {
     authflow = "server";
+  } 
+
+  if (authflow === null) {
+    host = null;
   }
 
   if (host === null) {

package/src/parseDocker.js

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

package/src/plugins/setDefaultRoutes.js

@@ -165,7 +165,6 @@ module.exports = function setDefaultRoutes(server, options) {
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
           if (process.env.SHOWENV != null) {
-            console.log(options.allAppEnv);
             console.log(s);
           }
           debug(s);
@@ -192,15 +191,15 @@ module.exports = function setDefaultRoutes(server, options) {
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
           if (process.env.SHOWENV != null) {
-            console.log(options.allAppEnv);
-            console.log(s);
+            debug(options.allAppEnv);
+
           }
           debug(s)
           return s;
         },
       },
     },
-		
+		/*
     {
       method: ["GET"],
       path: `${appName}/{param*}`,
@@ -210,6 +209,7 @@ module.exports = function setDefaultRoutes(server, options) {
         handler: getApp2,
       },
     },
+    */
 		
     {
       method: ["GET"],
@@ -238,7 +238,6 @@ module.exports = function setDefaultRoutes(server, options) {
     },
   ];
 
-  if (process.env.PROXYSERVER != null) {
     let pr = {
       method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
       path: `${appName}/proxy/{param*}`,
@@ -252,10 +251,9 @@ module.exports = function setDefaultRoutes(server, options) {
         },
       },
     };
-    console.log(pr);
+    debug(pr);
     defaultTable.push(pr);
-  }
-  console.log(uTable);
+  
   let routeTables =
     uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);