@sassoftware/viya-serverjs 0.2.2 → 0.2.3

package/lib/plugins/setupAuth.js

@@ -1,13 +1,13 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-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); }
-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); }); }; }
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+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); }
+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 (c) SAS Institute Inc.
@@ -24,64 +24,65 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  *  limitations under the License.
  * ----------------------------------------------------------------------------------------
  *
- */
-
-var SASauth = require('./SASauth');
-var appCookie = require('./appCookie');
-var token = require('./token');
-var setDefaultRoutes = require('./setDefaultRoutes');
-
+ */
+
+var SASauth = require('./SASauth');
+var appCookie = require('./appCookie');
+var token = require('./token');
+var setDefaultRoutes = require('./setDefaultRoutes');
+var log = require('debug')('auth');
+
 /** Notes:
  * If api then register sasAuth and token - no cookies
  * If app, then register sasAuth and cookie(session) but no token 
- */
-function setupAuth(_x, _x2) {
-  return _setupAuth.apply(this, arguments);
-}
-function _setupAuth() {
-  _setupAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(server, options) {
-    var def;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (!(options.authFlow === 'server')) {
-            _context.next = 12;
-            break;
-          }
-          _context.next = 3;
-          return server.register({
-            plugin: SASauth,
-            options: options
-          });
-        case 3:
-          _context.next = 5;
-          return appCookie(server, options);
-        case 5:
-          def = 'session';
-          if (!(options.serverMode === 'api')) {
-            _context.next = 10;
-            break;
-          }
-          _context.next = 9;
-          return server.register({
-            plugin: token
-          });
-        case 9:
-          def = 'token';
-        case 10:
-          server.log('***********************Default auth', def);
-          server.auth["default"](def);
-          // console.log(server.registerations);
-        case 12:
-          setDefaultRoutes(server, options);
-          return _context.abrupt("return", true);
-        case 14:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _setupAuth.apply(this, arguments);
-}
-;
+ */
+function setupAuth(_x, _x2) {
+  return _setupAuth.apply(this, arguments);
+}
+function _setupAuth() {
+  _setupAuth = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(server, options) {
+    var def;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(options.authFlow === 'server')) {
+            _context.next = 12;
+            break;
+          }
+          _context.next = 3;
+          return server.register({
+            plugin: SASauth,
+            options: options
+          });
+        case 3:
+          _context.next = 5;
+          return appCookie(server, options);
+        case 5:
+          def = 'session';
+          if (!(options.serverMode === 'api')) {
+            _context.next = 10;
+            break;
+          }
+          _context.next = 9;
+          return server.register({
+            plugin: token
+          });
+        case 9:
+          def = 'token';
+        case 10:
+          log('***********************Default auth', def);
+          server.auth["default"](def);
+          // console.log(server.registerations);
+        case 12:
+          setDefaultRoutes(server, options);
+          return _context.abrupt("return", true);
+        case 14:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _setupAuth.apply(this, arguments);
+}
+;
 var _default = exports["default"] = setupAuth;

package/package.json

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

package/public/index.html

@@ -66,8 +66,13 @@
 	
 		<script>
 			debugger;
+			console.log(JSON.stringify(APPENV, null, 4));
 			let store = restaf.initStore({
-				casProxy: true});
+				casProxy: true,
+				options: {
+					proxyServer: APPENV.PROXYSERVER,
+				}
+			});
 			debugger;	console.log(store.config);
 
 			let session = null;
@@ -126,6 +131,7 @@
 					return 'done';
 				}
 				let msg = await store.logon(LOGONPAYLOAD);
+				console.log(store.connection());
 				console.log(msg);
 
 			//	let { identities } = await store.addServices('identities');
@@ -216,7 +222,7 @@
 				return true;
 			}
 			async function runCas(store) {
-				
+				debugger;
 				let {casManagement} = await store.addServices('casManagement');
 				let servers = await store.apiCall(
 					casManagement.links('servers')

package/public/indexProxy.html

@@ -125,6 +125,7 @@
 
 				console.log(LOGONPAYLOAD);
 				debugger;
+				LOGONPAYLOAD.host = 'https://localhost:8080';
 				let msg = await store.logon(LOGONPAYLOAD);
 				console.log(msg);
 

package/server.js

@@ -4,15 +4,7 @@
  */
 let core = require('./lib/index.js');
 debugger;
-core(getCustomHandler, true, 'app', customize);
-function customize(key, _options) {
-	debugger;
-	let info = {
-		SWAGGEROPTIONS: {},
-		APPENV: null,
-	};
-	return info[key];
-}
+core(getCustomHandler, true, 'app', null);
 
 function getCustomHandler() {
 	let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
@@ -41,121 +33,18 @@ function getCustomHandler() {
 			path: `${appName}/new`,
 			options: {
 				files: {
-					relativeTo: process.env.APPDIR,
+					relativeTo: "./public",
 				},
 				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) {
-						let app = q.query;
-						if (app.edit != null) {
-							hf = app.edit + '/design.html';
-						} else if (app.view != null) {
-							hf = app.view + '/index.html';
-						}
-					}
-					console.log('hf=', hf);
-					if (hf === null) {
-						hf = getIndex();
-						return h.response(hf).header('contentType', 'text/html');
-					} else {
-						return h.file(hf);
-					}
-
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
+					return h.file('index.html');	
 				},
 				// 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) => {
-					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"],
-			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/{param*}`,
-
-			options: {
-				handler: async (req, h) => {
-					console.log('in get param');
-					console.log(req.params);
-					return ('hi');
-				},
-			}
-		},
+		}
 	];
 	return routes;
 }

package/src/handlers/proxyMapUri.js

@@ -6,7 +6,8 @@ async function proxyMapUri (req) {
     console.log('sid=', sid);
   }
  
-  let path = process.env.PROXYSERVER;
+ // let path = process.env.PROXYSERVER;
+  let path = (process.env.PROXYSERVER == null) ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
   console.log('proxying to= ', path);
   let params = req.params;
   console.log('params=', params);
@@ -22,32 +23,3 @@ async function proxyMapUri (req) {
   };
   }
 export default proxyMapUri;
-
-/*
-let qsstring = req.raw.search;
-  console.log('qsstring=', qsstring);
-  let query = req.query;
-  let newQuery = null;
- 
-  if (query != null) {
-    console.log('query=', query);
-    newQuery = {};
-    for (let key in query) {
-      let value = query[key];
-      if (value === 'true' || value === 'false') {
-        value = value === 'true';
-      }
-      newQuery[key] = value;
-      }
-      console.log('newQuery=', newQuery);
-    }
-  console.log(req.URLSearchParams);
-  let uri = path + '/' + params.param;
-  if (newQuery != null) {
-    uri = `${uri}?${new URLSearchParams(newQuery)}`;
-  }
- console.log('req.url', req.url); 
- console.log('req.url', req.url.search);
- console.log('uri=', req.uri);
- console.log('path=', req.path);
-*/

package/src/handlers/setCookies.js

@@ -8,8 +8,10 @@ let debug = require('debug')('setcookies');
 async function setCookies (req, h, options) {
     let credentials = req.auth.credentials;
     debug('setcookie', credentials);
-    debug('setcookie', credentials);
+ 
     if (credentials != null && req.auth.error != null) {
+        debug('setcookie credentials', credentials);
+        debug('setcookie error', req.auth.error);
         debug('logon failed');
         return { status: false, error: req.auth.error };
     }

package/src/iService.js

@@ -152,6 +152,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		*/
 		
 		// setup authentication related plugins
+		
 		let options = {
 			serverMode    : serverMode,
 			authFlow      : process.env.AUTHFLOW,

package/src/plugins/appCookie.js

@@ -18,7 +18,7 @@ module.exports = async function appCookie (server, options){
         redirectTo  : options.redirectTo,
         appendNext  : {name: 'next'},
         validateFunc: async (req, session) => {
-            server.log('Cookie validateFunc', `path - ${req.path}`);
+            debug('Cookie validateFunc', `path - ${req.path}`);
             
             if (session == null) {
                 console.log('session is null');
@@ -38,12 +38,12 @@ module.exports = async function appCookie (server, options){
             if (credentials == null) {
                 return {valid: false};
             }
-            server.log('Cookie validateFunc', sid);
+            debug('Cookie validateFunc', sid);
             return {valid: true, credentials: credentials};
         }
     };
     // console.log('cookie options', cookieOptions);
-    server.log('Cookie Options',cookieOptions);
+    debug('Cookie Options',cookieOptions);
     server.auth.strategy('session', 'cookie', cookieOptions);
 
 };

package/src/plugins/setDefaultRoutes.js

@@ -81,6 +81,7 @@ module.exports = function setDefaultRoutes(server, options) {
       method: ["GET"],
       path: `${appName}/logon`,
       options: {
+        
         auth: (options.authFlow === "server") ? 
         { mode: "try",  strategy: "sas" } : null,
         //https://futurestud.io/tutorials/hapi-redirect-to-previous-page-after-login
@@ -88,7 +89,10 @@ module.exports = function setDefaultRoutes(server, options) {
         plugins: {
           "hapi-auth-cookie": { redirectTo: false },
         },
-        handler: logon,
+        handler: async (req,h) => {
+          debug('logonhandler', req.auth.credentials);
+          return await logon(req,h);
+        }
       },
     },
     {
@@ -151,7 +155,7 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `${appName}/appenv`,
       options: {
         auth: /*authDefault*/ false,
-        handler: (req, h) => {
+        handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
           if (options.userInfo != null) {
             let uappenv = options.userInfo("APPENV", options);
@@ -177,7 +181,7 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `/appenv`,
       options: {
         auth: /*authDefault*/ false,
-        handler: (req, h) => {
+        handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
           if (options.userInfo != null) {
             let uappenv = options.userInfo("APPENV", options);

package/src/plugins/setupAuth.js

@@ -20,6 +20,8 @@ let SASauth          = require('./SASauth');
 let appCookie        = require('./appCookie');
 let token            = require('./token');
 let setDefaultRoutes = require('./setDefaultRoutes');
+let log		 = require('debug')('auth');
+
 
 /** Notes:
  * If api then register sasAuth and token - no cookies
@@ -37,7 +39,7 @@ async function setupAuth (server, options){
 			await server.register({ plugin: token });
 			def = 'token';
 		}
-		server.log('***********************Default auth', def);
+		log('***********************Default auth', def);
 		server.auth.default(def);
 		// console.log(server.registerations);
 	}

package/{packages/examples/app/certs/tls.sh → tls/viyatls.sh}

@@ -1,5 +1,3 @@
 kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/ca.crt ./ca.crt
-
 kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.crt ./tls.crt
-
 kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.key ./tls.key

package/packages/core/config.js

@@ -1,86 +0,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.
- * ----------------------------------------------------------------------------------------
- *
- */
-
-'use strict';
-
-let fs = require('fs');
-import parseDocker from './parseDocker';
-import debug from 'debug';
-let configDebug = debug('config');
-
-function config(appEnv, dockerFile) {
-
-
-	if (dockerFile != null) {
-		parseDocker(dockerFile);
-	}
-
-	if (appEnv != null) {
-		iconfig(appEnv);
-	}
-
-
-	// Final patching
-	if (process.env.APPPORT == null && process.env.EXPOSEDPORT != null) {
-		process.env.APPPORT = process.env.EXPOSEDPORT;
-		console.log(`APPPORT set to value of exposed port ${process.env.APPPORT}`);
-	}
-
-
-	if (process.env.PORT != null && process.env.APPPORT == null) {
-		process.env.APPPORT = process.env.PORT;
-		console.log(`APPPORT overriden by PORT ${process.env.PORT}`);
-	}
-	if (process.env.APPLOC == null) {
-		process.env.APPLOC = './public';
-	}
-	if (process.env.APPENTRY == null) {
-		process.env.APPENTRY = 'index.html';
-	}
-
-	console.log('VIYA_SERVER is: ', process.env.VIYA_SERVER);
-	
-}
-
-
-function iconfig (appEnv) {
-	try {
-		let data = fs.readFileSync(appEnv, 'utf8');
-		let d = data.split(/\r?\n/);
-		d.forEach(l => {
-			if (l.length > 0 && l.indexOf('#') === -1) {
-				let la = l.split('=');
-				let envName = la[0];
-				if (la.length === 2 && la[1].length > 0) {
-					let t = la[1].trim();
-					process.env[envName] = t;
-				} 
-				configDebug(la[ 1 ]);
-			}
-		});
-
-	} catch (err) {
-		console.log(err);
-		process.exit(0);
-	}
-}
-
-
-
-
-export default config;

package/packages/core/handlers/appCallback.js

@@ -1,40 +0,0 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-"use strict";
-
-import codeAuth from "./codeAuth";
-
-// handle all callback
-let debug = require("debug")("callback");
-
-async function appCallback (req, h) {
-  debug("in callback");
-  debug(`AUTHFLOW: ${process.env.AUTHFLOW}`);
-  if (process.env.AUTHFLOW === "server") {
-    return codeAuth(req, h);
-  } else {
-    let indexHTML = "index.html";
-    console.log(`REDIRECT_ENTRY: ${process.env.REDIRECT_ENTRY}`)
-    if (process.env.REDIRECT_ENTRY != null) {
-      indexHTML = process.env.REDIRECT_ENTRY;
-      console.log(`----Redirecting to ${indexHTML}`);
-
-    }
-    /*
-    if (process.entry != null) {
-      indexHTML =
-        process.entry.REDIRECT_ENTRY != null
-          ? process.entry.REDIRECT_ENTRY
-          : process.env.APPENTRY == null
-          ? "index.html"
-          : process.env.APPENTRY;
-    }
-          */
-    console.log(`Redirecting to default ${indexHTML}`);
-    return h.file(`${indexHTML}`);
-  }
-}
-
-export default appCallback;