@sassoftware/viya-serverjs 0.0.3 → 0.1.1

package/lib/core/config.js

@@ -25,12 +25,6 @@ exports["default"] = void 0;
 var _parseDocker = _interopRequireDefault(require("./parseDocker"));
 var _debug = _interopRequireDefault(require("debug"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var fs = require('fs');
 var configDebug = (0, _debug["default"])('config');
 function config(appEnv, dockerFile) {
@@ -88,18 +82,12 @@ function iconfig(appEnv) {
     var d = data.split(/\r?\n/);
     d.forEach(function (l) {
       if (l.length > 0 && l.indexOf('#') === -1) {
-        var _l$split = l.split('='),
-          _l$split2 = _slicedToArray(_l$split, 2),
-          envName = _l$split2[0],
-          value = _l$split2[1];
-        if (value.trim().length > 0) {
-          if (value.startsWith('$')) {
-            var envVar = value.substring(1);
-            value = process.env[envVar];
-          }
-          process.env[envName] = value;
+        var la = l.split('=');
+        var envName = la[0];
+        if (la.length === 2 && la[1].length > 0) {
+          process.env[envName] = la[1];
         }
-        configDebug(envName, '=', value);
+        configDebug(la[1]);
       }
     });
   } catch (err) {

package/lib/core/handlers/codeAuth.js

@@ -20,7 +20,7 @@ function codeAuth(_x, _x2, _x3) {
 }
 function _codeAuth() {
   _codeAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, h, options) {
-    var cookieResult, indexHTML;
+    var indexHTML;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -28,33 +28,29 @@ function _codeAuth() {
           _context.next = 3;
           return (0, _setCookies["default"])(req, h, options);
         case 3:
-          cookieResult = _context.sent;
-          console.log('cookieResult:', cookieResult);
-          debug('options', options);
+          console.log(options);
           indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
-          debug('indexHTML', indexHTML);
-          if (process.env.REDIRECT !== undefined) {
-            debug('..redirect', process.env.REDIRECT);
+          if (process.env.REDIRECT != null) {
             debug('using REDIRECT env variable', process.env.REDIRECT);
             indexHTML = process.env.REDIRECT;
           }
-          debug('..................', indexHTML);
-          debugger;
+          console.log('..................', indexHTML);
           if (!(indexHTML.indexOf('/') === 0)) {
-            _context.next = 16;
+            _context.next = 13;
             break;
           }
           // added to support create-react-restaf-viya-app cli
           if (indexHTML !== '/develop') {
-            /* hmr support */
-            indexHTML = "/".concat(process.env.APPNAME, "/").concat(indexHTML);
+            indexHTML = "/".concat(process.env.APPNAME).concat(indexHTML);
           }
+          console.log("Redirecting to ".concat(indexHTML));
           return _context.abrupt("return", h.redirect(indexHTML));
-        case 16:
-          // return h.file(indexHTML);
-          console.log('redirecting to 		:', "/".concat(indexHTML));
+        case 13:
+          console.log("Redirecting to ".concat(indexHTML));
           return _context.abrupt("return", h.file(indexHTML));
-        case 18:
+        case 15:
+          ;
+        case 16:
         case "end":
           return _context.stop();
       }

package/lib/core/handlers/getApp.js

@@ -13,84 +13,54 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-var debug = require("debug")("getapp");
+var debug = require('debug')('getapp');
 function getApp(_x, _x2, _x3) {
   return _getApp.apply(this, arguments);
 }
 function _getApp() {
-  _getApp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options, req, h) {
-    var authType, indexHTML, handleImplicit, _handleImplicit;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  _getApp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options, req, h) {
+    var x, redirect, redirectUri, protocol, url, indexHTML;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          _handleImplicit = function _handleImplicit3() {
-            _handleImplicit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options, req, h) {
-              var x, redirect, redirectUri, protocol, url;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    if (!(process.env.AUTHFLOW === "implicit")) {
-                      _context.next = 8;
-                      break;
-                    }
-                    x = "".concat(process.env.VIYA_SERVER, "/SASLogon/oauth/authorize?response_type=token&client_id=").concat(process.env.CLIENTID);
-                    redirect = "".concat(process.env.APPNAME, "/callback");
-                    if (process.env.REDIRECT != null) {
-                      redirect = process.env.REDIRECT.trim();
-                      if (redirect.indexOf("http") === -1) {
-                        redirect = "".concat(process.env.APPNAME, "/").concat(redirect);
-                        protocol = process.env.HTTPS === "true" ? "https://" : "http://";
-                        redirectUri = "".concat(protocol).concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(redirect, "?host=").concat(process.env.VIYA_SERVER);
-                      } else {
-                        redirectUri = "".concat(redirect, "?host=").concat(process.env.VIYA_SERVER);
-                      }
-                    }
-                    debug(process.env.REDIRECT);
-                    url = "".concat(x, "&redirect_uri=").concat(redirectUri);
-                    debug(url);
-                    return _context.abrupt("return", h.redirect(url));
-                  case 8:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }));
-            return _handleImplicit.apply(this, arguments);
-          };
-          handleImplicit = function _handleImplicit2(_x4, _x5, _x6) {
-            return _handleImplicit.apply(this, arguments);
-          };
-          debugger;
-          ;
-          authType = process.env.AUTHFLOW.trim();
-          if (!(authType === "implicit")) {
-            _context2.next = 9;
+          if (!(process.env.AUTHFLOW === 'implicit')) {
+            _context.next = 10;
             break;
           }
-          debugger;
-          debug("calling handleImplicit");
-          return _context2.abrupt("return", handleImplicit(options, req, h));
-        case 9:
-          if (!(authType === "server")) {
-            _context2.next = 14;
-            break;
+          x = "".concat(process.env.VIYA_SERVER, "/SASLogon/oauth/authorize?response_type=token&client_id=").concat(process.env.CLIENTID);
+          redirect = "".concat(process.env.APPNAME, "/callback");
+          if (process.env.REDIRECT != null) {
+            redirect = process.env.REDIRECT.trim();
+            if (redirect.indexOf('http') === -1) {
+              redirect = "".concat(process.env.APPNAME, "/").concat(redirect);
+              protocol = process.env.HTTPS === 'true' ? 'https://' : 'http://';
+              redirectUri = "".concat(protocol).concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(redirect, "?host=").concat(process.env.VIYA_SERVER);
+            } else {
+              redirectUri = "".concat(redirect, "?host=").concat(process.env.VIYA_SERVER);
+            }
           }
-          debugger;
-          return _context2.abrupt("return", (0, _codeAuth["default"])(req, h, options));
-        case 14:
-          if (!(authType === null)) {
-            _context2.next = 18;
+          debug(process.env.REDIRECT);
+          url = "".concat(x, "&redirect_uri=").concat(redirectUri);
+          debug(url);
+          return _context.abrupt("return", h.redirect(url));
+        case 10:
+          if (!(process.env.AUTHFLOW === 'server')) {
+            _context.next = 16;
             break;
           }
-          /* case of no auth */
-          indexHTML = process.env.APPENTRY == null ? "index.html" : process.env.APPENTRY;
+          debugger;
+          debug('calling codeauth');
+          return _context.abrupt("return", (0, _codeAuth["default"])(req, h, options));
+        case 16:
+          debug('default getapp');
+          indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
           console.log("Redirecting to default ".concat(indexHTML));
-          return _context2.abrupt("return", h.file(indexHTML));
-        case 18:
+          return _context.abrupt("return", h.file(indexHTML));
+        case 20:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getApp.apply(this, arguments);
 }

package/lib/core/handlers/getApp2.js

@@ -36,9 +36,8 @@ function _getApp() {
         case 0:
           debug('in getApp2');
           debug(req.params);
-          console.log(h.request.auth);
           return _context.abrupt("return", h.file("".concat(req.params.param)));
-        case 4:
+        case 3:
         case "end":
           return _context.stop();
       }

package/lib/core/handlers/getUser.js

@@ -22,24 +22,23 @@ function _getUser() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          debugger;
           debug(req.state);
           name = 'SAS User';
           if (!(req.state.ocookie != null)) {
-            _context.next = 10;
+            _context.next = 9;
             break;
           }
           sid = req.state.ocookie.sid;
           debug(sid);
-          _context.next = 8;
+          _context.next = 7;
           return req.server.app.cache.get(sid);
-        case 8:
+        case 7:
           credentials = _context.sent;
           name = credentials.user_name;
-        case 10:
+        case 9:
           debug(name);
           return _context.abrupt("return", "let USER_NAME='".concat(name, "'"));
-        case 12:
+        case 11:
         case "end":
           return _context.stop();
       }

package/lib/core/handlers/keepAlive.js

@@ -52,7 +52,6 @@ function _refreshToken() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          debugger;
           credentials = req.auth.credentials;
           sid = credentials.sid;
           config = {
@@ -69,28 +68,28 @@ function _refreshToken() {
               client_secret: process.env.CLIENTSECRET
             })
           };
-          _context2.prev = 4;
-          _context2.next = 7;
+          _context2.prev = 3;
+          _context2.next = 6;
           return (0, _axios["default"])(config);
-        case 7:
+        case 6:
           r = _context2.sent;
           newcred = _objectSpread({}, credentials);
           newcred.token = r.data.access_token;
           newcred.refreshToken = r.data.refresh_token;
-          _context2.next = 13;
+          _context2.next = 12;
           return req.server.app.cache.set(sid, credentials);
-        case 13:
+        case 12:
           return _context2.abrupt("return", credentials);
-        case 16:
-          _context2.prev = 16;
-          _context2.t0 = _context2["catch"](4);
+        case 15:
+          _context2.prev = 15;
+          _context2.t0 = _context2["catch"](3);
           error = Boom.badRequest('Unable to refresh tokens in KeepAlive', JSON.stringify(_context2.t0, null, 4));
           throw error;
-        case 20:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 16]]);
+    }, _callee2, null, [[3, 15]]);
   }));
   return _refreshToken.apply(this, arguments);
 }

package/lib/core/handlers/proxyMapUri.js

@@ -4,47 +4,34 @@ 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 new 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 new 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 new 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(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function proxyMapUri(_x) {
-  return _proxyMapUri.apply(this, arguments);
-}
-function _proxyMapUri() {
-  _proxyMapUri = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
-    var credentials, sid, path, params, search, uri;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          debugger;
-          credentials = req.auth.credentials;
-          console.log('------------------------------------------');
-          if (credentials != null) {
-            sid = credentials.sid;
-            console.log('sid=', sid);
-          }
-          path = process.env.PROXYSERVER;
-          console.log('proxying to= ', path);
-          params = req.params;
-          console.log('params=', params);
-          search = req.url.search;
-          console.log('query=', search);
-          uri = path + '/' + params.param;
-          if (search != null && search.trim().length > 0) {
-            uri = uri + search;
-          }
-          console.log('destination= ', uri);
-          return _context.abrupt("return", {
-            uri: uri
-          });
-        case 14:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _proxyMapUri.apply(this, arguments);
+function proxyMapUri(req) {
+  var credentials = req.auth.credentials;
+  console.log('------------------------------------------');
+  if (credentials != null) {
+    var sid = credentials.sid;
+    console.log('sid=', sid);
+  }
+  var path = process.env.PROXYSERVER;
+  console.log('proxying to= ', path);
+  var params = req.params;
+  console.log('params=', params);
+  var search = req.url.search;
+  console.log('query=', search);
+  var uri = path + '/' + params.param;
+  if (search != null && search.trim().length > 0) {
+    uri = uri + search;
+  }
+  console.log('destination= ', uri);
+  var r = {
+    uri: uri
+  };
+  if (credentials) {
+    console.log('credentials.token=', credentials.token);
+    r.headers = {
+      Authorization: "Bearer ".concat(credentials.token)
+    };
+  }
+  return r;
 }
 var _default = exports["default"] = proxyMapUri;
 /*

package/lib/core/handlers/reactDev.js

@@ -36,7 +36,7 @@ function _reactDev() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           console.log('Spawning the dev server');
-          spawn('npm', ['start:appjs'], {
+          spawn('yarn', ['start'], {
             stdio: 'inherit'
           });
           h2 = '<h2>Viya Server: ' + process.env.VIYA_SERVER + '<h2>';

package/lib/core/handlers/setCookies.js

@@ -19,56 +19,56 @@ function setCookies(_x, _x2, _x3) {
 }
 function _setCookies() {
   _setCookies = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, h, options) {
-    var authCred, sid, credentials, redirect;
+    var credentials, sid, redirect;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          authCred = req.auth.credentials;
+          credentials = req.auth.credentials;
           debugger;
-          req.log('setcookie', authCred);
-          if (!(authCred != null && req.auth.error != null)) {
-            _context.next = 6;
+          req.log('setcookie', credentials);
+          if (!(credentials != null && req.auth.error != null)) {
+            _context.next = 8;
             break;
           }
           debug('logon failed');
+          console.log(req.auth.error);
+          debug('req.auth.error', req.auth.error);
           return _context.abrupt("return", {
             status: false,
             error: req.auth.error
           });
-        case 6:
+        case 8:
           // create a cookie(sid) and save credentials in cache
           sid = uuid.v4();
-          credentials = {
-            token: authCred.token,
-            refreshToken: authCred.refreshToken,
-            sid: sid,
-            user_name: ''
-          };
-          if (process.env.USETOKEN === 'YES') {
-            options.allAppEnv.LOGONPAYLOAD.token = authCred.token;
+          credentials.sid = sid;
+          if (options != null) {
+            options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
             debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          _context.next = 11;
+          debug('credentials', credentials);
+          _context.next = 14;
           return req.server.app.cache.set(sid, credentials, 0);
-        case 11:
-          debugger;
-          console.log(h.request.auth);
-          debugger;
-          //req.cookieAuth.set({ sid });
-
-          debugger;
-          // await req.server.app.cache.set(sid, credentials);
-          debugger;
-          debug('authcred query:', authCred.query);
-          redirect = authCred.query != null && authCred.query.next != null ? credentials.query.next : null;
+        case 14:
+          // Can we get away without setting cookie for this session?
+          // Need to also modify keepAlive
+          if (process.env.COOKIES !== 'NO') {
+            req.cookieAuth.set({
+              sid: sid
+            });
+          }
+          ;
+          req.log('credentialsquery', credentials.query);
+          debug(credentials.query);
+          redirect = credentials.query != null && credentials.query.next != null ? credentials.query.next : null;
+          debug('redirect', redirect);
           req.server.log('setcookie-redirect', redirect);
           return _context.abrupt("return", {
             status: true,
             error: null,
             redirect: redirect
           });
-        case 20:
+        case 22:
         case "end":
           return _context.stop();
       }

package/lib/core/iService.js

@@ -103,11 +103,10 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             };
             if (process.env.HAPIDEBUG === 'YES') {
               sConfig.debug = {
-                log: ['hapi'],
-                request: ['hapi']
+                request: '*'
               };
             }
-            debug('sConfig:', JSON.stringify(sConfig, null, 4));
+            debug(JSON.stringify(sConfig, null, 4));
             if (!(process.env.HTTPS === 'true')) {
               _context.next = 16;
               break;

package/lib/core/index.js

@@ -27,11 +27,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 var debug = require("debug")("startup");
 module.exports = function core(uTable, useDefault, serverMode, customize, swaggerfcn) {
   var argv = require("yargs").argv;
-  debug(argv);
   var env = argv.env == null ? null : argv.env;
   var appenv = argv.appenv == null ? null : argv.appenv;
   var docker = argv.docker == null ? null : argv.docker;
-  process.env.SERVERMODE = serverMode !== null ? process.env.SERVERMODE : "app";
+  process.env.SERVERMODE = serverMode !== null ? "api" : "app";
   if (useDefault == null) {
     useDefault = true;
   }
@@ -87,7 +86,6 @@ function createPayload(srcName, cb) {
 function getAllEnv(userData) {
   var env;
   var l = null;
-  debugger;
   if (process.env.AUTHTYPE != null) {
     process.env.AUTHFLOW = process.env.AUTHTYPE;
   }
@@ -96,6 +94,7 @@ function getAllEnv(userData) {
     authflow = "server";
   }
   process.env.AUTHFLOW = authflow;
+  // let redirect = (process.env.REDIRECT != null) ? process.env.REDIRECT : null;
   var redirect = trimit("REDIRECT");
   var host = trimit("VIYA_SERVER");
   var clientID = trimit("CLIENTID");
@@ -105,64 +104,76 @@ function getAllEnv(userData) {
   var appName = trimit("APPNAME");
   var ns = trimit("NAMESPACE");
   var nsHost = trimit("NSHOST");
-  var appEntry = trimit("APPENTRY");
-  if (appEntry === null) {
-    appEntry = "index.html";
-    process.env.APPENTRY = appEntry;
-  }
-  ;
   l = {
     authType: authflow,
     redirect: redirect,
     host: host,
     clientID: clientID,
-    clientSecret: clientSecret,
     appName: appName,
-    appEntry: appEntry,
     keepAlive: null,
     useToken: process.env.USETOKEN,
     ns: ns,
     nsHost: nsHost
   };
-  if (authflow !== null) {
+  if (authflow === "server" || authflow === "implicit") {
     if (authflow === "implicit") {
       if (redirect === null) {
         redirect = "".concat(appName, "/callback");
-        ;
+        process.env.REDIRECT = "callback";
+      } else {
+        if (redirect !== null && redirect.indexOf("/") !== 0) {
+          redirect = redirect.indexOf("http") != -1 ? redirect : "".concat(process.env.APPNAME, "/").concat(redirect);
+        }
       }
-    }
-    if (redirect !== null && redirect.indexOf("/") !== 0) {
-      if (redirect.indexOf("/") !== 0) {
-        redirect = redirect.indexOf("http") != -1 ? redirect : "".concat(process.env.APPNAME, "/").concat(redirect);
+      l = {
+        authType: authflow,
+        redirect: redirect,
+        host: host,
+        clientID: clientID,
+        appName: appName,
+        keepAlive: null,
+        useToken: process.env.USETOKEN,
+        ns: ns,
+        nsHost: nsHost
+      };
+      if (authflow === "server" && keepAlive === "YES") {
+        var protocol = process.env.HTTPS === "true" ? "https://" : "http://";
+        l.keepAlive = "".concat(protocol).concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(appName, "/keepAlive");
+        l.keepAlive = l.keepAlive.replace(/0.0.0.0/, "localhost");
+      }
+      if (process.env.TIMERS != null) {
+        l.timers = process.env.TIMERS;
       }
     }
-    /*
-    if (redirect === null) {
-      redirect = `${appName}`;
-    }*/
-  }
-
-  // process.env.REDIRECT = redirect;
-  console.log("Redirect: ".concat(redirect));
-  console.log(process.env.REDIRECT);
-  l.redirect = redirect;
-  if (authflow === "server" && keepAlive === "YES") {
-    var protocol = process.env.HTTPS === "true" ? "https://" : "http://";
-    l.keepAlive = "".concat(protocol).concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(appName, "/keepAlive");
-    l.keepAlive = l.keepAlive.replace(/0.0.0.0/, "localhost");
-  }
-  if (process.env.TIMERS != null) {
-    l.timers = process.env.TIMERS;
+    // allow for no authtype
+    l = {
+      authType: authflow,
+      redirect: redirect,
+      host: host,
+      clientID: clientID,
+      appName: appName,
+      keepAlive: null,
+      useToken: process.env.USETOKEN,
+      ns: ns,
+      nsHost: nsHost
+    };
   }
 
   // pick up the app env's - replacement for appenv.js
   // appenv.js still supported for backward compatibility
+
   for (var key in process.env) {
+    debug(key);
     if (key.indexOf("APPENV_") === 0) {
       var k = key.substring(7);
       var v = process.env[key];
       if (v != null && v.trim().length > 0) {
-        userData[k] = v.trim();
+        if (v.startsWith('$')) {
+          v = process.env[v.substring(1)];
+        }
+        userData[k] = v != null ? v.trim() : null;
+      } else {
+        userData[k] = null;
       }
     }
   }
@@ -176,7 +187,7 @@ function getAllEnv(userData) {
 }
 function trimit(e) {
   var a = process.env[e];
-  if (a === undefined) {
+  if (a == null || a === undefined) {
     return null;
   }
   a = a.trim();

package/lib/core/plugins/SASauth.js

@@ -62,17 +62,8 @@ function _iSASauth() {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      debugger;
-                      console.log('in profile', credentials);
-                      debug(credentials);
-                      debug(params);
-                      debugger;
-
-                      //let r = await get();
-                      //debug(r);   
-                      debugger;
                       server.log('SASAuth profile', credentials);
-                    case 7:
+                    case 1:
                     case "end":
                       return _context.stop();
                   }

package/lib/core/plugins/appCookie.js

@@ -32,19 +32,16 @@ module.exports = /*#__PURE__*/function () {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      debugger;
-                      debug('in validateFunc');
-                      debug(req.path);
                       server.log('Cookie validateFunc', "path - ".concat(req.path));
                       if (!(session == null)) {
-                        _context.next = 7;
+                        _context.next = 4;
                         break;
                       }
                       console.log('session is null');
                       return _context.abrupt("return", {
                         valid: false
                       });
-                    case 7:
+                    case 4:
                       credentials = null;
                       if (Array.isArray(session) === true && session.length > 0) {
                         sid = session[0].sid;
@@ -52,29 +49,28 @@ module.exports = /*#__PURE__*/function () {
                         sid = session.sid;
                       }
                       if (!(sid != null)) {
-                        _context.next = 13;
+                        _context.next = 10;
                         break;
                       }
-                      _context.next = 12;
+                      _context.next = 9;
                       return req.server.app.cache.get(sid);
-                    case 12:
+                    case 9:
                       credentials = _context.sent;
-                    case 13:
+                    case 10:
                       if (!(credentials == null)) {
-                        _context.next = 15;
+                        _context.next = 12;
                         break;
                       }
                       return _context.abrupt("return", {
                         valid: false
                       });
-                    case 15:
+                    case 12:
                       server.log('Cookie validateFunc', sid);
-                      debug(sid);
                       return _context.abrupt("return", {
                         valid: true,
                         credentials: credentials
                       });
-                    case 18:
+                    case 14:
                     case "end":
                       return _context.stop();
                   }
@@ -86,8 +82,8 @@ module.exports = /*#__PURE__*/function () {
               return validateFunc;
             }()
           }; // console.log('cookie options', cookieOptions);
-          server.log('Cookie Options', cookieOptions);
           debug('Cookie Options', cookieOptions);
+          server.log('Cookie Options', cookieOptions);
           server.auth.strategy('session', 'cookie', cookieOptions);
         case 6:
         case "end":

package/lib/core/plugins/setContext.js

@@ -35,7 +35,6 @@ function _setContext() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           credentials = req.auth.credentials;
-          debugger;
           context = {
             path: req.path,
             params: req.params,
@@ -45,7 +44,7 @@ function _setContext() {
             host: process.env.VIYA_SERVER
           };
           return _context.abrupt("return", context);
-        case 4:
+        case 3:
         case "end":
           return _context.stop();
       }

package/lib/core/plugins/setDefaultRoutes.js

@@ -42,11 +42,7 @@ module.exports = function setDefaultRoutes(server, options) {
       strategy: 'sas'
     };
   }
-  debug('authDefault', authDefault);
-  debug('authLogon', authLogon);
-
-  //let getAppb = getApp.bind(null, (process.env.USETOKEN === 'YES' ? options : null));
-  var getAppb = _handlers.getApp.bind(null, options);
+  var getAppb = _handlers.getApp.bind(null, process.env.USETOKEN === 'YES' ? options : null);
   server.log('Default strategy', authDefault);
   server.log('Logon strategy', authLogon);
   options.authDefault = authDefault;
@@ -115,14 +111,6 @@ module.exports = function setDefaultRoutes(server, options) {
       cors: true,
       handler: _handlers.reactDev
     }
-  }, {
-    method: ['GET'],
-    path: "".concat(appName, "/develop"),
-    options: {
-      auth: false,
-      cors: true,
-      handler: _handlers.reactDev
-    }
   }, {
     method: ['GET'],
     path: "".concat(appName, "/logon"),
@@ -197,38 +185,15 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ['GET'],
     path: "".concat(appName, "/{param*}"),
     options: {
-      auth: authLogon,
-      /*authDefault,*/
-
-      // handler: getApp2,
-      handler: {
-        file: function file(req, h) {
-          debugger;
-          console.log('in file1 handler');
-          console.log(req.auth);
-          console.log(req.params);
-          return req.params.param;
-        }
-      }
+      auth: authDefault,
+      handler: _handlers.getApp2
     }
   }, {
     method: ['GET'],
     path: "/{param*}",
     options: {
-      auth: authLogon,
+      auth: authDefault,
       handler: _handlers.getApp2
-      /*
-      handler: {
-      	file: function (req,h) {
-      		debugger;
-      		console.log('in file2 handler');
-      		console.log(req.auth);
-      		console.log(req.params);
-      		return req.params.param;
-      	}
-      
-      },
-      */
     }
   }, {
     method: ['GET'],
@@ -262,7 +227,7 @@ module.exports = function setDefaultRoutes(server, options) {
         }
       }
     };
-    console.log(pr);
+    // console.log(pr);
     defaultTable.push(pr);
   }
   var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;

package/lib/core/plugins/setupAuth.js

@@ -44,38 +44,37 @@ function _setupAuth() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          debugger;
           if (!(options.authFlow === 'server')) {
-            _context.next = 13;
+            _context.next = 12;
             break;
           }
-          _context.next = 4;
+          _context.next = 3;
           return server.register({
             plugin: SASauth,
             options: options
           });
-        case 4:
-          _context.next = 6;
+        case 3:
+          _context.next = 5;
           return appCookie(server, options);
-        case 6:
+        case 5:
           def = 'session';
           if (!(options.serverMode === 'api')) {
-            _context.next = 11;
+            _context.next = 10;
             break;
           }
-          _context.next = 10;
+          _context.next = 9;
           return server.register({
             plugin: token
           });
-        case 10:
+        case 9:
           def = 'token';
-        case 11:
+        case 10:
           server.log('***********************Default auth', def);
           server.auth["default"](def);
           // console.log(server.registerations);
-        case 13:
+        case 12:
           setDefaultRoutes(server, options);
-        case 14:
+        case 13:
         case "end":
           return _context.stop();
       }

package/lib/core/plugins/token.js

@@ -17,12 +17,11 @@ function _itoken() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          debugger;
-          _context.next = 3;
+          _context.next = 2;
           return server.auth.scheme('SAStoken', require('../schemes/SASTokenScheme'));
-        case 3:
+        case 2:
           server.auth.strategy('token', 'SAStoken');
-        case 4:
+        case 3:
         case "end":
           return _context.stop();
       }

package/lib/core/schemes/SASTokenScheme.js

@@ -39,15 +39,14 @@ module.exports = function SASTokenScheme(server, options) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              debugger;
               authorization = request.headers.authorization;
               server.log('SASToken', authorization);
               if (authorization) {
-                _context.next = 5;
+                _context.next = 4;
                 break;
               }
               throw Boom.unauthorized(null, 'session');
-            case 5:
+            case 4:
               _authorization$split = authorization.split(' '), _authorization$split2 = _slicedToArray(_authorization$split, 2), tokenType = _authorization$split2[0], token = _authorization$split2[1];
               credentials = {
                 token: token,
@@ -56,7 +55,7 @@ module.exports = function SASTokenScheme(server, options) {
               return _context.abrupt("return", h.authenticated({
                 credentials: credentials
               }));
-            case 8:
+            case 7:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.0.3",
+  "version": "0.1.1",
   "description": "App server for Custom Viya Applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -32,5 +32,4 @@
     "pub": "npm publish --tag dev --access public",
     "lint": "npx eslint --fix src/*.js"
   }
-  
 }