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

package/.env

@@ -1,7 +1,7 @@
 APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
-# APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+
 APPENV_USEPROXY=YES
 APPPORT=8080
 APPNAME=viyaapp
@@ -11,8 +11,7 @@ CLIENTSECRET=jellico
 REDIRECT=
 USELOGON=FALSE
 USETOKEN=FALSE
-# SHOWENV=YES
-# APPENV=
+
 VIYACERT=c:\Users\kumar\viyaCert
 NODE_TLS_REJECT_UNAUTHORIZED=0
 

package/lib/handlers/logon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _setCookies = _interopRequireDefault(require("../plugins/setCookies"));
+var _codeAuth = _interopRequireDefault(require("./codeAuth.js"));
 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); }
@@ -12,7 +12,7 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 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 © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
-*/
+*/ // import setCookies from './setCookies';
 var debug = require('debug')('logon');
 function logon(_x, _x2, _x3) {
   return _logon.apply(this, arguments);
@@ -24,12 +24,9 @@ function _logon() {
       while (1) switch (_context.n) {
         case 0:
           debugger;
-          _context.n = 1;
-          return (0, _setCookies["default"])(req, h, options);
-        case 1:
-          r = _context.v;
+          debug('calling codeauth');
+          r = (0, _codeAuth["default"])(req, h, options); // r = await setCookies(req, h, options);
           debug(r.redirect);
-          debug('in logon after setcookie', r.redirect);
           return _context.a(2, h.redirect(r.redirect));
       }
     }, _callee);

package/lib/iService.js

@@ -209,8 +209,6 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               });
             }
           case 6:
-            console.log('Plugin', process.env.PLUGIN);
-
             //
             // Start server
             //

package/lib/plugins/setContext.js

@@ -4,8 +4,14 @@ 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); }); }; }
 /*
@@ -37,7 +43,7 @@ function _setContext() {
       while (1) switch (_context.p = _context.n) {
         case 0:
           credentials = req.auth.credentials;
-          cachedCredentials = null; // use this once cookies are working properly
+          cachedCredentials = null;
           debug('Set Context Credentials', req.path, credentials);
           _context.p = 1;
           _context.n = 2;
@@ -59,7 +65,9 @@ function _setContext() {
             query: req.query,
             payload: req.payload,
             queryOrig: fcredentials != null ? fcredentials.query : {},
-            credentials: fcredentials,
+            credentials: _objectSpread(_objectSpread({}, fcredentials), {}, {
+              host: process.env.VIYA_SERVER
+            }),
             credType: credentials != null ? 'auth' : 'cached',
             host: process.env.VIYA_SERVER
           };

package/lib/plugins/setCookies.js

@@ -47,7 +47,6 @@ function _setCookies() {
             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:

package/lib/plugins/setDefaultRoutes.js

@@ -1,8 +1,6 @@
 "use strict";
 
 var _handlers = require("../handlers");
-var _setContext = _interopRequireDefault(require("./setContext.js"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function 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); }
@@ -24,6 +22,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  *
  */
 var debug = require("debug")("routes");
+//import setContext from "./setContext.js";
 module.exports = function setDefaultRoutes(server, options) {
   debug("setDefaultRoutes");
   var appName = "/" + options.appName;
@@ -35,7 +34,6 @@ module.exports = function setDefaultRoutes(server, options) {
     strategy: "sas",
     mode: "required"
   };
-  console.log("Auth Flow", options.authFlow);
   var getAppb = _handlers.getApp.bind(null, options // process.env.USETOKEN === "YES" ? options : null
   );
   console.log("Default strategy", authDefault);
@@ -43,7 +41,6 @@ module.exports = function setDefaultRoutes(server, options) {
   options.authDefault = authDefault;
   options.authLogon = authLogon;
   debug(options.userRouteTable);
-  var uTable = options.userRouteTable !== null ? (0, _handlers.setupUserRoutes)(options.userRouteTable, options) : null;
   var defaultTable = [{
     method: ["GET"],
     path: "".concat(appName, "/logon"),
@@ -122,9 +119,6 @@ module.exports = function setDefaultRoutes(server, options) {
                 allAppEnv = options.allAppEnv;
                 allAppEnv.credentials = options.credentials;
                 s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
-                if (process.env.SHOWENV != null) {
-                  console.log(s);
-                }
                 debug(s);
                 return _context2.a(2, s);
             }
@@ -150,9 +144,6 @@ module.exports = function setDefaultRoutes(server, options) {
                 allAppEnv = options.allAppEnv;
                 allAppEnv.credentials = options.credentials;
                 s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
-                if (process.env.SHOWENV != null) {
-                  debug(options.allAppEnv);
-                }
                 return _context3.a(2, s);
             }
           }, _callee3);
@@ -184,8 +175,7 @@ module.exports = function setDefaultRoutes(server, options) {
       auth: authDefault,
       handler: _handlers.keepAlive2
     }
-  }];
-  var pr = {
+  }, {
     method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
     path: "".concat(appName, "/proxy/{param*}"),
     options: {
@@ -198,10 +188,9 @@ module.exports = function setDefaultRoutes(server, options) {
         }
       }
     }
-  };
-  debug(pr);
-  defaultTable.push(pr);
-  var routeTables0 = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  }];
+  var uTable = options.userRouteTable();
+  var routeTables0 = options.userRouteTable !== null ? defaultTable.concat(uTable) : defaultTable;
   var routeTables = (0, _handlers.setupUserRoutes)(routeTables0, options);
   server.route(routeTables);
 };

package/lib/plugins/setupUserRoutes.js

@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _setContext = _interopRequireDefault(require("./setContext"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-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 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); } /*
+/*
  * ------------------------------------------------------------------------------------
  *   Copyright (c) SAS Institute Inc.
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,33 +23,26 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * ---------------------------------------------------------------------------------------
  *
  */
-function setupUserRoutes(u, options) {
-  if (u == null) {
-    return [];
-  }
-  var ux = typeof u === 'function' ? u() : u;
+
+function setupUserRoutes(ux, options) {
   var routes = ux.map(function (rx) {
-    //let rx = {...r};
-    /* change it to options */
-    if (rx.config != null) {
-      rx.options = _objectSpread({}, rx.config);
-      delete rx.config;
-    }
     if (rx.options.pre == null) {
       rx.options.pre = [{
         method: _setContext["default"],
         assign: 'context'
       }];
     } else {
-      rx.options.pre.push([{
+      rx.options.pre.push({
         method: _setContext["default"],
         assign: 'context'
-      }]);
+      });
     }
     if (rx.options.auth === true) {
       rx.options.auth = options.authDefault;
     } else if (rx.options.auth === 'logon') {
       rx.options.auth = options.authLogon;
+    } else if (rx.options.auth == null) {
+      rx.options.auth = false;
     }
     console.log('route', rx.method, rx.path, rx.options.auth, rx.options.pre);
     return rx;

package/package.json

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

package/src/handlers/logon.js

@@ -3,13 +3,16 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-import setCookies from '../plugins/setCookies';
+// import setCookies from './setCookies';
+import codeAuth from './codeAuth.js';
 let debug = require('debug')('logon');
 async function logon (req, h, options) {
    debugger;
-   let r = await setCookies(req, h, options);
+     
+   debug('calling codeauth');
+   let r = codeAuth(req, h, options);
+   // r = await setCookies(req, h, options);
    debug(r.redirect);
-   debug('in logon after setcookie', r.redirect);
    return h.redirect(r.redirect);
 }
 

package/src/iService.js

@@ -188,7 +188,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 				});
 			}
 		}
-		console.log('Plugin', process.env.PLUGIN);
+
 		
 		//
 		// Start server

package/src/plugins/setContext.js

@@ -20,7 +20,7 @@
 let debug = require('debug')('setcontext');
 async function setContext(req, h) {
     let credentials = req.auth.credentials; 
-    let cachedCredentials = null;// use this once cookies are working properly
+    let cachedCredentials = null; 
     debug('Set Context Credentials', req.path, credentials);
     try {
         cachedCredentials = await req.server.app.cache.get('session');
@@ -37,7 +37,7 @@ async function setContext(req, h) {
         query: req.query,
         payload: req.payload,
         queryOrig: (fcredentials != null) ? fcredentials.query : {},
-        credentials: fcredentials,
+        credentials: {...fcredentials, host: process.env.VIYA_SERVER},   
         credType: (credentials != null) ? 'auth' : 'cached',
         host: process.env.VIYA_SERVER
     };

package/src/plugins/setCookies.js

@@ -28,7 +28,6 @@ async function setCookies(req, h, options) {
         provider: credentials.provider,
     }
     debug('------------set cookie-------------\n', cookieInfo);
-    console.log('is it there', req.cookieAuth != null);   
     await req.server.app.cache.set('session', cookieInfo,0);
 
     req.cookieAuth.set(cookieInfo);

package/src/plugins/setDefaultRoutes.js

@@ -29,7 +29,7 @@ import {
   proxyMapUri,
 } from "../handlers";
 let debug = require("debug")("routes");
-import setContext from "./setContext.js";
+//import setContext from "./setContext.js";
 module.exports = function setDefaultRoutes(server, options) {
   debug("setDefaultRoutes");
   let appName = "/" + options.appName;
@@ -43,8 +43,6 @@ module.exports = function setDefaultRoutes(server, options) {
     mode: "required"
   };
 
-  console.log("Auth Flow", options.authFlow);
-
   let getAppb = getApp.bind(
     null,
     options // process.env.USETOKEN === "YES" ? options : null
@@ -56,10 +54,6 @@ module.exports = function setDefaultRoutes(server, options) {
   options.authLogon = authLogon;
 
   debug(options.userRouteTable);
-  let uTable =
-    options.userRouteTable !== null
-      ? setupUserRoutes(options.userRouteTable, options)
-      : null;
 
   let defaultTable = [
     {
@@ -122,16 +116,13 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `${appName}/appenv`,
       options: {
         auth: authDefault,
-        handler: async (req, h) => { 
+        handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
           allAppEnv.credentials = options.credentials;
 
           let s =
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
-          if (process.env.SHOWENV != null) {
-            console.log(s);
-          }
           debug(s);
           return s;
         },
@@ -149,11 +140,6 @@ module.exports = function setDefaultRoutes(server, options) {
           let s =
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
-          if (process.env.SHOWENV != null) {
-            debug(options.allAppEnv);
-
-          }
-        
           return s;
         },
       },
@@ -183,27 +169,24 @@ module.exports = function setDefaultRoutes(server, options) {
         handler: keepAlive2,
       },
     },
-  ];
-
-  let pr = {
-    method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
-    path: `${appName}/proxy/{param*}`,
-
-    options: {
-      auth: authDefault,
-      handler: {
-        proxy: {
-          mapUri: proxyMapUri,
-          xforward: true,
-          passThrough: true,
+    {
+      method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
+      path: `${appName}/proxy/{param*}`,
+      options: {
+        auth: authDefault,
+        handler: {
+          proxy: {
+            mapUri: proxyMapUri,
+            xforward: true,
+            passThrough: true,
+          },
         },
       },
-    },
-  };
-  debug(pr);
-  defaultTable.push(pr);
+    }
+  ];
 
-  let routeTables0= uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  let uTable = options.userRouteTable();
+  let routeTables0 = options.userRouteTable !== null ? defaultTable.concat(uTable) : defaultTable;
   let routeTables = setupUserRoutes(routeTables0, options);
 
   server.route(routeTables);

package/src/plugins/setupUserRoutes.js

@@ -17,32 +17,24 @@
  */
 import setContext from './setContext';
 
-function setupUserRoutes (u, options) {
-    if (u == null) {
-        return [];
+function setupUserRoutes(ux, options) {
+  let routes = ux.map(rx => {
+    if (rx.options.pre == null) {
+      rx.options.pre = [{ method: setContext, assign: 'context' }];
+    } else {
+      rx.options.pre.push({ method: setContext, assign: 'context' });
     }
-    
-    let ux = (typeof u === 'function') ? u() : u;
-    let routes = ux.map(rx => {
-        //let rx = {...r};
-        /* change it to options */
-        if (rx.config != null) {
-            rx.options = {...rx.config};
-            delete rx.config;
-        }
-        if (rx.options.pre == null) {
-          rx.options.pre = [{method: setContext, assign: 'context'}];
-        } else{
-          rx.options.pre.push([{method: setContext, assign: 'context'}]);
-        }
-        if (rx.options.auth === true) {
-            rx.options.auth = options.authDefault;   
-        } else if (rx.options.auth === 'logon') {
-            rx.options.auth = options.authLogon;
-        } 
-        console.log('route', rx.method, rx.path, rx.options.auth, rx.options.pre);
-        return rx;
-    });
-    return routes;
+      
+    if (rx.options.auth === true) {
+      rx.options.auth = options.authDefault;
+    } else if (rx.options.auth === 'logon') {
+      rx.options.auth = options.authLogon;
+    } else if (rx.options.auth == null) {
+      rx.options.auth = false;
+    }
+    console.log('route', rx.method, rx.path, rx.options.auth, rx.options.pre);
+  return rx;
+});
+return routes;
 }
 export default setupUserRoutes;