@sassoftware/viya-serverjs 0.2.2 → 0.2.4

package/.env

@@ -1,17 +1,17 @@
 APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
-VIYA_SERVER=https://viya.kumar-zv1-azure-nginx-84560a6e.unx.sas.com
+# VIYA_SERVER=
 # VIYA_SERVER=none
 APPPORT=8080
-APPNAME=appBuilder
+APPNAME=viyaapp
 AUTHFLOW=server
-CLIENTID=appbuilder
+CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=
 # APPDIR=./appDir
 # HTTPS=true
-USELOGON=YES
+# USELOGON=YES
 
 USETOKEN=NO
 # SHOWENV=YES

package/.env.proxy

@@ -1,16 +1,17 @@
 APPHOST=localhost
-APPENTRY=index.html
+# APPENTRY=index.html
 APPENTRY=indexProxy.html
 APPLOC=./public
-VIYA_SERVER=https://viya.kumar-zv1-azure-nginx-84560a6e.unx.sas.com
+VIYA_SERVER=
 APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
-PROXYSERVER=https://viya.kumar-zv1-azure-nginx-84560a6e.unx.sas.com
+
 APPPORT=8080
 APPNAME=appBuilder
 AUTHFLOW=server
 CLIENTID=appbuilder
 CLIENTSECRET=jellico
 REDIRECT=
+
 # APPDIR=./appDir
 # HTTPS=true
 USELOGON=YES

package/.env.server

@@ -1,11 +1,11 @@
 APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
-# VIYA_SERVER=https://viya.kumar-zv1-azure-nginx-84560a6e.unx.sas.com
 VIYA_SERVER=
+APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
 APPPORT=8080
 APPNAME=appBuilder
-AUTHFLOW=
+AUTHFLOW=server
 CLIENTID=appbuilder
 CLIENTSECRET=jellico
 REDIRECT=/new
@@ -13,13 +13,14 @@ REDIRECT=/new
 # HTTPS=true
 USELOGON=YES
 
-USETOKEN=NO
+
+USETOKEN=YES
 # SHOWENV=YES
 # APPENV=
 APPENV_XYZ=AA
 APPENV_BAD=
 
-# APPENV_PUPID=NSHOST=https://sas-logon-app.viya.svc.cluster.local
+
 
 # NAMESPACE=viya
 # TLS_CERT=./certs/tls.crt

package/Dockerfile

@@ -20,7 +20,7 @@ ENV HTTPS=true
 # ENV APPPORT=8080
 
 ENV APPNAME=appBuilder
-ENV AUTHFLOW=
+# ENV AUTHFLOW=
 ENV CLIENTID=appBuilder
 ENV CLIENTSECRET=jellico
 ENV HAPIDEBUG=NO
@@ -31,8 +31,8 @@ ENV HAPIDEBUG=NO
 ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 
 # You can specify your own cet and key
-ENV TLS_CRT=./tls/tls.crt
-ENV TLS_KEY=./tls/tls.key
+# ENV TLS_CRT=./tls/tls.crt
+# ENV TLS_KEY=./tls/tls.key
 
 # Samesite specification
 ENV SAMESITE=None,secure

package/cli.js

@@ -1,9 +1,9 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 /*
 * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
-//let appServer = require('./lib/index.js');
+
 let core = require('./lib/index.js');
 console.log('Starting the cli for @sassoftware/viya-serverjs');
 core(null, true, 'app', null);

package/lib/handlers/proxyMapUri.js

@@ -23,7 +23,9 @@ function _proxyMapUri() {
             sid = credentials.sid;
             console.log('sid=', sid);
           }
-          path = process.env.PROXYSERVER;
+
+          // let path = process.env.PROXYSERVER;
+          path = process.env.PROXYSERVER == null ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
           console.log('proxying to= ', path);
           params = req.params;
           console.log('params=', params);
@@ -45,32 +47,4 @@ function _proxyMapUri() {
   }));
   return _proxyMapUri.apply(this, arguments);
 }
-var _default = exports["default"] = proxyMapUri;
-/*
-let qsstring = req.raw.search;
-  console.log('qsstring=', qsstring);
-  let query = req.query;
-  let newQuery = null;
- 
-  if (query != null) {
-    console.log('query=', query);
-    newQuery = {};
-    for (let key in query) {
-      let value = query[key];
-      if (value === 'true' || value === 'false') {
-        value = value === 'true';
-      }
-      newQuery[key] = value;
-      }
-      console.log('newQuery=', newQuery);
-    }
-  console.log(req.URLSearchParams);
-  let uri = path + '/' + params.param;
-  if (newQuery != null) {
-    uri = `${uri}?${new URLSearchParams(newQuery)}`;
-  }
- console.log('req.url', req.url); 
- console.log('req.url', req.url.search);
- console.log('uri=', req.uri);
- console.log('path=', req.path);
-*/
+var _default = exports["default"] = proxyMapUri;

package/lib/handlers/setCookies.js

@@ -25,17 +25,18 @@ function _setCookies() {
         case 0:
           credentials = req.auth.credentials;
           debug('setcookie', credentials);
-          debug('setcookie', credentials);
           if (!(credentials != null && req.auth.error != null)) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
+          debug('setcookie credentials', credentials);
+          debug('setcookie error', req.auth.error);
           debug('logon failed');
           return _context.abrupt("return", {
             status: false,
             error: req.auth.error
           });
-        case 6:
+        case 7:
           // create a cookie(sid) and save credentials in cache
           sid = uuid.v4();
           credentials.sid = sid;
@@ -44,9 +45,9 @@ function _setCookies() {
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
             debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          _context.next = 11;
+          _context.next = 12;
           return req.server.app.cache.set(sid, credentials, 0);
-        case 11:
+        case 12:
           // Can we get away without setting cookie for this session?
           // Need to also modify keepAlive
           if (process.env.COOKIES !== 'NO') {
@@ -64,7 +65,7 @@ function _setCookies() {
             error: null,
             redirect: redirect
           });
-        case 17:
+        case 18:
         case "end":
           return _context.stop();
       }

package/lib/plugins/appCookie.js

@@ -34,7 +34,7 @@ module.exports = /*#__PURE__*/function () {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      server.log('Cookie validateFunc', "path - ".concat(req.path));
+                      debug('Cookie validateFunc', "path - ".concat(req.path));
                       if (!(session == null)) {
                         _context.next = 4;
                         break;
@@ -67,7 +67,7 @@ module.exports = /*#__PURE__*/function () {
                         valid: false
                       });
                     case 12:
-                      server.log('Cookie validateFunc', sid);
+                      debug('Cookie validateFunc', sid);
                       return _context.abrupt("return", {
                         valid: true,
                         credentials: credentials
@@ -84,7 +84,7 @@ module.exports = /*#__PURE__*/function () {
               return validateFunc;
             }()
           }; // console.log('cookie options', cookieOptions);
-          server.log('Cookie Options', cookieOptions);
+          debug('Cookie Options', cookieOptions);
           server.auth.strategy('session', 'cookie', cookieOptions);
         case 7:
         case "end":

package/lib/plugins/setDefaultRoutes.js

@@ -51,18 +51,30 @@ module.exports = function setDefaultRoutes(server, options) {
   var uTable = options.userRouteTable !== null ? (0, _handlers.setupUserRoutes)(options.userRouteTable, options) : null;
   var defaultTable = [{
     method: ["GET"],
-    path: "/health",
+    path: "".concat(appName, "/logon"),
     options: {
-      auth: false,
+      auth: options.authFlow === "server" ? {
+        mode: "try",
+        strategy: "sas"
+      } : null,
+      //https://futurestud.io/tutorials/hapi-redirect-to-previous-page-after-login
+      // set auth to null on all protected routes
+      plugins: {
+        "hapi-auth-cookie": {
+          redirectTo: false
+        }
+      },
       handler: function () {
         var _handler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, h) {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                return _context.abrupt("return", h.response({
-                  x: 1
-                }).code(200));
-              case 1:
+                debug('logonhandler', req.auth.credentials);
+                _context.next = 3;
+                return (0, _handlers.logon)(req, h);
+              case 3:
+                return _context.abrupt("return", _context.sent);
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -74,23 +86,6 @@ module.exports = function setDefaultRoutes(server, options) {
         return handler;
       }()
     }
-  }, {
-    method: ["GET"],
-    path: "".concat(appName, "/logon"),
-    options: {
-      auth: options.authFlow === "server" ? {
-        mode: "try",
-        strategy: "sas"
-      } : null,
-      //https://futurestud.io/tutorials/hapi-redirect-to-previous-page-after-login
-      // set auth to null on all protected routes
-      plugins: {
-        "hapi-auth-cookie": {
-          redirectTo: false
-        }
-      },
-      handler: _handlers.logon
-    }
   }, {
     method: ["GET"],
     path: "".concat(appName),
@@ -155,44 +150,74 @@ module.exports = function setDefaultRoutes(server, options) {
     path: "".concat(appName, "/appenv"),
     options: {
       auth: /*authDefault*/false,
-      handler: function handler(req, h) {
-        var allAppEnv = options.allAppEnv;
-        if (options.userInfo != null) {
-          var uappenv = options.userInfo("APPENV", options);
-          if (uappenv != null) {
-            allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
-          }
-        }
-        allAppEnv.credentials = options.credentials;
-        var s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
-        if (process.env.SHOWENV != null) {
-          console.log(s);
+      handler: function () {
+        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(req, h) {
+          var allAppEnv, uappenv, s;
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+            while (1) switch (_context3.prev = _context3.next) {
+              case 0:
+                allAppEnv = options.allAppEnv;
+                if (options.userInfo != null) {
+                  uappenv = options.userInfo("APPENV", options);
+                  if (uappenv != null) {
+                    allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
+                  }
+                }
+                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 _context3.abrupt("return", s);
+              case 7:
+              case "end":
+                return _context3.stop();
+            }
+          }, _callee3);
+        }));
+        function handler(_x5, _x6) {
+          return _handler3.apply(this, arguments);
         }
-        debug(s);
-        return s;
-      }
+        return handler;
+      }()
     }
   }, {
     method: ["GET"],
     path: "/appenv",
     options: {
       auth: /*authDefault*/false,
-      handler: function handler(req, h) {
-        var allAppEnv = options.allAppEnv;
-        if (options.userInfo != null) {
-          var uappenv = options.userInfo("APPENV", options);
-          if (uappenv != null) {
-            allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
-          }
-        }
-        allAppEnv.credentials = options.credentials;
-        var s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
-        if (process.env.SHOWENV != null) {
-          debug(options.allAppEnv);
+      handler: function () {
+        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(req, h) {
+          var allAppEnv, uappenv, s;
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                allAppEnv = options.allAppEnv;
+                if (options.userInfo != null) {
+                  uappenv = options.userInfo("APPENV", options);
+                  if (uappenv != null) {
+                    allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
+                  }
+                }
+                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);
+                }
+                debug(s);
+                return _context4.abrupt("return", s);
+              case 7:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function handler(_x7, _x8) {
+          return _handler4.apply(this, arguments);
         }
-        debug(s);
-        return s;
-      }
+        return handler;
+      }()
     }
   },
   /*

package/lib/plugins/setupAuth.js

@@ -30,6 +30,7 @@ var SASauth = require('./SASauth');
 var appCookie = require('./appCookie');
 var token = require('./token');
 var setDefaultRoutes = require('./setDefaultRoutes');
+var log = require('debug')('auth');
 
 /** Notes:
  * If api then register sasAuth and token - no cookies
@@ -69,7 +70,7 @@ function _setupAuth() {
         case 9:
           def = 'token';
         case 10:
-          server.log('***********************Default auth', def);
+          log('***********************Default auth', def);
           server.auth["default"](def);
           // console.log(server.registerations);
         case 12:

package/package.json

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

package/public/index.html

@@ -66,8 +66,13 @@
 	
 		<script>
 			debugger;
+			console.log(JSON.stringify(APPENV, null, 4));
 			let store = restaf.initStore({
-				casProxy: true});
+				casProxy: true,
+				options: {
+					proxyServer: APPENV.PROXYSERVER,
+				}
+			});
 			debugger;	console.log(store.config);
 
 			let session = null;
@@ -126,6 +131,7 @@
 					return 'done';
 				}
 				let msg = await store.logon(LOGONPAYLOAD);
+				console.log(store.connection());
 				console.log(msg);
 
 			//	let { identities } = await store.addServices('identities');
@@ -216,7 +222,7 @@
 				return true;
 			}
 			async function runCas(store) {
-				
+				debugger;
 				let {casManagement} = await store.addServices('casManagement');
 				let servers = await store.apiCall(
 					casManagement.links('servers')

package/public/indexProxy.html

@@ -125,6 +125,7 @@
 
 				console.log(LOGONPAYLOAD);
 				debugger;
+				LOGONPAYLOAD.host = 'https://localhost:8080';
 				let msg = await store.logon(LOGONPAYLOAD);
 				console.log(msg);
 

package/server.js

@@ -4,15 +4,7 @@
  */
 let core = require('./lib/index.js');
 debugger;
-core(getCustomHandler, true, 'app', customize);
-function customize(key, _options) {
-	debugger;
-	let info = {
-		SWAGGEROPTIONS: {},
-		APPENV: null,
-	};
-	return info[key];
-}
+core(getCustomHandler, true, 'app', null);
 
 function getCustomHandler() {
 	let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
@@ -41,121 +33,18 @@ function getCustomHandler() {
 			path: `${appName}/new`,
 			options: {
 				files: {
-					relativeTo: process.env.APPDIR,
+					relativeTo: "./public",
 				},
 				handler: async (req, h) => {
-					console.log('in new');
-					let q = req.pre.context;
-					console.log('query', q.query);
-					console.log('queryOrig', q.queryOrig);
-					let hf = null;
-					if (q.query != null) {
-						let app = q.query;
-						if (app.edit != null) {
-							hf = app.edit + '/design.html';
-						} else if (app.view != null) {
-							hf = app.view + '/index.html';
-						}
-					}
-					console.log('hf=', hf);
-					if (hf === null) {
-						hf = getIndex();
-						return h.response(hf).header('contentType', 'text/html');
-					} else {
-						return h.file(hf);
-					}
-
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
+					return h.file('index.html');	
 				},
 				// auth: 'logon',
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],
 			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/ntest/{app?}`,
-			options: {
-
-				handler: async (req, h) => {
-					params = req.params;
-					console.log('params', params.app);
-					let hf = req.pre.context.queryOrig.app;
-					console.log('hf=', hf);
-					return h.file('help.html');
-				},
-				// auth: 'logon',
-				description: "App Route",
-				notes: "Default App Route",
-				tags: ["app"],
-			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/view`,
-			options: {
-
-				handler: async (req, h) => {
-					let hf = req.pre.context.queryOrig.app;
-					console.log('hf=', hf);
-					return h.file('help.html');
-				},
-				// auth: 'logon',
-				description: "App Route",
-				notes: "Default App Route",
-				tags: ["app"],
-			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/edit`,
-			options: {
-				files: {
-					relativeTo: process.env.APPDIR,
-				},
-				handler: async (req, h) => {
-					let hf = req.pre.context.queryOrig.app;
-					console.log('hf=', hf);
-					return h.file(hf + '/design.html');
-				},
-				//  auth: 'logon',
-				description: "App Route",
-				notes: "Default App Route",
-				tags: ["app"],
-			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/test`,
-			options: {
-				handler: async (req, h) => {
-					debugger;
-					console.log("++++++++++++++++++++++ in post");
-					let context = req.pre.context;
-					console.log(context);
-					let loc = req.context.queryOrig.h;
-					console.log(loc);
-					return h.file(loc);
-				},
-				auth: false,
-				description:
-					"Another test",
-				notes: "second test",
-				tags: ["api"],
-			},
-		},
-		{
-			method: ["GET"],
-			path: `${appName}/{param*}`,
-
-			options: {
-				handler: async (req, h) => {
-					console.log('in get param');
-					console.log(req.params);
-					return ('hi');
-				},
-			}
-		},
+		}
 	];
 	return routes;
 }

package/src/handlers/proxyMapUri.js

@@ -6,7 +6,8 @@ async function proxyMapUri (req) {
     console.log('sid=', sid);
   }
  
-  let path = process.env.PROXYSERVER;
+ // let path = process.env.PROXYSERVER;
+  let path = (process.env.PROXYSERVER == null) ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
   console.log('proxying to= ', path);
   let params = req.params;
   console.log('params=', params);
@@ -22,32 +23,3 @@ async function proxyMapUri (req) {
   };
   }
 export default proxyMapUri;
-
-/*
-let qsstring = req.raw.search;
-  console.log('qsstring=', qsstring);
-  let query = req.query;
-  let newQuery = null;
- 
-  if (query != null) {
-    console.log('query=', query);
-    newQuery = {};
-    for (let key in query) {
-      let value = query[key];
-      if (value === 'true' || value === 'false') {
-        value = value === 'true';
-      }
-      newQuery[key] = value;
-      }
-      console.log('newQuery=', newQuery);
-    }
-  console.log(req.URLSearchParams);
-  let uri = path + '/' + params.param;
-  if (newQuery != null) {
-    uri = `${uri}?${new URLSearchParams(newQuery)}`;
-  }
- console.log('req.url', req.url); 
- console.log('req.url', req.url.search);
- console.log('uri=', req.uri);
- console.log('path=', req.path);
-*/

package/src/handlers/setCookies.js

@@ -8,8 +8,10 @@ let debug = require('debug')('setcookies');
 async function setCookies (req, h, options) {
     let credentials = req.auth.credentials;
     debug('setcookie', credentials);
-    debug('setcookie', credentials);
+ 
     if (credentials != null && req.auth.error != null) {
+        debug('setcookie credentials', credentials);
+        debug('setcookie error', req.auth.error);
         debug('logon failed');
         return { status: false, error: req.auth.error };
     }

package/src/iService.js

@@ -152,6 +152,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		*/
 		
 		// setup authentication related plugins
+		
 		let options = {
 			serverMode    : serverMode,
 			authFlow      : process.env.AUTHFLOW,