@sassoftware/viya-serverjs 0.0.2 → 0.0.3

package/lib/core/config.js

@@ -25,6 +25,12 @@ 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) {
@@ -82,12 +88,18 @@ function iconfig(appEnv) {
     var d = data.split(/\r?\n/);
     d.forEach(function (l) {
       if (l.length > 0 && l.indexOf('#') === -1) {
-        var la = l.split('=');
-        var envName = la[0];
-        if (la.length === 2 && la[1].length > 0) {
-          process.env[envName] = la[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;
         }
-        configDebug(la[1]);
+        configDebug(envName, '=', value);
       }
     });
   } catch (err) {

package/lib/core/handlers/codeAuth.js

@@ -49,21 +49,11 @@ function _codeAuth() {
             /* hmr support */
             indexHTML = "/".concat(process.env.APPNAME, "/").concat(indexHTML);
           }
-          return _context.abrupt("return", {
-            status: true,
-            error: null,
-            target: 'redirect',
-            redirect: indexHTML
-          });
+          return _context.abrupt("return", h.redirect(indexHTML));
         case 16:
           // return h.file(indexHTML);
           console.log('redirecting to 		:', "/".concat(indexHTML));
-          return _context.abrupt("return", {
-            status: true,
-            error: null,
-            target: 'file',
-            redirect: indexHTML
-          });
+          return _context.abrupt("return", h.file(indexHTML));
         case 18:
         case "end":
           return _context.stop();

package/lib/core/handlers/getApp.js

@@ -19,7 +19,7 @@ function getApp(_x, _x2, _x3) {
 }
 function _getApp() {
   _getApp = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options, req, h) {
-    var authType, status, indexHTML, handleImplicit, _handleImplicit;
+    var authType, indexHTML, handleImplicit, _handleImplicit;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -71,37 +71,22 @@ function _getApp() {
           debug("calling handleImplicit");
           return _context2.abrupt("return", handleImplicit(options, req, h));
         case 9:
-          console.log("in getApp:****1 ", authType);
           if (!(authType === "server")) {
-            _context2.next = 22;
+            _context2.next = 14;
             break;
           }
           debugger;
-          _context2.next = 14;
-          return (0, _codeAuth["default"])(req, h, options);
+          return _context2.abrupt("return", (0, _codeAuth["default"])(req, h, options));
         case 14:
-          status = _context2.sent;
-          if (!(status.target === "redirect")) {
-            _context2.next = 19;
-            break;
-          }
-          return _context2.abrupt("return", h.redirect(status.redirect));
-        case 19:
-          return _context2.abrupt("return", h.file(status.redirect));
-        case 20:
-          _context2.next = 27;
-          break;
-        case 22:
           if (!(authType === null)) {
-            _context2.next = 27;
+            _context2.next = 18;
             break;
           }
           /* case of no auth */
-          debug("usecase: No authflow");
           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 27:
+        case 18:
         case "end":
           return _context2.stop();
       }

package/lib/core/handlers/proxyMapUri.js

@@ -17,6 +17,7 @@ function _proxyMapUri() {
     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) {
@@ -37,7 +38,7 @@ function _proxyMapUri() {
           return _context.abrupt("return", {
             uri: uri
           });
-        case 13:
+        case 14:
         case "end":
           return _context.stop();
       }

package/lib/core/handlers/setCookies.js

@@ -44,7 +44,7 @@ function _setCookies() {
             sid: sid,
             user_name: ''
           };
-          if (options != null) {
+          if (process.env.USETOKEN === 'YES') {
             options.allAppEnv.LOGONPAYLOAD.token = authCred.token;
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
             debug(options.allAppEnv.LOGONPAYLOAD);

package/package.json

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