@sassoftware/viya-serverjs 0.6.1-5 → 0.6.2

package/.env

@@ -3,15 +3,16 @@ APPENTRY=index.html
 APPLOC=./public
 
 APPENV_USEPROXY=YES
-APPPORT=8080
+PORT=8080
 APPNAME=viyaapp
 AUTHFLOW=server
 CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=
-USELOGON=FALSE
-USETOKEN=FALSE
+# USELOGON=FALSE
+# USETOKEN=FALSE
+HTTPS=true
 
-VIYACERT=c:\Users\kumar\viyaCert
+VIYACERT=c:\Users\kumar\viyaCert\xf1
 NODE_TLS_REJECT_UNAUTHORIZED=0
 

package/lib/iService.js

@@ -51,7 +51,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
   // process.env.APPHOST_ADDR = process.env.APPHOST;
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var defaultMaxBytes, maxBytes, isSameSite, isSecure, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, allRoutes, hh, msg;
+      var defaultMaxBytes, maxBytes, isSameSite, isSecure, https, _process$env$SAMESITE, _process$env$SAMESITE2, s1, s2, sConfig, hapiServer, nodeCacheOptions, storeCache, visionOptions, options, allRoutes, hh, msg;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -64,13 +64,15 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             } else {
               maxBytes = Number(process.env.PAYLOADMAXBYTES);
             }
-            isSameSite = 'None';
+            isSameSite = 'Lax';
             isSecure = false;
+            https = process.env.HTTPS || 'TRUE';
+            https = https.toUpperCase();
             if (process.env.SAMESITE != null) {
               _process$env$SAMESITE = process.env.SAMESITE.split(','), _process$env$SAMESITE2 = _slicedToArray(_process$env$SAMESITE, 2), s1 = _process$env$SAMESITE2[0], s2 = _process$env$SAMESITE2[1];
               isSameSite = s1;
               isSecure = s2 === 'secure' ? true : false;
-              if (process.env.HTTPS !== 'true') {
+              if (https !== 'TRUE') {
                 isSecure = false;
               }
             }
@@ -103,7 +105,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               };
             }
             debug(JSON.stringify(sConfig, null, 4));
-            if (process.env.HTTPS === 'true') {
+            if (https === 'TRUE') {
               sConfig.tls = getCertificates();
               debug('Setup of SSL certificates completed');
             } else {
@@ -145,7 +147,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             _context.n = 2;
             return hapiServer.register(inert);
           case 2:
-            if (!(process.env.HTTPS === 'true')) {
+            if (!(https === 'TRUE')) {
               _context.n = 3;
               break;
             }
@@ -180,7 +182,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               useDefault: useDefault,
               /* not used - left here for potential reuse */
               userCache: userCache || {},
-              https: process.env.HTTPS,
+              https: https,
               authDefault: false,
               /* set later in setDefaultRoutes */
               authLogon: false /* set later in setDefaultRoutes */

package/lib/index.js

@@ -149,7 +149,7 @@ function getAllEnv(userInfo) {
       l.redirect = redirect;
     }
     if (authflow === "server" && keepAlive === "YES") {
-      var protocol = process.env.HTTPS === "true" ? "https://" : "http://";
+      var protocol = process.env.HTTPS.toUpperCase() === "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");
     }

package/lib/plugins/setContext.js

@@ -65,9 +65,9 @@ function _setContext() {
             query: req.query,
             payload: req.payload,
             queryOrig: fcredentials != null ? fcredentials.query : {},
-            credentials: _objectSpread(_objectSpread({}, fcredentials), {}, {
+            credentials: fcredentials != null ? _objectSpread(_objectSpread({}, fcredentials), {}, {
               host: process.env.VIYA_SERVER
-            }),
+            }) : null,
             credType: credentials != null ? 'auth' : 'cached',
             host: process.env.VIYA_SERVER
           };

package/lib/plugins/setDefaultRoutes.js

@@ -189,7 +189,7 @@ module.exports = function setDefaultRoutes(server, options) {
       }
     }
   }];
-  var uTable = options.userRouteTable();
+  var uTable = options.userRouteTable == null ? [] : options.userRouteTable();
   var routeTables0 = options.userRouteTable !== null ? defaultTable.concat(uTable) : defaultTable;
   var routeTables = (0, _handlers.setupUserRoutes)(routeTables0, options);
   server.route(routeTables);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.6.1-5",
+  "version": "0.6.2",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -29,7 +29,7 @@
   "unpkg": "./lib/index.js",
   "scripts": {
     "build": "rimraf lib && babel src --out-dir lib",
-    "test": "cross-env  node cli --env=./.env --docker=./Dockerfile",
+    "test": "node cli --env=./.env --docker=./Dockerfile",
     "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env --docker=./Dockerfile",
     "proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
     "pub": "npm publish --tag dev --access public",
@@ -56,6 +56,7 @@
     "jwt-decode": "^4.0.0",
     "node-cache-promise": "^1.0.2",
     "only": "0.0.2",
+    "open": "^11.0.0",
     "qs": "^6.14.1",
     "regenerator-runtime": "^0.14.1",
     "request-debug": "^0.2.0",

package/src/iService.js

@@ -46,14 +46,16 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		} else {
 			maxBytes = Number(process.env.PAYLOADMAXBYTES);
 		}
-		let isSameSite = 'None';
+		let isSameSite = 'Lax';
 		let isSecure = false;
+		let https = process.env.HTTPS || 'TRUE';
+		https = https.toUpperCase();
 		
 		if (process.env.SAMESITE != null) {
 			let [s1, s2] = process.env.SAMESITE.split(',');
 			isSameSite = s1;
 			isSecure = s2 === 'secure' ? true : false;
-			if (process.env.HTTPS !== 'true') {
+			if (https !== 'TRUE') {
 				isSecure = false;
 			}
 		}
@@ -92,7 +94,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 			sConfig.debug = { request: '*' };
 		}
 		debug(JSON.stringify(sConfig, null,4));
-		if (process.env.HTTPS === 'true') {
+		if (https === 'TRUE') {
 			sConfig.tls = getCertificates();
 			debug('Setup of SSL certificates completed');
 		} else {
@@ -136,7 +138,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		await hapiServer.register(Vision);
 		hapiServer.views(visionOptions);
 		await hapiServer.register(inert);
-		if (process.env.HTTPS === 'true') {
+		if (https === 'TRUE') {
 			await hapiServer.register({ plugin: require('hapi-require-https'), options: {} });
 		}
 		// register H202 for proxy handling
@@ -165,7 +167,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 			userRouteTable: userRouteTable,
 			useDefault    : useDefault, /* not used - left here for potential reuse */
 			userCache      : userCache ||{},
-			https         : process.env.HTTPS,
+			https         : https,
 			authDefault   : false, /* set later in setDefaultRoutes */
             authLogon     : false  /* set later in setDefaultRoutes */
 
@@ -209,6 +211,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		process.env.APPSERVER = `${hh}/${process.env.APPNAME}`;
 		process.env.HEALTH = 'true';
 		console.log('====================================================================================');
+	
 	};
 
 	process.on('unhandledRejection', (err) => {

package/src/index.js

@@ -190,7 +190,7 @@ function getAllEnv(userInfo) {
     }
     
     if (authflow === "server" && keepAlive === "YES") {
-      let protocol = process.env.HTTPS === "true" ? "https://" : "http://";
+      let protocol = process.env.HTTPS.toUpperCase() === "TRUE" ? "https://" : "http://";
       l.keepAlive = `${protocol}${process.env.APPHOST}:${process.env.APPPORT}/${appName}/keepAlive`;
       l.keepAlive = l.keepAlive.replace(/0.0.0.0/, "localhost");
     }

package/src/plugins/setContext.js

@@ -37,7 +37,7 @@ async function setContext(req, h) {
         query: req.query,
         payload: req.payload,
         queryOrig: (fcredentials != null) ? fcredentials.query : {},
-        credentials: {...fcredentials, host: process.env.VIYA_SERVER},   
+        credentials: (fcredentials != null) ? {...fcredentials, host: process.env.VIYA_SERVER} : null,   
         credType: (credentials != null) ? 'auth' : 'cached',
         host: process.env.VIYA_SERVER
     };

package/src/plugins/setDefaultRoutes.js

@@ -185,7 +185,7 @@ module.exports = function setDefaultRoutes(server, options) {
     }
   ];
 
-  let uTable = options.userRouteTable();
+  let uTable = (options.userRouteTable == null) ? [] :  options.userRouteTable();
   let routeTables0 = options.userRouteTable !== null ? defaultTable.concat(uTable) : defaultTable;
   let routeTables = setupUserRoutes(routeTables0, options);