npm - @sassoftware/viya-serverjs - Versions diffs - 0.5.1 → 0.5.3 - Mend

@sassoftware/viya-serverjs 0.5.1 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

package/.env +6 -5
package/.env.server +28 -17
package/Dockerfile +1 -1
package/lib/handlers/codeAuth.js +9 -11
package/lib/handlers/logon.js +2 -1
package/lib/handlers/setCookies.js +11 -15
package/lib/iService.js +38 -22
package/lib/plugins/setContext.js +1 -0
package/lib/plugins/setDefaultRoutes.js +48 -32
package/lib/plugins/setupUserRoutes.js +3 -11
package/package.json +4 -5
package/public/auth.html +24 -0
package/public/help.html +1 -1
package/server.js +6 -5
package/src/handlers/codeAuth.js +10 -10
package/src/handlers/logon.js +2 -1
package/src/handlers/setCookies.js +6 -5
package/src/iService.js +143 -121
package/src/plugins/setContext.js +2 -1
package/src/plugins/setDefaultRoutes.js +11 -7
package/testca.js +10 -0
package/public/indexProxy.html +0 -351
package/public/simplesubmit.html +0 -233

package/public/indexProxy.html DELETED Viewed

@@ -1,351 +0,0 @@
-<!DOCTYPE html>
-<!--
-  ~ /* ------------------------------------------------------------------------------------
-  ~  * Copyright (c) SAS Institute Inc.
-  ~  *  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  * you may not use this file except in compliance with the License.
-  ~  * You may obtain a copy of the License at
-  ~  *
-  ~  * http://www.apache.org/licenses/LICENSE-2.0
-  ~  *
-  ~  *  Unless required by applicable law or agreed to in writing, software
-  ~  * distributed under the License is distributed on an "AS IS" BASIS,
-  ~  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  * See the License for the specific language governing permissions and
-  ~ * limitations under the License.
-  ~ ----------------------------------------------------------------------------------------*/
-  ~
-  -->
-<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@alpha"></script>
-		<script src="https://unpkg.com/@sassoftware/restaflib@alpha"></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;
-			let store = restaf.initStore({
-				casProxy: true,
-				options: {
-					proxyServer: APPENV.PROXYSERVER,
-				}
-			});
-			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);
-					});
-			}
-			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);
-			}
-			async function initSession() {
-				console.log(APPENV);
-				console.log(LOGONPAYLOAD);
-				debugger;
-				LOGONPAYLOAD.host = 'https://localhost:8080';
-				let msg = await store.logon(LOGONPAYLOAD);
-				console.log(msg);
-				/*
-				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 'timedout': {
-						testcase = timedout;
-						break;
-					}
-					case 'redir': {
-						testcase= noaction;
-						break;
-					}
-					case 'spre': {
-						testcase= spre;
-						break;
-					}
-					case 'proxy': {
-						testcase= testproxy;
-						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 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) {
-				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;
-				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);
-				let content = await store.apiCall(newFile.links('content'));
-			} catch(err) {
-				console.log(err);
-				debugger;
-			}
-				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('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/simplesubmit.html DELETED Viewed

@@ -1,233 +0,0 @@
-<!DOCTYPE html>
-<!--
-  ~ /* ------------------------------------------------------------------------------------
-  ~  * Copyright (c) SAS Institute Inc.
-  ~  *  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  * you may not use this file except in compliance with the License.
-  ~  * You may obtain a copy of the License at
-  ~  *
-  ~  * http://www.apache.org/licenses/LICENSE-2.0
-  ~  *
-  ~  *  Unless required by applicable law or agreed to in writing, software
-  ~  * distributed under the License is distributed on an "AS IS" BASIS,
-  ~  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  * See the License for the specific language governing permissions and
-  ~ * limitations under the License.
-  ~ ----------------------------------------------------------------------------------------*/
-  ~
-  -->
-<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"></script>
-	<script src="https://unpkg.com/@sassoftware/restaflib@5.2.4"></script>
-	<script src="/appenv"></script>
-	<style>
-		.body {
-			overflow: hidden;
-		}
-		.container {
-			display: flex;
-			flex-direction: row;
-			flex-wrap: nowrap;
-			min-height: 800px;
-			max-height: 80vh;
-		}
-		.elabel {
-			display: inline-block;
-			clear: left;
-			width: 250px;
-			text-align: right;
-		}
-		.einput {
-			display: inline-block;
-		}
-		.child {
-			flex: 1;
-			border: 1px solid black;
-			margin: 5px;
-			padding: 5px;
-			overflow: auto;
-		}
-		.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
-			}
-		});
-		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('ods').innerHTML = 'waiting...';
-			document.getElementById('log').innerHTML = 'waiting...';
-			initSession()
-				.then(r => {
-					document.getElementById('ods').innerHTML = 'ready';
-		    		document.getElementById('log').innerHTML = 'ready';
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		}
-		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';
-			}
-			try {
-				let msg = await store.logon(LOGONPAYLOAD);
-				debugger;
-			} catch (err) {
-				console.log('Error logging in', JSON.stringify(err, null, 4));
-				throw err;
-			}
-			let name = 'user';
-			document.getElementById('ods').innerHTML = `Creating SAS session...`;
-			session = await restaflib.computeSetup(store, null, null);
-			document.getElementById('ods').innerHTML = `Ready`;
-			//document.getElementById('output').innerHTML = '...running';
-			return 'done';
-		}
-		function runit(type) {
-			dsCompute(store)
-				.then(r => {
-					document.getElementById('ods').innerHTML = r.ods;
-					document.getElementById('log').innerHTML = r.log;
-				})
-				.catch(err => {
-					document.getElementById('ods').innerHTML = '<pre>' + err + '</pre>';
-				});
-		}
-		async function dsCompute(store) {
-			//let { computeResults, computeFetchData, computeRun } = restaflib
-			debugger;
-			let lib = document.getElementById('lib').value;
-			let name = document.getElementById('name').value;
-			let macros = { lib, name };
-			let src = `ods html; proc print data=&lib..&name.; run; ods html close;`
-			try {
-				let computeSummary = await restaflib.computeRun(
-					store,
-					session,
-					src,
-					macros
-				);
-				debugger;
-				let jobStatus = computeSummary.SASJobStatus;
-				let result = {};
-				if (jobStatus === 'failed' || jobStatus === 'error' || jobStatus === 'running') {
-					let msg = `Job  ended with status of ${jobStatus}. Please check the log for errors.`;
-					result.log = await restflib.computeResults(store, computeSummary, 'log');
-					return  result;
-				}
-				let log = await restaflib.computeResults(store, computeSummary, 'log');
-				let logText = '';
-				// eslint-disable-next-line array-callback-return
-				log.map((data) => {
-					let line = data.line.replace(/(\r\n|\n|\r)/gm, "");
-					if (line.length === 0) {
-						logText = logText + '\n';
-					} else { }
-					logText = logText + line + '\n';
-				});
-				result.log = logText;
-				result.ods = await restaflib.computeResults(store, computeSummary, 'ods');
-				let odsUrl = computeSummary.ods.get('link').get('uri');
-				let connection = store.connection();
-				let host = (connection.options.proxyServer == null) ? LOGONPAYLOAD.host : connection.options.proxyServer;
-				result.odsurl = `${host}${odsUrl}`;
-				return result;
-			} catch (err) {
-				debugger;
-				console.log(JSON.stringify(err, null, 4));
-				return JSON.stringify(err, null, 4);
-			}
-		}
-	</script>
-</head>
-<body onload="setup()">
-	<h1 id="head">Submit SAS code</h1>
-	<div>
-		<label class="elabel" for="lib">Library: </label>
-		<input id='lib'> </input>
-		<br />
-		<br />
-		<label class="elabel" for="name">Name: </label>
-		<input id='name'> </input>
-		<br />
-		</br />
-	</div>
-	<button onclick="runit('compute')">
-		Submit
-	</button>
-	<br />
-	<br />
-	</div>
-	<div class="container">
-		<div class="child">
-			<pre id="ods"></pre>
-		</div>
-		<div class="child">
-			<pre id="log"></pre>
-		</div>
-</body>
-</html>