@sassoftware/viya-serverjs 0.3.0 → 0.4.0

package/src/handlers/keepAlive.js

@@ -1,54 +1,54 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-'use strict';
-
-import axios from 'axios';
-let Boom = require('@hapi/boom');
-let debug= require('debug')('keepAlive');
-
-// primarly to do a keepAlive of sasLogon
-let qs = require('qs');
-async function keepAlive (req, h) {
-       refreshToken(req, h);
-       let SASLogon = `${process.env.VIYA_SERVER}/SASLogon/`;
-       return h.redirect(SASLogon).code(302);
-}
-// let SASLogon = `${process.env.VIYA_SERVER}/SASLogon/oauth/authorize?client_id=${process.env.CLIENTID}&redirect_uri=${process.env.APPSERVER}/keepAlive2&response_type=code`;
- 
-async function refreshToken (req, h) {
-    let credentials = req.auth.credentials;
-    debug('refreshToken', credentials);
-    let sid = credentials.sid;
-    let config = {
-        url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
-        method: 'POST',
-
-        headers: {
-            'Accept'      : 'application/json',
-            'Content-Type': 'application/x-www-form-urlencoded',
-        },
-        data: qs.stringify({
-            grant_type   : 'refresh_token',
-            refresh_token: credentials.refreshToken,
-            client_id    : process.env.CLIENTID,
-            client_secret: process.env.CLIENTSECRET
-        })
-    };
-    try {
-       let r = await axios(config);
-       let newcred = {...credentials};
-       newcred.token        = r.data.access_token;
-       newcred.refreshToken = r.data.refresh_token;
-       debug('newcred', newcred);
-       await req.server.app.cache.set(sid, credentials);
-       return credentials;
-       }
-    catch(err) {
-        let error = Boom.badRequest('Unable to refresh tokens in KeepAlive', JSON.stringify(err, null,4));
-		throw error;
-    }
-
-}
+/*
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+'use strict';
+
+import axios from 'axios';
+let Boom = require('@hapi/boom');
+let debug= require('debug')('keepAlive');
+
+// primarly to do a keepAlive of sasLogon
+let qs = require('qs');
+async function keepAlive (req, h) {
+       refreshToken(req, h);
+       let SASLogon = `${process.env.VIYA_SERVER}/SASLogon/`;
+       return h.redirect(SASLogon).code(302);
+}
+// let SASLogon = `${process.env.VIYA_SERVER}/SASLogon/oauth/authorize?client_id=${process.env.CLIENTID}&redirect_uri=${process.env.APPSERVER}/keepAlive2&response_type=code`;
+ 
+async function refreshToken (req, h) {
+    let credentials = req.auth.credentials;
+    debug('refreshToken', credentials);
+    let sid = credentials.sid;
+    let config = {
+        url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
+        method: 'POST',
+
+        headers: {
+            'Accept'      : 'application/json',
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        data: qs.stringify({
+            grant_type   : 'refresh_token',
+            refresh_token: credentials.refreshToken,
+            client_id    : process.env.CLIENTID,
+            client_secret: process.env.CLIENTSECRET
+        })
+    };
+    try {
+       let r = await axios(config);
+       let newcred = {...credentials};
+       newcred.token        = r.data.access_token;
+       newcred.refreshToken = r.data.refresh_token;
+       debug('newcred', newcred);
+       await req.server.app.cache.set(sid, credentials);
+       return credentials;
+       }
+    catch(err) {
+        let error = Boom.badRequest('Unable to refresh tokens in KeepAlive', JSON.stringify(err, null,4));
+		throw error;
+    }
+
+}
 export default keepAlive;

package/src/handlers/keepAlive2.js

@@ -1,13 +1,13 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-'use strict';
-
-// primarly to do a keepAlive of sasLogon
-
-async function keepAlive2 (req, h) {
-   
-   return '<h2> Token refresh failed. Contact you admin </h2>';
-}
+/*
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+'use strict';
+
+// primarly to do a keepAlive of sasLogon
+
+async function keepAlive2 (req, h) {
+   
+   return '<h2> Token refresh failed. Contact you admin </h2>';
+}
 export default keepAlive2;

package/src/handlers/logon.js

@@ -1,24 +1,24 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-
-import setCookies from './setCookies';
-let debug = require('debug')('logon');
-async function logon (req, h) {
-   debugger;
-   debug('.................................................in logon');
-   
-   
-   let r = await setCookies(req, h, null);
-   debug(r.redirect);
-   debug('in logon after setcookie', r.redirect);
-   return h.redirect(r.redirect);
-}
-
-
-
-
-
-
+/*
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+
+import setCookies from './setCookies';
+let debug = require('debug')('logon');
+async function logon (req, h) {
+   debugger;
+   debug('.................................................in logon');
+   
+   
+   let r = await setCookies(req, h, null);
+   debug(r.redirect);
+   debug('in logon after setcookie', r.redirect);
+   return h.redirect(r.redirect);
+}
+
+
+
+
+
+
 export default logon;

package/src/handlers/logout.js

@@ -1,43 +1,43 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-'use strict';
-
-import axios from 'axios';
-
-let debug = require('debug')('logout');
-
-async function logout (req, h) {
-    let q = req.query;
-    debug(req.state);
-
-    let hh = req.server.info.uri.replace(/0.0.0.0/, 'localhost');
-	let callbackUrl = `${hh}/${process.env.APPNAME}`;
-	if (q.callbackUrl != null) {
-		callbackUrl = `${callbackUrl}/${q.callbackUrl}`;
-    };
-    
-	let url = `${process.env.VIYA_SERVER}/SASLogon/logout.do?callbackUrl=${callbackUrl}`;
-	if (process.env.AUTHFLOW === 'server') {
-		if (req.state.ocookie != null) {
-			let sid = req.state.ocookie.sid;
-			  
-			await req.server.app.cache.del(sid);
-		} else {
-			console.log('Warning: No cookie returned by the browser');
-		}
-    } 
-    return h.redirect(url).unstate('ocookie');
-}
-// eslint-disable-next-line no-unused-vars
-async function ViyaLogout () {
-    let p = {
-        method: 'GET',
-        url   : `${process.env.VIYA_SERVER}/SASLogon/logout`
-    };
-
-    let r = await axios(p);
-    debug(r);
-}
+/*
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+'use strict';
+
+import axios from 'axios';
+
+let debug = require('debug')('logout');
+
+async function logout (req, h) {
+    let q = req.query;
+    debug(req.state);
+
+    let hh = req.server.info.uri.replace(/0.0.0.0/, 'localhost');
+	let callbackUrl = `${hh}/${process.env.APPNAME}`;
+	if (q.callbackUrl != null) {
+		callbackUrl = `${callbackUrl}/${q.callbackUrl}`;
+    };
+    
+	let url = `${process.env.VIYA_SERVER}/SASLogon/logout.do?callbackUrl=${callbackUrl}`;
+	if (process.env.AUTHFLOW === 'server') {
+		if (req.state.ocookie != null) {
+			let sid = req.state.ocookie.sid;
+			  
+			await req.server.app.cache.del(sid);
+		} else {
+			console.log('Warning: No cookie returned by the browser');
+		}
+    } 
+    return h.redirect(url).unstate('ocookie');
+}
+// eslint-disable-next-line no-unused-vars
+async function ViyaLogout () {
+    let p = {
+        method: 'GET',
+        url   : `${process.env.VIYA_SERVER}/SASLogon/logout`
+    };
+
+    let r = await axios(p);
+    debug(r);
+}
 export default logout;

package/src/handlers/proxyMapUri.js

@@ -1,25 +1,25 @@
-async function proxyMapUri (req) {
-  let credentials = req.auth.credentials;
-  console.log('------------------------------------------');
-  if (credentials != null) {
-    let sid = credentials.sid;
-    console.log('sid=', sid);
-  }
- 
- // 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);
-  let search = req.url.search;
-  console.log('query=', search);
-  let uri = path + '/' + params.param;
-  if (search != null && search.trim().length > 0) {
-    uri = uri + search;
-  } 
-  console.log('destination= ',uri);
-  return {
-    uri: uri
-  };
-  }
-export default proxyMapUri;
+async function proxyMapUri (req) {
+  let credentials = req.auth.credentials;
+  console.log('------------------------------------------');
+  if (credentials != null) {
+    let sid = credentials.sid;
+    console.log('sid=', sid);
+  }
+
+  
+  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);
+  let search = req.url.search;
+  console.log('query=', search);
+  let uri = path + '/' + params.param;
+  if (search != null && search.trim().length > 0) {
+    uri = uri + search;
+  } 
+  console.log('destination= ',uri);
+  return {
+    uri: uri
+  };
+  }
+export default proxyMapUri;

package/src/handlers/proxyOnResponse.js

@@ -1,12 +1,12 @@
-
-async function proxyOnResponse (err, res, request, h, settings, ttl) {
-    /*
-    console.log('receiving the response from the upstream.');
-    const payload = await Wreck.read(res, { json: true });
-    console.log('some payload manipulation if you want to.');
-    const response = h.response(payload);
-    response.headers = res.headers;
-    return response;
-    */
-}
+
+async function proxyOnResponse (err, res, request, h, settings, ttl) {
+    /*
+    console.log('receiving the response from the upstream.');
+    const payload = await Wreck.read(res, { json: true });
+    console.log('some payload manipulation if you want to.');
+    const response = h.response(payload);
+    response.headers = res.headers;
+    return response;
+    */
+}
 export default proxyOnResponse;

package/src/handlers/reactDev.js

@@ -1,30 +1,30 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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.
- * ---------------------------------------------------------------------------------------
- *
- */
-let spawn = require('cross-spawn');
-async function reactDev (req, h) {
-    console.log('Spawning the dev server');
-    spawn('yarn', ['start'], { stdio: 'inherit' });
-    let h2 = '<h2>Viya Server: ' + process.env.VIYA_SERVER + '<h2>';
-    return (
-        h2 +
-        '<h3>Your session is authenticated</h3>' +
-        '<h3>Your application is starting in another tab </h3>' +
-        '<h4> HMR is active</h4>'
-    );
-}
+/*
+ * ------------------------------------------------------------------------------------
+ *   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.
+ * ---------------------------------------------------------------------------------------
+ *
+ */
+let spawn = require('cross-spawn');
+async function reactDev (req, h) {
+    console.log('Spawning the dev server');
+    spawn('yarn', ['start'], { stdio: 'inherit' });
+    let h2 = '<h2>Viya Server: ' + process.env.VIYA_SERVER + '<h2>';
+    return (
+        h2 +
+        '<h3>Your session is authenticated</h3>' +
+        '<h3>Your application is starting in another tab </h3>' +
+        '<h4> HMR is active</h4>'
+    );
+}
 export default reactDev;

package/src/handlers/setCookies.js

@@ -1,80 +1,82 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-let uuid      = require('uuid');
-let debug = require('debug')('setcookies');
-
-async function setCookies (req, h, options) {
-    let credentials = req.auth.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 };
-    }
-        
-    // create a cookie(sid) and save credentials in cache
-    const sid = uuid.v4();
-    credentials.sid = sid;
-    if (options != null) {
-        options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
-        options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-        debug(options.allAppEnv.LOGONPAYLOAD);
-    }
-    
-    
-    await req.server.app.cache.set(sid, credentials, 0);
-    // Can we get away without setting cookie for this session?
-    // Need to also modify keepAlive
-    if (process.env.COOKIES !== 'NO') {
-        debugger;
-        req.cookieAuth.set({ sid });
-    };
-    debug('credentials query', credentials.query);
-    let redirect = (credentials.query != null && credentials.query.next != null) ? credentials.query.next : null;
-    debug('setcookie-redirect', redirect);
-    return { status: true, error: null , redirect: redirect};
-}
-
-export default setCookies;
-
-/* 
- save for future reference - not used at this time
-async function getCredentials (req) {
-    let route = process.env.REDIRECT == null ? `/callback` : '/' + process.env.REDIRECT;
-    let info = req.server.info;
-    let location = info.uri + route;
-    if (info.host === '0.0.0.0') {
-        location = `${info.protocol}://${process.env.APPHOST}:${info.port}${route}`;
-    };
-
-    let payload = {
-		url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
-		method: 'POST',
-
-		headers: {
-			// 'Authorization': 'Basic ' + Buffer.from(`${process.env.CLIENTID}:${process.env.CLIENTSECRET}`).toString('base64'),
-			'Accept'      : 'application/json',
-			'Content-Type': 'application/x-www-form-urlencoded'
-		},
-        data: qs.stringify({
-            client_id    : `${process.env.CLIENTID}`,
-            client_secret: `${process.env.CLIENTSECRET}`,
-            redirect_uri : `${location}`,
-
-			'grant_type': 'authorization_code',
-			code        : req.query.code
-		})
-	};
-    try {
-        let r = await axios(payload);
-        return r.data;
-    } catch (err) {
-        console.log(err);
-
-    }
-}
+/*
+* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+let uuid      = require('uuid');
+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) {
+        debug('setcookie credentials', credentials);
+        debug('setcookie error', req.auth.error);
+        debug('logon failed');
+        return { status: false, error: req.auth.error };
+    }
+        
+    // create a cookie(sid) and save credentials in cache
+    const sid = uuid.v4();
+    credentials.sid = sid;
+    if (options != null) {
+        options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
+        options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
+        debug(options.allAppEnv.LOGONPAYLOAD);
+    }
+    
+    
+    await req.server.app.cache.set(sid, credentials, 0);
+    // Can we get away without setting cookie for this session?
+    // Need to also modify keepAlive
+    if (process.env.COOKIES !== 'NO') {
+        debugger;
+        req.cookieAuth.set({ sid });
+    };
+    debug('credentials query', credentials.query);
+    let redirect = (credentials.query != null && credentials.query.next != null) ? credentials.query.next : null;
+    debug('setcookie-redirect', redirect);
+    return { status: true, error: null , redirect: redirect};
+}
+
+export default setCookies;
+
+/* 
+ save for future reference - not used at this time
+async function getCredentials (req) {
+    let route = process.env.REDIRECT == null ? `/callback` : '/' + process.env.REDIRECT;
+    let info = req.server.info;
+    let location = info.uri + route;
+    if (info.host === '0.0.0.0') {
+        location = `${info.protocol}://${process.env.APPHOST}:${info.port}${route}`;
+    };
+
+    let payload = {
+		url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
+		method: 'POST',
+
+		headers: {
+			// 'Authorization': 'Basic ' + Buffer.from(`${process.env.CLIENTID}:${process.env.CLIENTSECRET}`).toString('base64'),
+			'Accept'      : 'application/json',
+			'Content-Type': 'application/x-www-form-urlencoded'
+		},
+        data: qs.stringify({
+            client_id    : `${process.env.CLIENTID}`,
+            client_secret: `${process.env.CLIENTSECRET}`,
+            redirect_uri : `${location}`,
+
+			'grant_type': 'authorization_code',
+			code        : req.query.code
+		})
+	};
+    try {
+        let r = await axios(payload);
+        return r.data;
+    } catch (err) {
+        console.log(err);
+
+    }
+}
 */