@sassoftware/viya-serverjs 0.2.4 → 0.3.0

package/.env

@@ -10,20 +10,19 @@ CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=
 # APPDIR=./appDir
-# HTTPS=true
-# USELOGON=YES
+HTTPS=true
+
+
+USETOKEN=YES
+SHOWENV=YES
 
-USETOKEN=NO
-# 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/.env.proxy

@@ -3,12 +3,12 @@ APPHOST=localhost
 APPENTRY=indexProxy.html
 APPLOC=./public
 VIYA_SERVER=
-APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
+APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
 
 APPPORT=8080
-APPNAME=appBuilder
+APPNAME=viyaapp
 AUTHFLOW=server
-CLIENTID=appbuilder
+CLIENTID=viyaapp
 CLIENTSECRET=jellico
 REDIRECT=
 

package/.env.server

@@ -2,11 +2,11 @@ APPHOST=localhost
 APPENTRY=index.html
 APPLOC=./public
 VIYA_SERVER=
-APPENV_PROXYSERVER=https://localhost:8080/appBuilder/proxy
+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

@@ -9,7 +9,7 @@ RUN npm install
 # will auto change to localhost in non-docker environments
 ENV APPHOST=0.0.0.0
 ENV PORT=8080
-EXPOSE $PORT
+EXPOSE 8080
 ENV HTTPS=true
 # ENV APPSERVERLEVEL=v2
 #######################################################################
@@ -19,9 +19,9 @@ ENV HTTPS=true
 # set this the same as EXPOSE here and override in env or as -p option in dockerrun
 # ENV APPPORT=8080
 
-ENV APPNAME=appBuilder
+ENV APPNAME=viyaapp
 # ENV AUTHFLOW=
-ENV CLIENTID=appBuilder
+ENV CLIENTID=viyaapp
 ENV CLIENTSECRET=jellico
 ENV HAPIDEBUG=NO
 # ENV LOGLEVEL=info
@@ -38,7 +38,7 @@ ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 ENV SAMESITE=None,secure
 
 # If your Viya instance still has a unsigned certificate set this value prior to invoking the server
-ENV NODE_TLS_REJECT_UNAUTHORIZED=0
+# ENV NODE_TLS_REJECT_UNAUTHORIZED=0
 
 #####################################################################
 CMD ["npm", "run", "indocker"]

package/lib/iService.js

@@ -230,7 +230,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
               });
             }
           case 40:
-            hapiServer.log('Plugin', process.env.PLUGIN);
+            console.log('Plugin', process.env.PLUGIN);
             if (!(process.env.PLUGIN === 'hapi-swagger' && serverMode === 'api')) {
               _context.next = 49;
               break;
@@ -309,37 +309,44 @@ function getCertificates() {
 }
 function _getCertificates() {
   _getCertificates = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var tls;
+    var options, tlsdir;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          tls = {};
-          debug2('TLS_CRT', process.env.TLS_CRT != null);
-          debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-          if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
-            if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
-              console.log('TLS_CRT and TLS_KEY exist');
-              tls.cert = fs.readFileSync(process.env.TLS_CRT);
-              tls.key = fs.readFileSync(process.env.TLS_KEY);
-            }
-          }
-          if (!(tls.cert == null && process.env.TLS_CREATE != null)) {
-            _context2.next = 10;
+          options = null;
+          tlsdir = process.env.SSLCERT;
+          if (!(tlsdir != null && tlsdir.trim().length > 0)) {
+            _context2.next = 7;
             break;
           }
-          /* unsigned certificate */
-          console.log('Creating selfsigned certificate');
-          debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
-          _context2.next = 9;
+          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;
+          }
+          _context2.next = 12;
+          break;
+        case 7:
+          console.log('No SSL certificates found, generating self-signed certificates');
+          _context2.next = 10;
           return getTls();
-        case 9:
-          tls = _context2.sent;
         case 10:
-          if (Object.keys(tls).length === 0) {
-            console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
-          }
-          return _context2.abrupt("return", tls);
+          options = _context2.sent;
+          options.rejectUnauthorized = false;
         case 12:
+          return _context2.abrupt("return", options);
+        case 13:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "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_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env --docker=./Dockerfile",
+    "test": "cross-env  node cli --env=./.env --docker=./Dockerfile",
     "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node 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/index.html

@@ -18,240 +18,229 @@
   -->
 
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<title>index.html</title>
 
-		<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>
-		<script src="/appenv"></script>
-	
-		<style>
-			.container {
-				display: flex;
-				flex-direction: column;
-				flex-wrap: nowrap;
-				min-height: 800px;
-			}
-			.elabel {
-				display: inline-block;
+<head>
+	<meta charset="UTF-8" />
+	<title>index.html</title>
 
-				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;
+	<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"></script>
+	<script src="https://unpkg.com/@sassoftware/restaflib@5.2.4"></script>
+	<script src="/appenv"></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>
+		debugger;
+		console.log(JSON.stringify(APPENV, null, 4));
+		let store = restaf.initStore({
+			casProxy: true,
+			options: {
+				proxyServer: APPENV.PROXYSERVER,
+				httpOptions: null
 			}
-		</style>
-	
-		<script>
+		});
+		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;
-			console.log(JSON.stringify(APPENV, null, 4));
-			let store = restaf.initStore({
-				casProxy: true,
-				options: {
-					proxyServer: APPENV.PROXYSERVER,
-				}
-			});
-			debugger;	console.log(store.config);
+			document.getElementById('output').innerHTML = '...initializing';
 
-			let session = null;
-			let servers = null;
-			let services = null;
-			let files = null;
-			let reports = null;
-			let compute = null;
+			initSession()
+				.then(r => {
+					document.getElementById('output').innerHTML = 'ready';
+					keepAlive();
+				})
+				.catch(e => {
 
-			function setup() {
-				debugger;
-				document.getElementById('output').innerHTML = '...initializing';
-				
-				initSession()
-					.then(r => {
-						document.getElementById('output').innerHTML = 'ready';
-						keepAlive();
-					})
-					.catch(e => {
-						
-						console.log(e);
-					});
-			}
-			function keepAlive() {
-				if (LOGONPAYLOAD.keepAlive != null) {
-					let interval = 120;
-					let timeout = 14400;
-					if (LOGONPAYLOAD.timers != null) {
-						let opts = LOGONPAYLOAD.timers.split(',');
-						interval = parseInt(opts[ 0 ]);
-						timeout = parseInt(opts[ 1 ]);
-					}
-					console.log(`Keepalive is active`);
-					store.keepViyaAlive(LOGONPAYLOAD.keepAlive, interval, timeout, () => {
-						console.log('timed out at', Date());
-						let params = `scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=0,height=0,left=-1000,top=-1000`;
-						window.open(`${appOptions.logonPayload.host}/SASLogon/timedout`, 'Timed Out', params);
-						return true;
-					});
+					console.log(e);
+				});
+		}
+		function keepAlive() {
+			if (LOGONPAYLOAD.keepAlive != null) {
+				let interval = 120;
+				let timeout = 14400;
+				if (LOGONPAYLOAD.timers != null) {
+					let opts = LOGONPAYLOAD.timers.split(',');
+					interval = parseInt(opts[0]);
+					timeout = parseInt(opts[1]);
 				}
-
+				console.log(`Keepalive is active`);
+				store.keepViyaAlive(LOGONPAYLOAD.keepAlive, interval, timeout, () => {
+					console.log('timed out at', Date());
+					let params = `scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=0,height=0,left=-1000,top=-1000`;
+					window.open(`${appOptions.logonPayload.host}/SASLogon/timedout`, 'Timed Out', params);
+					return true;
+				});
 			}
-			function logoff() {
-				let url = `${window.location.protocol}//${window.location.host}/${LOGONPAYLOAD.appName}/logout?callbackUrl=onlogoff.html`;
-				window.location.replace(url);
 
-					
+		}
+		function logoff() {
+			let url = `${window.location.protocol}//${window.location.host}/${LOGONPAYLOAD.appName}/logout?callbackUrl=onlogoff.html`;
+			window.location.replace(url);
+
+
+		}
+		async function initSession() {
+			debugger;
+			console.log(APPENV);
+			console.log(LOGONPAYLOAD);
+			debugger;
+			if (LOGONPAYLOAD.host == null) {
+				return 'done';
 			}
-			async function initSession() {
-				
-				console.log(APPENV);
-				console.log(LOGONPAYLOAD);
-				debugger;
-				if (LOGONPAYLOAD.host == null) {
-					
-					return 'done';
-				}
+			try {
 				let msg = await store.logon(LOGONPAYLOAD);
 				console.log(store.connection());
 				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';
+			} catch (err) {
+				console.log('Error logging in', JSON.stringify(err, null, 4));
+				throw err;
 			}
-			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 'timedout': {
-						testcase = timedout;
-						break;
-					}
-					case 'redir': {
-						testcase= noaction;
-						
-						break;
-					}
-					case 'spre': {
-						testcase= spre;
-						
-						break;
-					}
-					default: {
-						testcase = SASfileService;
-						break;
-					}
+			let name = 'user';
+			
+
+			//document.getElementById('output').innerHTML = '...running';
+			return 'done';
+		}
+		function runit(type) {
+			let testcase;
+			switch (type) {
+				case 'files': {
+					testcase = SASfileService;
+					break;
 				}
+				case 'compute': {
+					testcase = dsCompute;
+					break;
+				}
+				case 'cas': {
+					testcase = runCas;
+					break;
+				}
+				case 'timedout': {
+					testcase = timedout;
+					break;
+				}
+				case 'redir': {
+					testcase = noaction;
 
-				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
+					break;
+				}
+				case 'spre': {
+					testcase = spre;
+
+					break;
+				}
+				default: {
+					testcase = SASfileService;
+					break;
 				}
-				let r = await store.request(p);
-				return r.data;
-			}
-			async function timedout(store) {
-				console.log('timed out at', Date() );
-				let params = `scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=0,height=0,left=-1000,top=-1000`;
-				window.open(`${LOGONPAYLOAD.host}/SASLogon/timedout`,'Timed Out', params);
-				return true;
 			}
-			async function runCas(store) {
-				debugger;
-				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();
+
+			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 timedout(store) {
+			console.log('timed out at', Date());
+			let params = `scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=0,height=0,left=-1000,top=-1000`;
+			window.open(`${LOGONPAYLOAD.host}/SASLogon/timedout`, 'Timed Out', params);
+			return true;
+		}
+		async function runCas(store) {
+			debugger;
+			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) {
+		async function SASfileService(store) {
+			debugger;
+			let content;
+			try {
 				debugger;
-				let content;
-				try {
-					debugger;
-				let {files} = await store.addServices('files');
+				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());
+				//	console.log(files.items().toJS());
 				let payload = {
 					data: { x: 1, y: 'This was saved earlier in the step' },
 					headers: { 'content-type': 'application/json' }
@@ -261,100 +250,102 @@
 				debugger;
 				console.log(JSON.stringify(newFile.links('content'), null, 4));
 				content = await store.apiCall(newFile.links('content'));
-				
-			} catch(err) {
+
+			} 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'));
+			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'));
+			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);
+			// 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 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);
+			// 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;
-					}
+			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('redir')">
-				Press to do some redirs
-			</button>
-			<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 />
-			<button onclick="runit('spre')">
-				REST call
-			</button>
-			<br />
-			<br />
-			<input id='filename'> </input>
-			<button onclick="runit('timedout')">
-				Press to test timedout
-			</button>
-			<br />
-			<br />
-			<button onclick="logoff()">
-				logoff
-			</button>
-			<br />
-		</div>
-		<div>
-			<pre id="output"></pre>
-		</div>
-	</body>
-</html>
+			return log === null ? status : log.items();
+		}
+	</script>
+</head>
+
+<body onload="setup()">
+	<h1 id="head">Hi</h1>
+	<div>
+		<button onclick="runit('redir')">
+			Press to do some redirs
+		</button>
+		<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 />
+		<button onclick="runit('spre')">
+			REST call
+		</button>
+		<br />
+		<br />
+		<input id='filename'> </input>
+		<button onclick="runit('timedout')">
+			Press to test timedout
+		</button>
+		<br />
+		<br />
+		<button onclick="logoff()">
+			logoff
+		</button>
+		<br />
+	</div>
+	<div>
+		<pre id="output"></pre>
+	</div>
+</body>
+
+</html>

package/public/indexProxy.html

@@ -31,8 +31,8 @@
 		></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@dev"></script>
-		<script src="https://unpkg.com/@sassoftware/restaflib@dev"></script>
+		<script src="https://unpkg.com/@sassoftware/restaf@alpha"></script>
+		<script src="https://unpkg.com/@sassoftware/restaflib@alpha"></script>
 		<script src="/appenv"></script>
 	
 		<style>

package/src/iService.js

@@ -196,7 +196,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 				});
 			}
 		}
-		hapiServer.log('Plugin', process.env.PLUGIN);
+		console.log('Plugin', process.env.PLUGIN);
 		
 		if (process.env.PLUGIN === 'hapi-swagger' && serverMode ==='api') {
 			let	swaggerOptions = {
@@ -259,27 +259,25 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 
 async function getCertificates () {
 
-	let tls = {};
-	debug2('TLS_CRT', process.env.TLS_CRT != null);
-	debug2('TLS_CREATE', process.env.TLS_CREATE != null);
-	if (process.env.TLS_CRT != null && process.env.TLS_CRT.length > 0) {
-		if (fs.existsSync(process.env.TLS_CRT) && fs.existsSync(process.env.TLS_KEY)) {
-			console.log('TLS_CRT and TLS_KEY exist');
-			tls.cert = fs.readFileSync(process.env.TLS_CRT);
-			tls.key = fs.readFileSync(process.env.TLS_KEY);
+	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;
 		}
-
-	} 
-	if (tls.cert == null && process.env.TLS_CREATE != null) {
-		/* unsigned certificate */
-		console.log('Creating selfsigned certificate');
-		debug2('TLS set: TLS_CREATE=', process.env.TLS_CREATE);
-		tls = await getTls();
+	} else {
+		console.log('No SSL certificates found, generating self-signed certificates');
+		options = await getTls();
+		options.rejectUnauthorized= false;
 	}
-	if (Object.keys(tls).length === 0){
-		console.log('Warning: The current host protocol is https: No TLS certificate information has been specified.');
-  }
-return tls;
+	return options;
 }
 
 async function getTls () {