@sassoftware/viya-serverjs 0.6.1-2 → 0.6.1-5

package/src/handlers/codeAuth.js

@@ -4,12 +4,12 @@
  */
 'use strict';
 
-import setCookies from './setCookies';
+import setCookies from '../plugins/setCookies';
 let debug = require('debug')('codeauth');
 async function codeAuth (req, h, options) {  
-	debug('in codeauth');
+	debug('calling setCookies 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);

package/src/handlers/getApp.js

@@ -30,7 +30,6 @@ async function getApp (options, req, h) {
         
         debug('calling codeauth');
         let r = codeAuth(req, h, options);
-        debug(options.userCache);
         return r;
 
     } else {

package/src/handlers/logon.js

@@ -3,22 +3,17 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-import setCookies from './setCookies';
+// import setCookies from './setCookies';
+import codeAuth from './codeAuth.js';
 let debug = require('debug')('logon');
 async function logon (req, h, options) {
    debugger;
-   debug('.................................................in logon');
-   
-   
-   let r = await setCookies(req, h, options);
+     
+   debug('calling codeauth');
+   let r = codeAuth(req, h, options);
+   // r = await setCookies(req, h, options);
    debug(r.redirect);
-   debug('in logon after setcookie', r.redirect);
    return h.redirect(r.redirect);
 }
 
-
-
-
-
-
 export default logon;

package/src/handlers/proxyMapUri.js

@@ -2,6 +2,8 @@ let debug = require('debug')('proxyMapUri');
 async function proxyMapUri (req) {
   let credentials = req.auth.credentials;
   debug('------------------------------------------');
+  debug('serverstate', req.server.state  );
+  debug('state', req.state);
   if (credentials != null) {
     let sid = credentials.sid;
     debug('sid=', sid);

package/src/iService.js

@@ -112,10 +112,10 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		let hapiServer = Hapi.server(sConfig);
 
 		/*
-		const cache = hapiServer.cache({ segment: 'sessions', expiresIn: 3 * 24 * 60 * 60 * 1000 });
+		const cache = hapiServer.cache({ segment: 'sid', expiresIn: 3 * 24 * 60 * 60 * 1000 });
 		hapiServer.app.cache = cache;
-		*/
-
+*/
+		
 		let nodeCacheOptions = {
 			stdTTL        : 24*60*60*1000, 
 			checkPeriod   : 3600,
@@ -125,6 +125,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		};
 		let storeCache = new NodeCache(nodeCacheOptions);
 		hapiServer.app.cache = storeCache;
+		
 
 		// common plugins
 		let visionOptions = {
@@ -187,7 +188,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 				});
 			}
 		}
-		console.log('Plugin', process.env.PLUGIN);
+
 		
 		//
 		// Start server

package/src/plugins/SASauth.js

@@ -16,64 +16,69 @@
  *
  */
 
-
-let bell = require('@hapi/bell');
-let uuid = require('uuid');  
+let uuid = require('uuid');
 let debug = require('debug')('sasauth');
 
-exports.plugin = {
-    name    : 'SASauth',
-    version : '1.0.0',
-    register: iSASauth
-};
+async function SASauth(server, options) {
+  debug('in iSASauth');
+  debug('options', options);
 
-async function iSASauth (server, options) {
-    debug('in iSASauth');
-    debug('options', options);
-    let bellAuthOptions;
-    let provider;
-    // test for k8s deployment
-    let host = options.host + '/SASLogon';
-    
+  let provider;
+  // test for k8s deployment
+  let host = options.host + '/SASLogon';
+  if (options.ns != null) {
+    host = `https://sas-logon-app.${options.ns}.svc.cluster.local`;
+  } else if (options.nsHost != null) {
+    host = options.nsHost;
+  }
+  // ...
+  debug(host);
+  provider = {
+    name: 'sas',
+    protocol: 'oauth2',
+    useParamsAuth: false,
+    auth: host + '/oauth/authorize',
+    token: host + '/oauth/token',
 
-    if (options.ns != null) {
-        host = `https://sas-logon-app.${options.ns}.svc.cluster.local`;
-    } else if (options.nsHost != null) {
-        host = options.nsHost;
-    }
-    // ...
-    debug(host);
-    provider = {
-        name         : 'sas',
-        protocol     : 'oauth2',
-        useParamsAuth: false,
-        auth         : host + '/oauth/authorize',
-        token        : host + '/oauth/token',
+    profileMethod: 'get',
 
-        profileMethod: 'get',
-        
-        profile: async function (credentials, params, get) {  
-                     
-            server.log('SASAuth profile', credentials);
-            debug('credentials', credentials);
+    profile: async function (credentials, params, get) {
+      server.log('SASAuth profile', credentials);
+      debug('credentials', credentials);
+      debug('params', params);
+      credentials.profile = {
+        provider: 'sas',
+        id: 'sasuser',
+        displayName: 'SAS User',
+        email: 'sasuser@sas.com',
+        raw: {
+          id: 'sasuser',
+          displayName: 'SAS User',
+          emails: [
+            {
+              value: 'sasuser@sas.com'
+            }
+          ]
         }
-       
-        
-    };
-    
-    bellAuthOptions = {
-        provider    : provider,
-        password    : uuid.v4(),
-        clientId    : options.clientId,
-        clientSecret: options.clientSecret,
-        //   isSameSite  : options.isSameSite,
-        isSecure    : options.isSecure
-    };
-    // console.log('SASAuth options', bellAuthOptions);
-    debug('belloptions', bellAuthOptions);
-    server.log('SASAuth',bellAuthOptions);
-    await server.register(bell);
-    server.auth.strategy('sas', 'bell', bellAuthOptions);
-    
+      };
     }
-    
+
+
+  };
+
+  let bellAuthOptions = {
+    provider: provider,
+    password: uuid.v4(),
+    clientId: options.clientId,
+    clientSecret: options.clientSecret,
+    isSameSite  : options.isSameSite,
+    isSecure: options.isSecure
+  };
+
+  debug('belloptions', bellAuthOptions);
+
+  server.auth.strategy('sas', 'bell', bellAuthOptions);
+
+}
+
+export default SASauth;

package/src/plugins/appCookie.js

@@ -1,49 +1,35 @@
 
 let uuid = require('uuid');
-let debug = require('debug')('cookie');
+let debug = require('debug')('appcookie');
 
-module.exports = async function appCookie (server, options){
+async function appCookie(server, options) {
 
-    await server.register(require('@hapi/cookie'));
-    
-    debug('in appCookie');
-    debug(options.redirectTo);
-    let cookieOptions = {
-        cookie: {
-            name      : 'cookie',
-            password  : uuid.v4(),
-            isSecure  : options.isSecure,
-            isSameSite: options.isSameSite
-        },
-        redirectTo  : options.redirectTo,
-        appendNext  : {name: 'next'},
-        validate    : async (req, session) => {
-            debug('Cookie validateFunc', `path - ${req.path}`);
-            
-            if (session == null) {
-                console.log('session is null');
-                return {isValid: false};
-            }
-            let credentials = null;
-            let sid;
-            if (Array.isArray(session) === true && session.length > 0) {
-                sid = session[0].sid;
-            } else {
-                sid = session.sid;
-            }
-            if (sid != null) {
-                credentials = await req.server.app.cache.get(sid);
-             }
-             
-            if (credentials == null) {
-                return {isValid: false};
-            }
-            debug('Cookie validateFunc', sid);
-            return {isValid: true, credentials: credentials};
-        }
-    };
-    // console.log('cookie options', cookieOptions);
-    debug('Cookie Options',cookieOptions);
-    server.auth.strategy('session', 'cookie', cookieOptions);
+  debug('in appCookie');
+  debug(options.redirectTo);
+  let cookieOptions = {
+    cookie: {
+      name: 'session',
+      password: uuid.v4(),
+      isSecure: options.isSecure,
+      isSameSite: options.isSameSite
+    },
+    redirectTo: options.redirectTo,
+    appendNext: { name: 'next' },
+    validate: async (req, session) => {
+      debug('validating cookie session', session);
+      if (!session) {
+        return { isValid: false };
+      }
+      return {
+        isValid: true,
+        credentials: session      // becomes request.auth.credentials
+      };
+    }
+  };
+  debug('session cookie options', cookieOptions);
+
+  server.auth.strategy('session', 'cookie', cookieOptions);
+  server.auth.default('session');
 
 };
+export default appCookie;

package/src/plugins/setContext.js

@@ -16,20 +16,31 @@
  *
  */
 
-let debug = require('debug')('context');
-async function setContext (req,h){
-   let credentials = req.auth.credentials
-   debug(credentials);
-   let context = {
-        path   : req.path,
-        params : req.params,
-        query  : req.query,
+
+let debug = require('debug')('setcontext');
+async function setContext(req, h) {
+    let credentials = req.auth.credentials; 
+    let cachedCredentials = null; 
+    debug('Set Context Credentials', req.path, credentials);
+    try {
+        cachedCredentials = await req.server.app.cache.get('session');
+        debug('Cached Credentials', cachedCredentials);
+    } catch (e) {
+        debug('No cached credentials');
+    }
+
+    let fcredentials = credentials || cachedCredentials;
+  
+    let context = {
+        path: req.path,
+        params: req.params,
+        query: req.query,
         payload: req.payload,
-        queryOrig: (credentials != null) ? credentials.query : {},
-        token  : (credentials != null) ? `bearer ${credentials.token}` : null,
-        credentials: credentials,
-        host   : process.env.VIYA_SERVER
-        };
+        queryOrig: (fcredentials != null) ? fcredentials.query : {},
+        credentials: {...fcredentials, host: process.env.VIYA_SERVER},   
+        credType: (credentials != null) ? 'auth' : 'cached',
+        host: process.env.VIYA_SERVER
+    };
     return context;
 }
 export default setContext;

package/src/{handlers → plugins}/setCookies.js

@@ -2,43 +2,51 @@
 * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
 * SPDX-License-Identifier: Apache-2.0
 */
-let uuid      = require('uuid');
+let uuid = require('uuid');
 let debug = require('debug')('setcookies');
 
-async function setCookies (req, h, options) {
+async function setCookies(req, h, options) {
     let credentials = req.auth.credentials;
-    
-    debug('setcookie', credentials);
- 
+
+    // protect against failed logon
     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
+
+    debug('credentials in setcookie', credentials);
+
+  // use cookieAuth to set cookies
+
+    let cookieInfo = {
+        name: 'session',
+        accessToken: credentials.token,
+        refreshToken: credentials.refreshToken,
+        expiresIn: credentials.expiresIn,
+        provider: credentials.provider,
+    }
+    debug('------------set cookie-------------\n', cookieInfo);
+    await req.server.app.cache.set('session', cookieInfo,0);
+
+    req.cookieAuth.set(cookieInfo);
+
+    // set sid
+    
     const sid = uuid.v4();
     credentials.sid = sid;
     if (options != null) {
         options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
         options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-        options.userCache = {...credentials};
         debug(options.allAppEnv.LOGONPAYLOAD);
     }
-    debug('userCache', options.userCache);
-    
-    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};
+    return { status: true, error: null, redirect: redirect };
 }
 
 export default setCookies;
@@ -54,23 +62,23 @@ async function getCredentials (req) {
     };
 
     let payload = {
-		url   : `${process.env.VIYA_SERVER}/SASLogon/oauth/token`,
-		method: 'POST',
+        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'
-		},
+        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
-		})
-	};
+            'grant_type': 'authorization_code',
+            code        : req.query.code
+        })
+    };
     try {
         let r = await axios(payload);
         return r.data;

package/src/plugins/setDefaultRoutes.js

@@ -26,35 +26,23 @@ import {
   logout,
   logon,
   setupUserRoutes,
-  reactDev,
   proxyMapUri,
 } from "../handlers";
 let debug = require("debug")("routes");
-import setContext from "./setContext.js";
+//import setContext from "./setContext.js";
 module.exports = function setDefaultRoutes(server, options) {
   debug("setDefaultRoutes");
   let appName = "/" + options.appName;
-  let authDefault = false;
-  let authLogon = false;
-  if (options.authFlow === "server") {
-    /*
-    authDefault =
-      options.serverMode === "app"
-        ? false
-        : {
-          strategies: ["token", "session"],
-          mode: "required",
-        };
-        */
-    authDefault = {
-      strategy: "session",
-      mode: "try",
-    };
-    authLogon = {
-      mode: "required",
-      strategy: "sas",
-    };
-  }
+
+  let authDefault = {
+    strategy: "session",
+    mode: "try",
+  };
+  let authLogon = {
+    strategy: "sas",
+    mode: "required"
+  };
+
   let getAppb = getApp.bind(
     null,
     options // process.env.USETOKEN === "YES" ? options : null
@@ -66,10 +54,6 @@ module.exports = function setDefaultRoutes(server, options) {
   options.authLogon = authLogon;
 
   debug(options.userRouteTable);
-  let uTable =
-    options.userRouteTable !== null
-      ? setupUserRoutes(options.userRouteTable, options)
-      : null;
 
   let defaultTable = [
     {
@@ -96,7 +80,8 @@ module.exports = function setDefaultRoutes(server, options) {
       path: `${appName}`,
 
       options: {
-        auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
+        // auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
+        auth: authLogon,
         handler: getAppb,
       },
     },
@@ -130,23 +115,14 @@ module.exports = function setDefaultRoutes(server, options) {
       method: ["GET"],
       path: `${appName}/appenv`,
       options: {
-        auth: /*authDefault*/ false,
+        auth: authDefault,
         handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
-          if (options.userInfo != null) {
-            let uappenv = options.userInfo("APPENV", options);
-            if (uappenv != null) {
-              allAppEnv.APPENV = { ...allAppEnv.APPENV, ...uappenv };
-            }
-          }
           allAppEnv.credentials = options.credentials;
 
           let s =
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
-          if (process.env.SHOWENV != null) {
-            console.log(s);
-          }
           debug(s);
           return s;
         },
@@ -156,45 +132,22 @@ module.exports = function setDefaultRoutes(server, options) {
       method: ["GET"],
       path: `/appenv`,
       options: {
-        auth: /*authDefault*/ false,
+        auth: authDefault,
         handler: async (req, h) => {
           let allAppEnv = options.allAppEnv;
-          if (options.userInfo != null) {
-            let uappenv = options.userInfo("APPENV", options);
-            if (uappenv != null) {
-              allAppEnv.APPENV = { ...allAppEnv.APPENV, ...uappenv };
-            }
-          }
           allAppEnv.credentials = options.credentials;
 
           let s =
             `let LOGONPAYLOAD = ${JSON.stringify(allAppEnv.LOGONPAYLOAD)};` +
             `let APPENV = ${JSON.stringify(allAppEnv.APPENV)};`;
-          if (process.env.SHOWENV != null) {
-            debug(options.allAppEnv);
-
-          }
-          debug(s)
           return s;
         },
       },
     },
-    /*
-    {
-      method: ["GET"],
-      path: `${appName}/{param*}`,
-
-      options: {
-        auth: authDefault,
-        handler: getApp2,
-      },
-    },
-    */
 
     {
       method: ["GET"],
-      path: `/{param*}`,
-
+      path: `/assets/{param*}`,
       options: {
         auth: authDefault,
         handler: getApp2,
@@ -216,29 +169,25 @@ module.exports = function setDefaultRoutes(server, options) {
         handler: keepAlive2,
       },
     },
-  ];
-
-  let pr = {
-    method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
-    path: `${appName}/proxy/{param*}`,
-    options: {
-      handler: {
-        proxy: {
-          mapUri: proxyMapUri,
-          xforward: true,
-          passThrough: true,
+    {
+      method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
+      path: `${appName}/proxy/{param*}`,
+      options: {
+        auth: authDefault,
+        handler: {
+          proxy: {
+            mapUri: proxyMapUri,
+            xforward: true,
+            passThrough: true,
+          },
         },
       },
-    },
-  };
-  debug(pr);
-  defaultTable.push(pr);
+    }
+  ];
 
-  let routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  let uTable = options.userRouteTable();
+  let routeTables0 = options.userRouteTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  let routeTables = setupUserRoutes(routeTables0, options);
 
-  routeTables.forEach((r) => {
-    r.options.pre = [{ method: setContext, assign: 'context' }];
-    console.log, ('Setting pre for route', r.path, r.options.pre);
-  });
   server.route(routeTables);
 };