@sassoftware/viya-serverjs 0.6.1-1 → 0.6.1-3

package/.env

@@ -1,28 +1,18 @@
-
 APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
-
+# APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+APPENV_USEPROXY=YES
 APPPORT=8080
 APPNAME=viyaapp
 AUTHFLOW=server
 CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=
-# APPDIR=./appDir
-HTTPS=true
-USETOKEN=YES
-USELOGON=YES
-SHOWENV=YES
+USELOGON=FALSE
+USETOKEN=FALSE
+# SHOWENV=YES
+# APPENV=
 VIYACERT=c:\Users\kumar\viyaCert
 NODE_TLS_REJECT_UNAUTHORIZED=0
-APPENV_XYZ=AA
-APPENV_BAD=
-
-# APPENV_PUPID=NS=https://sas-logon-app.viya.svc.cluster.local
-
-# NAMESPACE=viya
-
-
-
 

package/.env.server

@@ -12,17 +12,10 @@ CLIENTSECRET=jellico
 REDIRECT=
 # APPDIR=./appDir
 # HTTPS=true
-USELOGON=YES
-USETOKEN=YES
+USELOGON=FALSE
+USETOKEN=FALSE
 # SHOWENV=YES
 # APPENV=
 VIYACERT=c:\Users\kumar\viyaCert
 NODE_TLS_REJECT_UNAUTHORIZED=0
 
-
-# NAMESPACE=viya
-# TLS_CERT=./certs/tls.crt
-# TLS_KEY=./certs/tls.key
-
-
-

package/Dockerfile

@@ -35,7 +35,7 @@ ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 # ENV TLS_KEY=./tls/tls.key
 
 # Samesite specification
-ENV SAMESITE=None,secure
+ENV SAMESITE=Lax,false
 
 # If your Viya instance still has a unsigned certificate set this value prior to invoking the server
 # ENV NODE_TLS_REJECT_UNAUTHORIZED=0

package/lib/handlers/codeAuth.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _setCookies = _interopRequireDefault(require("./setCookies"));
+var _setCookies = _interopRequireDefault(require("../plugins/setCookies"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
@@ -24,11 +24,10 @@ function _codeAuth() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          debug('in codeauth');
+          debug('calling setCookies in codeAuth');
           _context.n = 1;
           return (0, _setCookies["default"])(req, h, options);
         case 1:
-          debug(options);
           indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
           if (process.env.REDIRECT != null) {
             debug('using REDIRECT env variable', process.env.REDIRECT);

package/lib/handlers/getApp.js

@@ -51,7 +51,6 @@ function _getApp() {
           }
           debug('calling codeauth');
           r = (0, _codeAuth["default"])(req, h, options);
-          debug(options.userCache);
           return _context.a(2, r);
         case 2:
           debug('default processing in  getapp');

package/lib/handlers/logon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _setCookies = _interopRequireDefault(require("./setCookies"));
+var _setCookies = _interopRequireDefault(require("../plugins/setCookies"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
@@ -24,7 +24,6 @@ function _logon() {
       while (1) switch (_context.n) {
         case 0:
           debugger;
-          debug('.................................................in logon');
           _context.n = 1;
           return (0, _setCookies["default"])(req, h, options);
         case 1:

package/lib/handlers/proxyMapUri.js

@@ -20,6 +20,8 @@ function _proxyMapUri() {
         case 0:
           credentials = req.auth.credentials;
           debug('------------------------------------------');
+          debug('serverstate', req.server.state);
+          debug('state', req.state);
           if (credentials != null) {
             sid = credentials.sid;
             debug('sid=', sid);

package/lib/iService.js

@@ -117,7 +117,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             debug2("Application information: \n\t\tAPPLOC  : ".concat(process.env.APPLOC, "\n\t\tAPPENTRY: ").concat(process.env.APPENTRY, "\n"));
             hapiServer = Hapi.server(sConfig);
             /*
-            const cache = hapiServer.cache({ segment: 'sessions', expiresIn: 3 * 24 * 60 * 60 * 1000 });
+            const cache = hapiServer.cache({ segment: 'sid', expiresIn: 3 * 24 * 60 * 60 * 1000 });
             hapiServer.app.cache = cache;
             */
             nodeCacheOptions = {

package/lib/plugins/SASauth.js

@@ -1,5 +1,9 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function 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); }
@@ -22,20 +26,14 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  *
  */
 
-var bell = require('@hapi/bell');
 var uuid = require('uuid');
 var debug = require('debug')('sasauth');
-exports.plugin = {
-  name: 'SASauth',
-  version: '1.0.0',
-  register: iSASauth
-};
-function iSASauth(_x, _x2) {
-  return _iSASauth.apply(this, arguments);
+function SASauth(_x, _x2) {
+  return _SASauth.apply(this, arguments);
 }
-function _iSASauth() {
-  _iSASauth = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(server, options) {
-    var bellAuthOptions, provider, host;
+function _SASauth() {
+  _SASauth = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(server, options) {
+    var provider, host, bellAuthOptions;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
@@ -64,6 +62,20 @@ function _iSASauth() {
                     case 0:
                       server.log('SASAuth profile', credentials);
                       debug('credentials', credentials);
+                      debug('params', params);
+                      credentials.profile = {
+                        provider: 'sas',
+                        id: 'sasuser',
+                        displayName: 'SAS User',
+                        email: 'sasuser@sas.com',
+                        raw: {
+                          id: 'sasuser',
+                          displayName: 'SAS User',
+                          emails: [{
+                            value: 'sasuser@sas.com'
+                          }]
+                        }
+                      };
                     case 1:
                       return _context.a(2);
                   }
@@ -80,20 +92,16 @@ function _iSASauth() {
             password: uuid.v4(),
             clientId: options.clientId,
             clientSecret: options.clientSecret,
-            //   isSameSite  : options.isSameSite,
+            isSameSite: options.isSameSite,
             isSecure: options.isSecure
           };
-          // console.log('SASAuth options', bellAuthOptions);
           debug('belloptions', bellAuthOptions);
-          server.log('SASAuth', bellAuthOptions);
-          _context2.n = 1;
-          return server.register(bell);
-        case 1:
           server.auth.strategy('sas', 'bell', bellAuthOptions);
-        case 2:
+        case 1:
           return _context2.a(2);
       }
     }, _callee2);
   }));
-  return _iSASauth.apply(this, arguments);
-}
+  return _SASauth.apply(this, arguments);
+}
+var _default = exports["default"] = SASauth;

package/lib/plugins/appCookie.js

@@ -1,25 +1,29 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function 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); }); }; }
 var uuid = require('uuid');
-var debug = require('debug')('cookie');
-module.exports = /*#__PURE__*/function () {
-  var _appCookie = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(server, options) {
+var debug = require('debug')('appcookie');
+function appCookie(_x, _x2) {
+  return _appCookie.apply(this, arguments);
+}
+function _appCookie() {
+  _appCookie = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(server, options) {
     var cookieOptions;
     return _regenerator().w(function (_context2) {
       while (1) switch (_context2.n) {
         case 0:
-          _context2.n = 1;
-          return server.register(require('@hapi/cookie'));
-        case 1:
           debug('in appCookie');
           debug(options.redirectTo);
           cookieOptions = {
             cookie: {
-              name: 'cookie',
+              name: 'session',
               password: uuid.v4(),
               isSecure: options.isSecure,
               isSameSite: options.isSameSite
@@ -30,47 +34,21 @@ module.exports = /*#__PURE__*/function () {
             },
             validate: function () {
               var _validate = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, session) {
-                var credentials, sid;
                 return _regenerator().w(function (_context) {
                   while (1) switch (_context.n) {
                     case 0:
-                      debug('Cookie validateFunc', "path - ".concat(req.path));
-                      if (!(session == null)) {
+                      debug('validating cookie session', session);
+                      if (session) {
                         _context.n = 1;
                         break;
                       }
-                      console.log('session is null');
                       return _context.a(2, {
                         isValid: false
                       });
                     case 1:
-                      credentials = null;
-                      if (Array.isArray(session) === true && session.length > 0) {
-                        sid = session[0].sid;
-                      } else {
-                        sid = session.sid;
-                      }
-                      if (!(sid != null)) {
-                        _context.n = 3;
-                        break;
-                      }
-                      _context.n = 2;
-                      return req.server.app.cache.get(sid);
-                    case 2:
-                      credentials = _context.v;
-                    case 3:
-                      if (!(credentials == null)) {
-                        _context.n = 4;
-                        break;
-                      }
-                      return _context.a(2, {
-                        isValid: false
-                      });
-                    case 4:
-                      debug('Cookie validateFunc', sid);
                       return _context.a(2, {
                         isValid: true,
-                        credentials: credentials
+                        credentials: session // becomes request.auth.credentials
                       });
                   }
                 }, _callee);
@@ -80,16 +58,16 @@ module.exports = /*#__PURE__*/function () {
               }
               return validate;
             }()
-          }; // console.log('cookie options', cookieOptions);
-          debug('Cookie Options', cookieOptions);
+          };
+          debug('session cookie options', cookieOptions);
           server.auth.strategy('session', 'cookie', cookieOptions);
-        case 2:
+          server.auth["default"]('session');
+        case 1:
           return _context2.a(2);
       }
     }, _callee2);
   }));
-  function appCookie(_x, _x2) {
-    return _appCookie.apply(this, arguments);
-  }
-  return appCookie;
-}();
+  return _appCookie.apply(this, arguments);
+}
+;
+var _default = exports["default"] = appCookie;

package/lib/plugins/setContext.js

@@ -26,31 +26,46 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  *
  */
 
-var debug = require('debug')('context');
+var debug = require('debug')('setcontext');
 function setContext(_x, _x2) {
   return _setContext.apply(this, arguments);
 }
 function _setContext() {
   _setContext = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, h) {
-    var credentials, context;
+    var credentials, cachedCredentials, fcredentials, context, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           credentials = req.auth.credentials;
-          debug(credentials);
+          cachedCredentials = null; // use this once cookies are working properly
+          debug('Set Context Credentials', req.path, credentials);
+          _context.p = 1;
+          _context.n = 2;
+          return req.server.app.cache.get('session');
+        case 2:
+          cachedCredentials = _context.v;
+          debug('Cached Credentials', cachedCredentials);
+          _context.n = 4;
+          break;
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          debug('No cached credentials');
+        case 4:
+          fcredentials = credentials || cachedCredentials;
           context = {
             path: req.path,
             params: req.params,
             query: req.query,
             payload: req.payload,
-            queryOrig: credentials != null ? credentials.query : {},
-            token: credentials != null ? "bearer ".concat(credentials.token) : null,
-            credentials: credentials,
+            queryOrig: fcredentials != null ? fcredentials.query : {},
+            credentials: fcredentials,
+            credType: credentials != null ? 'auth' : 'cached',
             host: process.env.VIYA_SERVER
           };
           return _context.a(2, context);
       }
-    }, _callee);
+    }, _callee, null, [[1, 3]]);
   }));
   return _setContext.apply(this, arguments);
 }

package/lib/{handlers → plugins}/setCookies.js

@@ -4,14 +4,8 @@ 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 _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function 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); }); }; }
 /*
@@ -25,12 +19,11 @@ function setCookies(_x, _x2, _x3) {
 }
 function _setCookies() {
   _setCookies = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, h, options) {
-    var credentials, sid, redirect;
+    var credentials, cookieInfo, sid, redirect;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          credentials = req.auth.credentials;
-          debug('setcookie', credentials);
+          credentials = req.auth.credentials; // protect against failed logon
           if (!(credentials != null && req.auth.error != null)) {
             _context.n = 1;
             break;
@@ -43,28 +36,31 @@ function _setCookies() {
             error: req.auth.error
           });
         case 1:
-          // create a cookie(sid) and save credentials in cache
+          debug('credentials in setcookie', credentials);
+
+          // use cookieAuth to set cookies
+          cookieInfo = {
+            name: 'session',
+            accessToken: credentials.token,
+            refreshToken: credentials.refreshToken,
+            expiresIn: credentials.expiresIn,
+            provider: credentials.provider
+          };
+          debug('------------set cookie-------------\n', cookieInfo);
+          console.log('is it there', req.cookieAuth != null);
+          _context.n = 2;
+          return req.server.app.cache.set('session', cookieInfo, 0);
+        case 2:
+          req.cookieAuth.set(cookieInfo);
+
+          // set sid
           sid = uuid.v4();
           credentials.sid = sid;
           if (options != null) {
             options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-            options.userCache = _objectSpread({}, credentials);
             debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          debug('userCache', options.userCache);
-          _context.n = 2;
-          return req.server.app.cache.set(sid, credentials, 0);
-        case 2:
-          // 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: sid
-            });
-          }
-          ;
           debug('credentials query', credentials.query);
           redirect = credentials.query != null && credentials.query.next != null ? credentials.query.next : null;
           debug('setcookie-redirect', redirect);
@@ -90,23 +86,23 @@ async function getCredentials (req) {
     };
 
     let payload = {
-		url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
-		method: 'POST',
+        url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
+        method: 'POST',
 
-		headers: {
-			// 'Authorization': 'Basic ' + Buffer.from(`${process.env.CLIENTID}:${process.env.CLIENTSECRET}`).toString('base64'),
-			'Accept'      : 'application/json',
-			'Content-Type': 'application/x-www-form-urlencoded'
-		},
+        headers: {
+            // 'Authorization': 'Basic ' + Buffer.from(`${process.env.CLIENTID}:${process.env.CLIENTSECRET}`).toString('base64'),
+            'Accept'      : 'application/json',
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
         data: qs.stringify({
             client_id    : `${process.env.CLIENTID}`,
             client_secret: `${process.env.CLIENTSECRET}`,
             redirect_uri : `${location}`,
 
-			'grant_type': 'authorization_code',
-			code        : req.query.code
-		})
-	};
+            'grant_type': 'authorization_code',
+            code        : req.query.code
+        })
+    };
     try {
         let r = await axios(payload);
         return r.data;