@sassoftware/viya-serverjs 0.2.2 → 0.2.4

package/src/plugins/appCookie.js

@@ -18,7 +18,7 @@ module.exports = async function appCookie (server, options){
         redirectTo  : options.redirectTo,
         appendNext  : {name: 'next'},
         validateFunc: async (req, session) => {
-            server.log('Cookie validateFunc', `path - ${req.path}`);
+            debug('Cookie validateFunc', `path - ${req.path}`);
             
             if (session == null) {
                 console.log('session is null');
@@ -38,12 +38,12 @@ module.exports = async function appCookie (server, options){
             if (credentials == null) {
                 return {valid: false};
             }
-            server.log('Cookie validateFunc', sid);
+            debug('Cookie validateFunc', sid);
             return {valid: true, credentials: credentials};
         }
     };
     // console.log('cookie options', cookieOptions);
-    server.log('Cookie Options',cookieOptions);
+    debug('Cookie Options',cookieOptions);
     server.auth.strategy('session', 'cookie', cookieOptions);
 
 };

package/src/plugins/setDefaultRoutes.js

@@ -66,21 +66,11 @@ module.exports = function setDefaultRoutes(server, options) {
       : null;
   
   let defaultTable = [
-    {
-      method: ["GET"],
-      path: `/health`,
-      options: {
-        auth: false,
-        handler: async (req, h) => {
-          return h.response({ x: 1 }).code(200);
-        },
-      },
-    },
-
     {
       method: ["GET"],
       path: `${appName}/logon`,
       options: {
+        
         auth: (options.authFlow === "server") ? 
         { mode: "try",  strategy: "sas" } : null,
         //https://futurestud.io/tutorials/hapi-redirect-to-previous-page-after-login
@@ -88,7 +78,10 @@ module.exports = function setDefaultRoutes(server, options) {
         plugins: {
           "hapi-auth-cookie": { redirectTo: false },
         },
-        handler: logon,
+        handler: async (req,h) => {
+          debug('logonhandler', req.auth.credentials);
+          return await logon(req,h);
+        }
       },
     },
     {
@@ -151,7 +144,7 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `${appName}/appenv`,
       options: {
         auth: /*authDefault*/ false,
-        handler: (req, h) => {
+        handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
           if (options.userInfo != null) {
             let uappenv = options.userInfo("APPENV", options);
@@ -177,7 +170,7 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `/appenv`,
       options: {
         auth: /*authDefault*/ false,
-        handler: (req, h) => {
+        handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
           if (options.userInfo != null) {
             let uappenv = options.userInfo("APPENV", options);

package/src/plugins/setupAuth.js

@@ -20,6 +20,8 @@ let SASauth          = require('./SASauth');
 let appCookie        = require('./appCookie');
 let token            = require('./token');
 let setDefaultRoutes = require('./setDefaultRoutes');
+let log		 = require('debug')('auth');
+
 
 /** Notes:
  * If api then register sasAuth and token - no cookies
@@ -37,7 +39,7 @@ async function setupAuth (server, options){
 			await server.register({ plugin: token });
 			def = 'token';
 		}
-		server.log('***********************Default auth', def);
+		log('***********************Default auth', def);
 		server.auth.default(def);
 		// console.log(server.registerations);
 	}

package/{packages/examples/app/certs/tls.sh → tls/viyatls.sh}

@@ -1,5 +1,3 @@
 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

package/packages/core/config.js

@@ -1,86 +0,0 @@
-/*
- *  ------------------------------------------------------------------------------------
- *  * 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.
- * ----------------------------------------------------------------------------------------
- *
- */
-
-'use strict';
-
-let fs = require('fs');
-import parseDocker from './parseDocker';
-import debug from 'debug';
-let configDebug = debug('config');
-
-function config(appEnv, dockerFile) {
-
-
-	if (dockerFile != null) {
-		parseDocker(dockerFile);
-	}
-
-	if (appEnv != null) {
-		iconfig(appEnv);
-	}
-
-
-	// Final patching
-	if (process.env.APPPORT == null && process.env.EXPOSEDPORT != null) {
-		process.env.APPPORT = process.env.EXPOSEDPORT;
-		console.log(`APPPORT set to value of exposed port ${process.env.APPPORT}`);
-	}
-
-
-	if (process.env.PORT != null && process.env.APPPORT == null) {
-		process.env.APPPORT = process.env.PORT;
-		console.log(`APPPORT overriden by PORT ${process.env.PORT}`);
-	}
-	if (process.env.APPLOC == null) {
-		process.env.APPLOC = './public';
-	}
-	if (process.env.APPENTRY == null) {
-		process.env.APPENTRY = 'index.html';
-	}
-
-	console.log('VIYA_SERVER is: ', process.env.VIYA_SERVER);
-	
-}
-
-
-function iconfig (appEnv) {
-	try {
-		let data = fs.readFileSync(appEnv, 'utf8');
-		let d = data.split(/\r?\n/);
-		d.forEach(l => {
-			if (l.length > 0 && l.indexOf('#') === -1) {
-				let la = l.split('=');
-				let envName = la[0];
-				if (la.length === 2 && la[1].length > 0) {
-					let t = la[1].trim();
-					process.env[envName] = t;
-				} 
-				configDebug(la[ 1 ]);
-			}
-		});
-
-	} catch (err) {
-		console.log(err);
-		process.exit(0);
-	}
-}
-
-
-
-
-export default config;

package/packages/core/handlers/appCallback.js

@@ -1,40 +0,0 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-"use strict";
-
-import codeAuth from "./codeAuth";
-
-// handle all callback
-let debug = require("debug")("callback");
-
-async function appCallback (req, h) {
-  debug("in callback");
-  debug(`AUTHFLOW: ${process.env.AUTHFLOW}`);
-  if (process.env.AUTHFLOW === "server") {
-    return codeAuth(req, h);
-  } else {
-    let indexHTML = "index.html";
-    console.log(`REDIRECT_ENTRY: ${process.env.REDIRECT_ENTRY}`)
-    if (process.env.REDIRECT_ENTRY != null) {
-      indexHTML = process.env.REDIRECT_ENTRY;
-      console.log(`----Redirecting to ${indexHTML}`);
-
-    }
-    /*
-    if (process.entry != null) {
-      indexHTML =
-        process.entry.REDIRECT_ENTRY != null
-          ? process.entry.REDIRECT_ENTRY
-          : process.env.APPENTRY == null
-          ? "index.html"
-          : process.env.APPENTRY;
-    }
-          */
-    console.log(`Redirecting to default ${indexHTML}`);
-    return h.file(`${indexHTML}`);
-  }
-}
-
-export default appCallback;

package/packages/core/handlers/codeAuth.js

@@ -1,31 +0,0 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-'use strict';
-
-import setCookies from './setCookies';
-let debug = require('debug')('codeauth');
-async function codeAuth (req, h, options) {  
-	debug('in codeauth');
-	await setCookies(req, h, options);
-	debug(options);
-	let indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
-	if (process.env.REDIRECT != null) {
-		debug('using REDIRECT env variable', process.env.REDIRECT);
-		indexHTML = process.env.REDIRECT;
-	}
-	debug('..................', indexHTML);
-	if (indexHTML.indexOf('/') === 0) {
-		// added to support create-react-restaf-viya-app cli
-		if (indexHTML !== '/develop') {
-			indexHTML = `/${process.env.APPNAME}${indexHTML}`;
-		}
-		console.log(`Redirecting to ${indexHTML}`);
-		return h.redirect(indexHTML);
-	} else {
-		console.log(`Visiting ${indexHTML}`);
-		return h.file(indexHTML);
-	};
-}
-export default codeAuth;

package/packages/core/handlers/decodeJwt.js

@@ -1,11 +0,0 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-
- import jwtDecode from 'jwt-decode';
- function decodeJwt (token) {
-		let jwt = jwtDecode(token);
-		return jwt;
- }
- export default decodeJwt;

package/packages/core/handlers/favicon.js

@@ -1,24 +0,0 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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.
- * ---------------------------------------------------------------------------------------
- *
- */
-'use strict';
-
-async function favicon (req, h) {
-    return h.file(`favicon.ico`);
-}
-
-export default favicon;

package/packages/core/handlers/getApp.js

@@ -1,41 +0,0 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import codeAuth from './codeAuth';
-
-let debug = require('debug')('getapp');
-
-async function getApp (options, req, h) {
-    if (process.env.AUTHFLOW === 'implicit') {
-        let x = `${process.env.VIYA_SERVER}/SASLogon/oauth/authorize?response_type=token&client_id=${process.env.CLIENTID}`;
-        let redirect = `${process.env.APPNAME}/callback`;
-        let redirectUri;
-        if (process.env.REDIRECT != null) {
-            redirect = process.env.REDIRECT.trim();
-            if (redirect.indexOf('http') === -1) {
-                redirect = `${process.env.APPNAME}/${redirect}`;
-                let protocol = process.env.HTTPS === 'true' ? 'https://' : 'http://';
-                redirectUri = `${protocol}${process.env.APPHOST}:${process.env.APPPORT}/${redirect}?host=${process.env.VIYA_SERVER}`;
-            } else {
-                redirectUri = `${redirect}?host=${process.env.VIYA_SERVER}`;
-            }
-        }
-        debug(process.env.REDIRECT);
-        let url = `${x}&redirect_uri=${redirectUri}`;
-        debug(url);
-        return h.redirect(url);
-    } else if (process.env.AUTHFLOW === 'server') {
-        
-        debug('calling codeauth');
-        return codeAuth(req, h, options);
-
-    } else {
-        debug('default getapp');
-        let indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
-        console.log(`Redirecting to default ${indexHTML}`);
-        return h.file(indexHTML);
-    }
-	
-}
-export default getApp;

package/packages/core/handlers/getApp2.js

@@ -1,26 +0,0 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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.
- * ---------------------------------------------------------------------------------------
- *
- */
-'use strict';
-let debug = require('debug')('getapp2'); 
-async function getApp2 (req, h) {
-    debug('in getApp2');
-    debug(req.params);
-    return h.file(`${req.params.param}`);
-}
-
-export default getApp2;

package/packages/core/handlers/getUser.js

@@ -1,20 +0,0 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-'use strict';
-let debug = require('debug')('user');
-async function getUser (req, h) {
-      
-    debug(req.state);
-    let name = 'SAS User';
-    if (req.state.ocookie != null) {
-        let sid = req.state.ocookie.sid;
-        debug(sid);
-        let credentials = await req.server.app.cache.get(sid);
-        name = credentials.user_name;
-    }
-    debug(name);
-    return `let USER_NAME='${name}'`;
-}
-export default getUser;

package/packages/core/handlers/index.js

@@ -1,36 +0,0 @@
-/*
-* Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
-* SPDX-License-Identifier: Apache-2.0
-*/
-'use strict';
-import getApp from './getApp';
-import getApp2 from './getApp2';
-import favicon from './favicon';
-import appCallback from './appCallback';
-import logon       from './logon';
-import keepAlive from './keepAlive';
-import keepAlive2 from './keepAlive2';
-import logout      from './logout';
-import getUser from './getUser';
-import setupUserRoutes from '../plugins/setupUserRoutes';
-import reactDev from './reactDev';
-import proxyMapUri from './proxyMapUri';
-import proxyOnResponse from './proxyOnResponse';
-
-export {
-    getApp,
-    getApp2,
-    favicon,
-    keepAlive,
-    keepAlive2,
-    appCallback,
-    logon,
-    logout,
-    getUser,
-    setupUserRoutes,
-    reactDev,
-    proxyMapUri,
-    proxyOnResponse
-};
-
-

package/packages/core/handlers/keepAlive.js

@@ -1,54 +0,0 @@
-/*
-* 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/packages/core/handlers/keepAlive2.js

@@ -1,13 +0,0 @@
-/*
-* 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/packages/core/handlers/logon.js

@@ -1,24 +0,0 @@
-/*
-* 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');
-   req.log('in logon');
-   
-   let r = await setCookies(req, h, null);
-   debug(r.redirect);
-   req.log('in logon after setcookie', r.redirect);
-   return h.redirect(r.redirect);
-}
-
-
-
-
-
-
-export default logon;

package/packages/core/handlers/logout.js

@@ -1,43 +0,0 @@
-/*
-* 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/packages/core/handlers/proxyMapUri.js

@@ -1,53 +0,0 @@
-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;
-  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;
-
-/*
-let qsstring = req.raw.search;
-  console.log('qsstring=', qsstring);
-  let query = req.query;
-  let newQuery = null;
- 
-  if (query != null) {
-    console.log('query=', query);
-    newQuery = {};
-    for (let key in query) {
-      let value = query[key];
-      if (value === 'true' || value === 'false') {
-        value = value === 'true';
-      }
-      newQuery[key] = value;
-      }
-      console.log('newQuery=', newQuery);
-    }
-  console.log(req.URLSearchParams);
-  let uri = path + '/' + params.param;
-  if (newQuery != null) {
-    uri = `${uri}?${new URLSearchParams(newQuery)}`;
-  }
- console.log('req.url', req.url); 
- console.log('req.url', req.url.search);
- console.log('uri=', req.uri);
- console.log('path=', req.path);
-*/

package/packages/core/handlers/proxyOnResponse.js

@@ -1,12 +0,0 @@
-
-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/packages/core/handlers/reactDev.js

@@ -1,30 +0,0 @@
-/*
- * ------------------------------------------------------------------------------------
- *   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;