@sassoftware/viya-serverjs 0.4.0 → 0.5.1

package/.env

@@ -1,24 +1,38 @@
 APPHOST=localhost
 # APPENTRY=index.html
 APPLOC=./public
-# VIYA_SERVER=
-# VIYA_SERVER=none
+# VIYA_SERVER=your viya server
+
 APPPORT=8080
-APPNAME=viyaapp
-AUTHFLOW=server
-CLIENTID=viyaapp
+APPNAME=mcpapp
+AUTHFLOW=code
+CLIENTID=mcpapp
 CLIENTSECRET=jellico
+
 REDIRECT=
 # APPDIR=./appDir
 HTTPS=true
-VIYA_SERVER=https://viya-00m2kebi2b.engage.sas.com
 
-// browsers do not accept self-signed certs from localhost
+
+
+# Most modern browsers do not accept self-signed certs from localhost
+# Options:
+
+# 1. provide signed certificates for localhost
+# 2. Use libraries like mkcert to create temporary trusted certs for localhost
+# 3. Use the app server as a proxy to the Viya server to avoid CORS issues.
+#    This requires that the app redirect all Viya API calls to the app server proxy endpoint
+#    Users of restaf can simply set the APPENV_PROXY env to TRUE to enable this behavior
+# 4. set USETOKEN to TRUE and use the token in the APPENV object to make the calls
+// either use the proper ssl/tsl certs or use the "proxy" method
+// to avoid CORS issues with self-signed certs
 // so run all apps thru the proxy and call Viya from there
+APPENV_PROXY=false
+
 
-APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
-USETOKEN=YES
-SHOWENV=YES
+# APPENV_PROXYSERVER=true
+# USETOKEN=true
+SHOWENV=true
 
 APPENV_XYZ=AA
 APPENV_BAD=

package/.env.server

@@ -1,12 +1,14 @@
 APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
-VIYA_SERVER=
-APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
+# viya-server set preset
+# VIYA_SERVER=
+APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+
 APPPORT=8080
-APPNAME=appBuilder
+APPNAME=viyaapp
 AUTHFLOW=server
-CLIENTID=appbuilder
+CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=/new
 # APPDIR=./appDir

package/Dockerfile

@@ -11,6 +11,7 @@ ENV APPHOST=0.0.0.0
 ENV PORT=8080
 EXPOSE 8080
 ENV HTTPS=true
+ENV VIYA_SERVER=
 # ENV APPSERVERLEVEL=v2
 #######################################################################
 # You can override these(but in container leave APPHOST as shown below)
@@ -20,20 +21,19 @@ ENV HTTPS=true
 # ENV APPPORT=8080
 
 ENV APPNAME=viyaapp
-# ENV AUTHFLOW=
+ENV AUTHFLOW=server
 ENV CLIENTID=viyaapp
-ENV CLIENTSECRET=jellico
+ENV CLIENTSECRET=
 # ENV HAPIDEBUG=NO
 # ENV LOGLEVEL=info
 # ENV USETOKEN=YES
 
+# specify ssl/tls cert and key in a folder
+# example below
+ENV SSLCERT=c:/Users/kumar/.tls
 #sample setup for creating a temporary cert and key
 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
-
 # Samesite specification
 ENV SAMESITE=None,secure
 

package/README.md

@@ -1,99 +1,67 @@
-# `Application servers for use with SAS Viya`
+# `Application server for use with SAS Viya`
 
-This package has two servers:
+viya-serverjs is a app server designed to support user written SAS Viya applications. The applications can be written using any framework.
 
-1. viya-appserverjs - Use this for developing an app server for web applications(see packages/appjs)
+Key features:
 
-2. viya-apiserverjs - Use this to develop rest api servers(see packages/apijs)
+1. Handles authentication
+2. Extendable with additional end points
 
 ## Usage
 
-Specify it as a dependency in your package.json just as you do with other dependencies
-
 Use npx command to start the server
 
 ```sh
-npx @sassoftware/viyaappserverjs
+npx @sassoftware/viya-serverjs
 ```
 
 ## `Basic configuration`
 
-1. Set the default settings in Dockerfile. This will ensure these are set when you build containers.
-2. The defaults can be overriden using environment variables.
+Configure the server using a .env file
 
 ### `Sample env file`
 
-When running on a non-docker environment, you can use a .env
+>[Note] Sample values shown below. See Advanced section for other ways to configure the server
 
 ```env
-VIYA_SERVER=<your viya server>
-APPHOST=localhost < can also be dns name of your server. ex: viyaiscool.unx.sas.com>
-APPPORT=5000   <any port of your choice>
-APPNAME=viyaapp
-
-CLIENTID=viyaapp
-CLIENTSECRET=secret
-```
-
-### `Sample Dockerfile`
 
-```env
-FROM node:12.16.1-alpine
-LABEL maintainer="your email"
-WORKDIR /usr/src/app
-COPY . .
-RUN npm install
-# RUN npm run build (if you have to build something)
-EXPOSE 8080
-ENV APPHOST=0.0.0.0
+# Base setup
+# With the configuration below the app server url will be
+# https://localhost:8080/viyaapp
+#
+APPHOST=localhost
+APPPORT=8080
+HTTPS=true
+APPNAME=viyaapp
 
-AUTHFLOW=code
+# Most modern browsers will reject self-signed certs from localhost
+# And SAS Viya might also refuse connection.
+# Supply your own SSL/TLS values in a folder. All files in this folder will be used.
+# Options:
+# 1. provide signed certificates for localhost
+# 2. Use libraries like mkcert to create temporary trusted certs for localhost
+# 3. For other options see the Advanced Section
+SSLCERT=./tls  
 
-# The following are defaults. Override them as needed
-# APPLOC - where the file specified in APPENTRY is
-# APPENTRY - the main entry of the application
-ENV APPLOC=./public
-ENV APPENTRY=index.html
-# if your app takes advantage of appenv.js to pass configuration to the web application 
-# ENV APPENV=appenv.js 
+# AUTHENTICATION
+VIYA_SERVER=<viya servrer url>
 
-# See notes below on running with SSL enabled
-ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:yourcompany,OU:STO,CN:localhost"
-ENV SAMESITE=None,secure
+# By default it uses authorization_code flow
 
-# It is better to set this before invoking the server
-ENV NODE_TLS_REJECT_UNAUTHORIZED=0
+CLIENTID=<clientid>
+CLIENTSECRET=<clientSecret if present>
+AUTHFLOW=code|pkce
 
-# set this to YES if you want access to the authentication token in the app
-ENV USETOKEN=NO
+##########################
+# Read the Advanced Section in the README before turning on these options
+#
+APPENV_PROXY=false
+USETOKEN=false
 
-CMD ["npx", "@sassoftware/viya-appserverjs"]
+APPENV_A=somevalue
+APPENV_B=somevalue
 
 ```
 
-### `Running with SSL enabled -- Recommended`
-
-This is the recommended setting. This will also make browsers like Chrome run with the SAMESITE settings set to Default - your users will thank you.
-
-Make sure you specify the VIYA_SERVER with a protocol of https.
 
-### `TLS certificates`
 
-- Option 1: Let server create a temporary unsigned certificate
-
-    ```env
-    ENV TLS_CREATE=C:US,ST:NC,L:Cary,O:YourCompany,OU:yourgroup,CN:localhost
-    ```
-
-- Option 2: Provide your own key and certificate key
-
-```env
-ENV TLS_KEY=../certs/self/key.pem
-ENV TLS_CERT=../certs/self/certificate.pem
-```
-
-- Option 3:  Provide key and certificate as a pfx file
-
-```env
-ENV TLS_PFX=../certs/sascert/sascert2.pfx
-```

package/lib/handlers/setCookies.js

@@ -25,7 +25,6 @@ function _setCookies() {
         case 0:
           debugger;
           credentials = req.auth.credentials;
-          console.log('setcookies credentials', credentials);
           debug('setcookie', credentials);
           if (!(credentials != null && req.auth.error != null)) {
             _context.n = 1;

package/lib/iService.js

@@ -181,6 +181,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             	},
             });
             */
+            //
             // setup authentication related plugins
             options = {
               serverMode: serverMode,
@@ -193,6 +194,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               redirect: process.env.REDIRECT,
               clientId: process.env.CLIENTID,
               clientSecret: process.env.CLIENTSECRET,
+              pkce: allAppEnv.LOGONPAYLOAD.pkce,
               redirectTo: "/".concat(process.env.APPNAME, "/logon"),
               allAppEnv: allAppEnv,
               useHapiCookie: true,
@@ -320,22 +322,8 @@ function _getCertificates() {
             _context2.n = 1;
             break;
           }
-          console.log('ssl CERTIFICATES', tlsdir);
-          if (fs.existsSync("".concat(tlsdir, "/key.pem")) === true) {
-            options = {};
-            options.key = fs.readFileSync("".concat(tlsdir, "/key.pem"), {
-              encoding: 'utf8'
-            });
-            options.cert = fs.readFileSync("".concat(tlsdir, "/crt.pem"), {
-              encoding: 'utf8'
-            });
-            if (fs.existsSync("".concat(tlsdir, "/ca.pem")) === true) {
-              options.ca = fs.readFileSync("".concat(tlsdir, "/ca.pem"), {
-                encoding: 'utf8'
-              });
-            }
-            options.rejectUnauthorized = true;
-          }
+          options = readTLS(tlsdir);
+          options.rejectUnauthorized = true;
           _context2.n = 3;
           break;
         case 1:
@@ -352,6 +340,26 @@ function _getCertificates() {
   }));
   return _getCertificates.apply(this, arguments);
 }
+function readTLS(tlsdir) {
+  console.log("[Note] Using TLS dir: " + tlsdir);
+  if (fs.existsSync(tlsdir) === false) {
+    console.log("[Warning] Specified TLS dir does not exist: " + tlsdir);
+    return null;
+  }
+  var listOfFiles = fs.readdirSync(tlsdir);
+  console.log("[Note] TLS/SSL files found: " + listOfFiles);
+  var options = {};
+  for (var i = 0; i < listOfFiles.length; i++) {
+    var fname = listOfFiles[i];
+    var name = tlsdir + '/' + listOfFiles[i];
+    var key = fname.split('.')[0];
+    options[key] = fs.readFileSync(name, {
+      encoding: 'utf8'
+    });
+  }
+  console.log('TLS FILES', Object.keys(options));
+  return options;
+}
 function getTls() {
   return _getTls.apply(this, arguments);
 }

package/lib/index.js

@@ -29,7 +29,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default":
 var debug = require("debug")("startup");
 module.exports = function core(uTable, useDefault, serverMode, customize, swaggerfcn) {
   var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).argv;
-  var env = argv.env == null ? null : argv.env;
+  var env = argv.env == null ? '.env' : argv.env;
   var appenv = argv.appenv == null ? null : argv.appenv;
   var docker = argv.docker == null ? null : argv.docker;
   //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
@@ -95,20 +95,11 @@ function getAllEnv(userData) {
     console.log('Note: setting host to null');
     host = null;
   }
-
-  /*
-  if (process.env.AUTHTYPE != null) {
-    process.env.AUTHFLOW = process.env.AUTHTYPE;
-  }
-    */
-
   var authflow = trimit("AUTHFLOW");
-  if (authflow === "authorization_code" || authflow === "code") {
+  var pkce = authflow === "pkce" ? true : false;
+  if (authflow === "authorization_code" || authflow === "code" || authflow === "server" || authflow === "null" || authflow === "pkce") {
     authflow = "server";
   }
-  if (authflow === null) {
-    host = null;
-  }
   if (host === null) {
     authflow = null;
     console.log('Note: setting authflow to null');
@@ -119,7 +110,7 @@ function getAllEnv(userData) {
   var clientID = trimit("CLIENTID");
 
   // eslint-disable-next-line no-unused-vars
-  var clientSecret = trimit("CLIENTSECRET");
+  //let clientSecret = trimit("CLIENTSECRET");
   var keepAlive = trimit("KEEPALIVE");
   var appName = trimit("APPNAME");
   var ns = trimit("NAMESPACE");
@@ -130,6 +121,7 @@ function getAllEnv(userData) {
     host: host,
     clientID: clientID,
     appName: appName,
+    pkce: pkce,
     keepAlive: null,
     useToken: process.env.USETOKEN,
     ns: ns,
@@ -186,6 +178,7 @@ function getAllEnv(userData) {
       }
     }
   }
+  userData.APPNAME = l.appName;
   env = {
     LOGONPAYLOAD: l,
     APPENV: userData

package/lib/plugins/SASauth.js

@@ -79,11 +79,13 @@ function _iSASauth() {
             provider: provider,
             password: uuid.v4(),
             clientId: options.clientId,
-            clientSecret: options.clientSecret,
+            clientSecret: options.clientSecret == null ? '' : options.clientSecret,
             //   isSameSite  : options.isSameSite,
             isSecure: options.isSecure
           };
-          // console.log('SASAuth options', bellAuthOptions);
+          if (options.pkce === true) {
+            bellAuthOptions.pkce = 'S256';
+          }
           debug('belloptions', bellAuthOptions);
           server.log('SASAuth', bellAuthOptions);
           _context2.n = 1;

package/lib/plugins/appCookie.js

@@ -51,7 +51,6 @@ module.exports = /*#__PURE__*/function () {
                       } else {
                         sid = session.sid;
                       }
-                      console.log('appcookie sid', sid);
                       if (!(sid != null)) {
                         _context.n = 3;
                         break;

package/lib/plugins/setDefaultRoutes.js

@@ -2,6 +2,8 @@
 
 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); }
 var _handlers = require("../handlers");
+var _setContext = _interopRequireDefault(require("./setContext"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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; }
@@ -43,7 +45,7 @@ module.exports = function setDefaultRoutes(server, options) {
       strategy: "sas"
     };
   }
-  var getAppb = _handlers.getApp.bind(null, process.env.USETOKEN === "YES" ? options : null);
+  var getAppb = _handlers.getApp.bind(null, process.env.USETOKEN != null && process.env.USETOKEN.toUpperCase() === "TRUE" ? options : null);
   console.log("Default strategy", authDefault);
   console.log("Logon strategy", authLogon);
   options.authDefault = authDefault;
@@ -271,6 +273,13 @@ module.exports = function setDefaultRoutes(server, options) {
   };
   debug(pr);
   defaultTable.push(pr);
+  // now set pre for all default routes
+  defaultTable.forEach(function (r) {
+    r.options.pre = [{
+      method: _setContext["default"],
+      assign: 'context'
+    }];
+  });
   var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);
 };

package/lib/plugins/setupUserRoutes.js

@@ -51,11 +51,13 @@ function setupUserRoutes(u, options) {
         assign: 'context'
       }]);
     }
+    console.log(rx.options.pre);
     if (rx.options.auth === true) {
       rx.options.auth = options.authDefault;
     } else if (rx.options.auth === 'logon') {
       rx.options.auth = options.authLogon;
     }
+    console.log('route auth', rx.options.auth);
     return rx;
   });
   return routes;

package/mcpServer.js

@@ -0,0 +1,364 @@
+/*
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+let core = require('./lib/index.js');
+debugger;
+core(getCustomHandler, true, 'app', null);
+
+function getCustomHandler() {
+	let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
+	debugger;
+	let routes = [
+		{
+			method: ["GET"],
+			path: "/help",
+			options: {
+				files: {
+					relativeTo: "./public",
+				},
+				handler: async (req, h) => {
+					debugger;
+					let hf = 'help.html';
+					return h.file(hf);
+				},
+				auth: false,
+				description: "Help",
+				notes: "Help",
+				tags: ["app"],
+			},
+		},
+		{
+			method: ["GET"],
+			path: `${appName}/new`,
+			options: {
+				files: {
+					relativeTo: "./public",
+				},
+				handler: async (req, h) => {
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
+					return h.file('index.html');	
+				},
+				// auth: 'logon',
+				description: "Create new application",
+				notes: "Index file created from env data",
+				tags: ["app"],
+			},
+		}
+		
+	];
+	return routes;
+}
+function customize(key, options) {
+	let info = {
+		swaggerOptions: {
+			info: {
+				title: "Test API",
+				version: "0.0.1",
+				description: "This document was auto-generated at run time",
+			},
+			documentationPage: true,
+			documentationPath: `/${process.env.APPNAME}/documentation`,
+			swaggerUI: true,
+			swaggerUIPath: `/${process.env.APPNAME}/swaggerui`,
+			schemes: ["https", "http"],
+			cors: true,
+			auth: options.authDefault,
+		},
+		APPENV: {
+			x: 1,
+			y: 2,
+		},
+	};
+	let r = info[key];
+	return r == null ? {} : r;
+}
+
+function getIndex() {
+
+	let template = `
+  <html lang="en">
+	<head>
+		<meta charset="UTF-8" />
+
+		<script
+			crossorigin
+			src="https://unpkg.com/react@16/umd/react.production.min.js"
+		></script>
+		<script
+			crossorigin
+			src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"
+		></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-standalone/6.26.0/babel.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
+		<script src="https://unpkg.com/@sassoftware/restaf@5.2.4/dist/restaf.js"></script>
+		<script src="https://unpkg.com/@sassoftware/restaflib@5.2.4/dist/restaflib.js"></script>
+		
+		<style>
+			.container {
+				display: flex;
+				flex-direction: column;
+				flex-wrap: nowrap;
+				min-height: 800px;
+			}
+			.elabel {
+				display: inline-block;
+
+				clear: left;
+				width: 250px;
+				text-align: right;
+			}
+			.einput {
+				display: inline-block;
+			}
+			.div1 {
+				border: 1px solid black;
+				background: lightskyblue;
+			}
+			.div2 {
+				border: 1px solid black;
+				background: lightskyblue;
+				height: 200px;
+			}
+		</style>
+
+	  <script>
+    let LOGONPAYLOAD = {
+      host: "${process.env.VIYA_SERVER}",
+      authType: "server",
+      appName: "${process.env.APPNAME}",
+      };
+    </script>
+
+		<script>
+			debugger;
+			let store = restaf.initStore({
+				casProxy: true});
+			debugger;	console.log(store.config);
+
+			let session = null;
+			let servers = null;
+			let services = null;
+			let files = null;
+			let reports = null;
+			let compute = null;
+
+			function setup() {
+				debugger;
+				document.getElementById('output').innerHTML = '...initializing';
+				
+				initSession()
+					.then(r => {
+						document.getElementById('output').innerHTML = 'ready';
+						keepAlive();
+					})
+					.catch(e => {
+						
+						console.log(e);
+					});
+			}
+			
+
+			async function initSession() {
+			
+				console.log(LOGONPAYLOAD);
+				debugger;
+				let msg = await store.logon(LOGONPAYLOAD);
+				console.log(msg);
+
+			//	let { identities } = await store.addServices('identities');
+				let name = 'user';
+			//	if (identities.links('currentUser') !=  null) {
+			//		let c = await store.apiCall(identities.links('currentUser'));
+			//		name = c.items('id');
+			//	}
+				console.log(name);
+				debugger;
+				/*
+				services = await store.addServices(
+					'files', 'compute', 'casManagement'
+				);
+				console.log(services.casManagement.links().toJS())
+				*/
+				debugger;
+				return 'done';
+			}
+			function runit(type) {
+				
+				
+				document.getElementById('output').innerHTML = '...running';
+				let testcase;
+				switch (type) {
+					case 'files': {
+						testcase = SASfileService;
+						break;
+					}
+					case 'compute': {
+						testcase = dsCompute;
+						break;
+					}
+					case 'cas': {
+						testcase = runCas;
+						break;
+					}
+
+					case 'spre': {
+						testcase= spre;
+						
+						break;
+					}
+					default: {
+						testcase = SASfileService;
+						break;
+					}
+				}
+
+				testcase(store)
+					.then(r => {
+						document.getElementById(
+							'output'
+						).innerHTML = JSON.stringify(r, null, 4);
+					})
+					.catch(err => {
+						
+						document.getElementById(
+							'output'
+						).innerHTML = JSON.stringify(err, null, 4);
+					});
+			}
+			async function noaction() {
+				r = {msg: 'redirects completed'};
+				return r;
+			}
+			async function spre(store) {
+				let p = {
+					method: 'GET',
+					url   : 'http://localhost:3000/api/test',
+					withCredentials: true
+				}
+				let r = await store.request(p);
+				return r.data;
+			}
+			async function runCas(store) {
+				
+				let {casManagement} = await store.addServices('casManagement');
+				let servers = await store.apiCall(
+					casManagement.links('servers')
+				);
+				let serverName = servers.itemsList(0);
+				let session = await store.apiCall(
+					servers.itemsCmd(serverName, 'createSession')
+				);
+				let payload = {
+					action: 'builtins.echo',
+					data: { code: { x: 1 } }
+				};
+				console.log(JSON.stringify(session.links("execute"), null, 4));
+				let r = await store.runAction(session, payload);
+				console.log('echo completed');
+				await store.apiCall(session.links('delete'));
+				return r.items();
+			}
+
+			async function SASfileService(store) {
+				debugger;
+				let content;
+				try {
+					debugger;
+				let {files} = await store.addServices('files');
+				debugger;
+				console.log(JSON.stringify(files.links(), null, 4));
+				//console.log('items - should be an array of files(empty array is ok)')
+			//	console.log(files.items().toJS());
+				let payload = {
+					data: { x: 1, y: 'This was saved earlier in the step' },
+					headers: { 'content-type': 'application/json' }
+				};
+				let createCmd = files.links('create');
+				let newFile = await store.apiCall(createCmd, payload);
+				debugger;
+				console.log(JSON.stringify(newFile.links('content'), null, 4));
+				content = await store.apiCall(newFile.links('content'));
+				
+			} catch(err) {
+				console.log(JSON.stringify(err, null, 4));
+				debugger;
+			}
+				console.log(content);
+				return content.items();
+			}
+			async function dsCompute(store) {
+				let log = null;
+				debugger;
+				let {compute} = await store.addServices('compute');
+				let servers = await store.apiCall(compute.links('servers'));
+
+				let contexts = await store.apiCall(compute.links('contexts'));
+
+				// lookup the name of the first context and then use it to get the associated createSession restafLink
+				let createSession = contexts.itemsCmd(
+					contexts.itemsList(0),
+					'createSession'
+				);
+				let session = await store.apiCall(createSession);
+
+				// Now run a simple data step in that session
+				let payload = {
+					data: {
+						code: ["data _null_; do i = 1 to 100; x=1; end; run; "]
+					}
+				};
+
+				// Now execute the data step and wait for completion
+				let job = await store.apiCall(
+					session.links('execute'),
+					payload
+				);
+				let status = await store.jobState(job, null, 5, 2);
+
+				if (status.data === 'running') {
+					throw "ERROR: Job did not complete in allotted time";
+				} else {
+					switch (status.data) {
+						case 'warning':
+							console.log("Warning: check your log for warnings");
+							break;
+						case 'error':
+							throw "Please correct errors and rerun program";
+						default:
+							log = await store.apiCall(status.job.links('log'));
+							break;
+					}
+				}
+				return log === null ? status : log.items();
+			}
+		</script>
+	</head>
+	<body onload="setup()">
+		<h1 id="head">Hi</h1>
+		<div>
+
+			<button onclick="runit('files')">
+				Press to make a call to file service
+			</button>
+			<br />
+			<br />
+			<button onclick="runit('compute')">
+				Press to make a call compute service
+			</button>
+			<br />
+			<br />
+			<button onclick="runit('cas')">
+				Press to make a call to cas echo
+			</button>
+			<br />
+			<br />
+			
+		<div>
+			<pre id="output"></pre>
+		</div>
+	</body>
+</html>
+  `;
+	return template;
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "bin": {
-    "@sassoftware/viya-appserverjs": "cli.js"
+    "@sassoftware/viya-serverjs": "cli.js"
   },
   "keywords": [
     "restaf",
@@ -32,6 +32,7 @@
     "test": "node cli --env=./.env --docker=./Dockerfile",
     "submit": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 APPENTRY=simplesubmit.html node cli --env=./.env --docker=./Dockerfile",
     "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env.server --docker=./Dockerfile",
+    "server2": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env --docker=./Dockerfile",
     "debug": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0  node --inspect-brk server.js --env=./.env.server --docker=./Dockerfile",
     "proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
     "pub": "npm publish --tag dev --access public",

package/public/help.html

@@ -1 +1 @@
-<h1> Hellp</h1>
+<h1> Hello</h1>

package/public/index.html

@@ -66,10 +66,16 @@
 	<script>
 		debugger;
 		console.log(JSON.stringify(APPENV, null, 4));
+		let proxyServer = null;
+		if (APPENV.PROXY.toUpperCase() === 'TRUE') {
+			proxyServer = `${window.location.protocol}//${window.location.host}/${LOGONPAYLOAD.appName}/proxy`;
+
+		} 
+		console.log('Proxy Server = ' + proxyServer);
 		let store = restaf.initStore({
 			casProxy: true,
 			options: {
-				proxyServer: APPENV.PROXYSERVER,
+				proxyServer: proxyServer,
 				httpOptions: null
 			}
 		});

package/server.js

@@ -22,7 +22,7 @@ function getCustomHandler() {
 					let hf = 'help.html';
 					return h.file(hf);
 				},
-				auth: false,
+				auth: true,
 				description: "Help",
 				notes: "Help",
 				tags: ["app"],
@@ -30,21 +30,25 @@ function getCustomHandler() {
 		},
 		{
 			method: ["GET"],
-			path: `${appName}/new`,
+			path: `/mcp`,
 			options: {
 				files: {
 					relativeTo: "./public",
 				},
 				handler: async (req, h) => {
-					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in mcp');
+					console.log(req.auth.credentials);
+					debugger;
+					console.log(req.context);
 					return h.file('index.html');	
 				},
-				// auth: 'logon',
+				auth: 'logon',
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],
 			},
 		}
+		
 	];
 	return routes;
 }

package/src/handlers/setCookies.js

@@ -8,7 +8,6 @@ let debug = require('debug')('setcookies');
 async function setCookies (req, h, options) {
     debugger;
     let credentials = req.auth.credentials;
-    console.log('setcookies credentials', credentials);
     debug('setcookie', credentials);
  
     if (credentials != null && req.auth.error != null) {

package/src/iService.js

@@ -152,6 +152,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		});
 		*/
 		
+		//
 		// setup authentication related plugins
 		
 		let options = {
@@ -165,6 +166,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 			redirect      : process.env.REDIRECT,
 			clientId      : process.env.CLIENTID,
 			clientSecret  : process.env.CLIENTSECRET,
+			pkce          : allAppEnv.LOGONPAYLOAD.pkce,
 			redirectTo    : `/${process.env.APPNAME}/logon`,
 			allAppEnv     : allAppEnv,
 			useHapiCookie : true,
@@ -176,7 +178,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 			userInfo      : userInfo,
 			https         : process.env.HTTPS,
 			authDefault   : false, /* set later in setDefaultRoutes */
-      authLogon     : false  /* set later in setDefaultRoutes */
+            authLogon     : false  /* set later in setDefaultRoutes */
 
 		};
 		
@@ -263,16 +265,8 @@ async function getCertificates () {
 	let options = null;
 	let tlsdir = process.env.SSLCERT;
 	if (tlsdir != null  && tlsdir.trim().length > 0) {
-		console.log('ssl CERTIFICATES', tlsdir);
-		if (fs.existsSync(`${tlsdir}/key.pem`) === true) {
-			options = {};
-			options.key = fs.readFileSync(`${tlsdir}/key.pem`, { encoding: 'utf8' });
-			options.cert = fs.readFileSync(`${tlsdir}/crt.pem`, { encoding: 'utf8' });
-			if (fs.existsSync(`${tlsdir}/ca.pem`) === true) {
-			  options.ca = fs.readFileSync(`${tlsdir}/ca.pem`, { encoding: 'utf8' });
-			}
-		options.rejectUnauthorized= true;
-		}
+		options = readTLS(tlsdir);
+	    options.rejectUnauthorized= true;
 	} else {
 		console.log('No SSL certificates found, generating self-signed certificates');
 		options = await getTls();
@@ -281,6 +275,27 @@ async function getCertificates () {
 	return options;
 }
 
+function readTLS (tlsdir) {
+    console.log("[Note] Using TLS dir: " + tlsdir);
+    if (fs.existsSync(tlsdir) === false) {
+        console.log("[Warning] Specified TLS dir does not exist: " + tlsdir);
+        return null;
+    }
+
+    let listOfFiles = fs.readdirSync(tlsdir);
+    console.log("[Note] TLS/SSL files found: " + listOfFiles);
+    let options = {};
+    for(let i=0; i < listOfFiles.length; i++) {
+        let fname = listOfFiles[i];
+        let name = tlsdir + '/' + listOfFiles[i];
+        let key = fname.split('.')[0];
+        options[key] = fs.readFileSync(name, { encoding: 'utf8' });
+    }
+    console.log('TLS FILES', Object.keys(options));
+    return options;
+   
+}
+
 async function getTls () {
 	let options = {
 		keySize          : 2048,

package/src/index.js

@@ -33,7 +33,7 @@ module.exports = function core(
   swaggerfcn
 ) {
   let argv = yargs(hideBin(process.argv)).argv;
-  let env = argv.env == null ? null : argv.env;
+  let env = argv.env == null ? '.env' : argv.env;
   let appenv = argv.appenv == null ? null : argv.appenv;
   let docker = argv.docker == null ? null : argv.docker;
   //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
@@ -124,20 +124,15 @@ function getAllEnv(userData) {
     host = null;
   }
 
-  /*
-  if (process.env.AUTHTYPE != null) {
-    process.env.AUTHFLOW = process.env.AUTHTYPE;
-  }
-    */ 
 
   let authflow = trimit("AUTHFLOW");
-  if (authflow === "authorization_code" || authflow === "code") {
+  let pkce = (authflow === "pkce") ? true : false;
+  if (authflow === "authorization_code" || authflow === "code" || authflow === "server" ||
+      authflow === "null" || authflow === "pkce") { 
     authflow = "server";
+    
   } 
 
-  if (authflow === null) {
-    host = null;
-  }
 
   if (host === null) {
     authflow = null;
@@ -151,7 +146,7 @@ function getAllEnv(userData) {
   let clientID = trimit("CLIENTID");
 
   // eslint-disable-next-line no-unused-vars
-  let clientSecret = trimit("CLIENTSECRET");
+  //let clientSecret = trimit("CLIENTSECRET");
   let keepAlive = trimit("KEEPALIVE");
   let appName = trimit("APPNAME");
   let ns = trimit("NAMESPACE");
@@ -164,6 +159,7 @@ function getAllEnv(userData) {
     host: host,
     clientID: clientID,
     appName: appName,
+    pkce: pkce,
 
     keepAlive: null,
     useToken: process.env.USETOKEN,
@@ -230,7 +226,7 @@ for (let key in process.env) {
     }
   }
 }
-
+userData.APPNAME = l.appName;
 env = {
   LOGONPAYLOAD: l,
   APPENV: userData,

package/src/plugins/SASauth.js

@@ -65,11 +65,15 @@ async function iSASauth (server, options) {
         provider    : provider,
         password    : uuid.v4(),
         clientId    : options.clientId,
-        clientSecret: options.clientSecret,
+        clientSecret: (options.clientSecret == null) ? '' : options.clientSecret,
         //   isSameSite  : options.isSameSite,
         isSecure    : options.isSecure
     };
-    // console.log('SASAuth options', bellAuthOptions);
+    
+    if (options.pkce === true) {
+        bellAuthOptions.pkce = 'S256';
+    }
+   
     debug('belloptions', bellAuthOptions);
     server.log('SASAuth',bellAuthOptions);
     await server.register(bell);

package/src/plugins/appCookie.js

@@ -32,7 +32,6 @@ module.exports = async function appCookie (server, options){
             } else {
                 sid = session.sid;
             }
-            console.log('appcookie sid', sid);
             if (sid != null) {
                 credentials = await req.server.app.cache.get(sid);
              }

package/src/plugins/setDefaultRoutes.js

@@ -16,6 +16,7 @@
  *
  */
 
+
 import {
   getApp,
   getApp2,
@@ -29,6 +30,7 @@ import {
   reactDev,
   proxyMapUri,
 } from "../handlers";
+import setContext from './setContext';
 let debug = require("debug")("routes");
 module.exports = function setDefaultRoutes(server, options) {
   debug("setDefaultRoutes");
@@ -51,7 +53,7 @@ module.exports = function setDefaultRoutes(server, options) {
   }
   let getAppb = getApp.bind(
     null,
-    process.env.USETOKEN === "YES" ? options : null
+    (process.env.USETOKEN != null && process.env.USETOKEN.toUpperCase() === "TRUE") ? options : null
   );
 
   console.log("Default strategy", authDefault);
@@ -249,7 +251,10 @@ module.exports = function setDefaultRoutes(server, options) {
   };
   debug(pr);
   defaultTable.push(pr);
-
+  // now set pre for all default routes
+  defaultTable.forEach((r) => {
+    r.options.pre = [{method: setContext, assign: 'context'}];
+  });
   let routeTables =
     uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);

package/src/plugins/setupUserRoutes.js

@@ -25,22 +25,19 @@ function setupUserRoutes (u, options) {
     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'}]);
         }
+        console.log(rx.options.pre);
         if (rx.options.auth === true) {
             rx.options.auth = options.authDefault;   
         } else if (rx.options.auth === 'logon') {
             rx.options.auth = options.authLogon;
         } 
-       
+        console.log('route auth', rx.options.auth);
         return rx;
     });
     return routes;

package/.env.proxy

@@ -1,32 +0,0 @@
-APPHOST=localhost
-# APPENTRY=index.html
-APPENTRY=indexProxy.html
-APPLOC=./public
-VIYA_SERVER=
-APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
-
-APPPORT=8080
-APPNAME=appBuilder
-AUTHFLOW=server
-CLIENTID=appbuilder
-CLIENTSECRET=jellico
-REDIRECT=
-
-# APPDIR=./appDir
-# HTTPS=true
-USELOGON=YES
-
-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
-# TLS_KEY=./certs/tls.key
-
-
-

package/tls/viyatls.sh

@@ -1,3 +0,0 @@
-kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/ca.crt ./ca.crt
-kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.crt ./tls.crt
-kubectl cp $(kubectl get pod | grep "sas-consul-server-0" | awk -F" " '{print $1}'):security/tls.key ./tls.key