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

package/lib/handlers/getApp.js

@@ -23,7 +23,7 @@ function _getApp() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          console.log('In getApp handler', options);
+          debug('In getApp handler', options);
           if (!(process.env.AUTHFLOW === 'implicit')) {
             _context.n = 1;
             break;
@@ -51,16 +51,16 @@ function _getApp() {
           }
           debug('calling codeauth');
           r = (0, _codeAuth["default"])(req, h, options);
-          console.log(options.userCache);
+          debug(options.userCache);
           return _context.a(2, r);
         case 2:
           debug('default processing in  getapp');
-          console.log('Processing non authenticated use case');
+          debug('Processing non authenticated use case');
           indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
           if (process.env.REDIRECT != null) {
             indexHTML = process.env.REDIRECT;
           }
-          console.log('redirecting to ', indexHTML);
+          debug('redirecting to ', indexHTML);
           if (!indexHTML.startsWith('/')) {
             _context.n = 3;
             break;

package/lib/handlers/proxyMapUri.js

@@ -8,6 +8,7 @@ function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present,
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+var debug = require('debug')('proxyMapUri');
 function proxyMapUri(_x) {
   return _proxyMapUri.apply(this, arguments);
 }
@@ -18,22 +19,22 @@ function _proxyMapUri() {
       while (1) switch (_context.n) {
         case 0:
           credentials = req.auth.credentials;
-          console.log('------------------------------------------');
+          debug('------------------------------------------');
           if (credentials != null) {
             sid = credentials.sid;
-            console.log('sid=', sid);
+            debug('sid=', sid);
           }
           path = process.env.VIYA_SERVER; //let path = (process.env.PROXYSERVER == null) ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
-          console.log('proxying to= ', path);
+          debug('proxying to= ', path);
           params = req.params;
-          console.log('params=', params);
+          debug('params=', params);
           search = req.url.search;
-          console.log('query=', search);
+          debug('query=', search);
           uri = path + '/' + params.param;
           if (search != null && search.trim().length > 0) {
             uri = uri + search;
           }
-          console.log('destination= ', uri);
+          debug('destination= ', uri);
           return _context.a(2, {
             uri: uri
           });

package/lib/handlers/setCookies.js

@@ -52,7 +52,7 @@ function _setCookies() {
             options.userCache = _objectSpread({}, credentials);
             debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          console.log('userCache', options.userCache);
+          debug('userCache', options.userCache);
           _context.n = 2;
           return req.server.app.cache.set(sid, credentials, 0);
         case 2:

package/lib/plugins/setContext.js

@@ -25,6 +25,8 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  * ---------------------------------------------------------------------------------------
  *
  */
+
+var debug = require('debug')('context');
 function setContext(_x, _x2) {
   return _setContext.apply(this, arguments);
 }
@@ -35,8 +37,7 @@ function _setContext() {
       while (1) switch (_context.n) {
         case 0:
           credentials = req.auth.credentials;
-          console.log('in setContext');
-          console.log('credentials=', credentials);
+          debug(credentials);
           context = {
             path: req.path,
             params: req.params,

package/lib/plugins/setDefaultRoutes.js

@@ -36,9 +36,18 @@ module.exports = function setDefaultRoutes(server, options) {
   var authDefault = false;
   var authLogon = false;
   if (options.authFlow === "server") {
-    authDefault = options.serverMode === "app" ? false : {
-      strategies: ["token", "session"],
-      mode: "required"
+    /*
+    authDefault =
+      options.serverMode === "app"
+        ? false
+        : {
+          strategies: ["token", "session"],
+          mode: "required",
+        };
+        */
+    authDefault = {
+      strategy: "session",
+      mode: "try"
     };
     authLogon = {
       mode: "required",
@@ -95,34 +104,6 @@ module.exports = function setDefaultRoutes(server, options) {
       auth: process.env.USELOGON === 'YES' ? null : options.serverMode === "app" ? authLogon : authDefault,
       handler: getAppb
     }
-  }, {
-    method: ["GET"],
-    path: "".concat(appName, "/api"),
-    options: {
-      auth: authDefault,
-      handler: function () {
-        var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
-          return _regenerator().w(function (_context2) {
-            while (1) switch (_context2.n) {
-              case 0:
-                return _context2.a(2, h.redirect("".concat(appName, "/documentation")));
-            }
-          }, _callee2);
-        }));
-        function handler(_x3, _x4) {
-          return _handler2.apply(this, arguments);
-        }
-        return handler;
-      }()
-    }
-  }, {
-    method: ["GET"],
-    path: "/develop",
-    options: {
-      auth: false,
-      cors: true,
-      handler: _handlers.reactDev
-    }
   }, {
     method: ["GET"],
     path: "".concat(appName, "/callback"),
@@ -150,10 +131,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
+        var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context3) {
-            while (1) switch (_context3.n) {
+          return _regenerator().w(function (_context2) {
+            while (1) switch (_context2.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -168,12 +149,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   console.log(s);
                 }
                 debug(s);
-                return _context3.a(2, s);
+                return _context2.a(2, s);
             }
-          }, _callee3);
+          }, _callee2);
         }));
-        function handler(_x5, _x6) {
-          return _handler3.apply(this, arguments);
+        function handler(_x3, _x4) {
+          return _handler2.apply(this, arguments);
         }
         return handler;
       }()
@@ -184,10 +165,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(req, h) {
+        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context4) {
-            while (1) switch (_context4.n) {
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -202,12 +183,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   debug(options.allAppEnv);
                 }
                 debug(s);
-                return _context4.a(2, s);
+                return _context3.a(2, s);
             }
-          }, _callee4);
+          }, _callee3);
         }));
-        function handler(_x7, _x8) {
-          return _handler4.apply(this, arguments);
+        function handler(_x5, _x6) {
+          return _handler3.apply(this, arguments);
         }
         return handler;
       }()

package/lib/plugins/setupAuth.js

@@ -41,12 +41,11 @@ function setupAuth(_x, _x2) {
 }
 function _setupAuth() {
   _setupAuth = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(server, options) {
-    var def;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           if (!(options.authFlow === 'server')) {
-            _context.n = 5;
+            _context.n = 2;
             break;
           }
           _context.n = 1;
@@ -58,22 +57,6 @@ function _setupAuth() {
           _context.n = 2;
           return appCookie(server, options);
         case 2:
-          def = 'session';
-          if (!(options.serverMode === 'api')) {
-            _context.n = 4;
-            break;
-          }
-          _context.n = 3;
-          return server.register({
-            plugin: token
-          });
-        case 3:
-          def = 'token';
-        case 4:
-          log('***********************Default auth', def);
-          server.auth["default"](def);
-          // console.log(server.registerations);
-        case 5:
           setDefaultRoutes(server, options);
           return _context.a(2, true);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.6.1-0",
+  "version": "0.6.1-2",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",

package/server.js

@@ -32,7 +32,7 @@ function getCustomHandler() {
 		},
 		{
 			method: ["GET"],
-			path: `${appName}/new`,
+			path: `/new`,
 			options: {
 				files: {
 					relativeTo: "./public",
@@ -44,6 +44,10 @@ function getCustomHandler() {
 					console.log(req.pre.context);
 					return h.file('index.html');	
 				},
+				auth: {
+					strategy: 'session',
+					mode: 'optional'
+				},
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],

package/src/handlers/getApp.js

@@ -7,7 +7,7 @@ import codeAuth from './codeAuth';
 let debug = require('debug')('getapp');
 
 async function getApp (options, req, h) {
-    console.log('In getApp handler', options);
+    debug('In getApp handler', options);
     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`;
@@ -30,18 +30,18 @@ async function getApp (options, req, h) {
         
         debug('calling codeauth');
         let r = codeAuth(req, h, options);
-        console.log(options.userCache);
+        debug(options.userCache);
         return r;
 
     } else {
         debug('default processing in  getapp');
-        console.log('Processing non authenticated use case');
+        debug('Processing non authenticated use case');
       
         let indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
         if (process.env.REDIRECT != null) {
             indexHTML = process.env.REDIRECT;
         }
-        console.log('redirecting to ', indexHTML);
+       debug('redirecting to ', indexHTML);
         if (indexHTML.startsWith('/')) {
             indexHTML = `/${process.env.APPNAME}${indexHTML}`;
             return h.redirect(indexHTML);

package/src/handlers/proxyMapUri.js

@@ -1,23 +1,24 @@
+let debug = require('debug')('proxyMapUri');
 async function proxyMapUri (req) {
   let credentials = req.auth.credentials;
-  console.log('------------------------------------------');
+  debug('------------------------------------------');
   if (credentials != null) {
     let sid = credentials.sid;
-    console.log('sid=', sid);
+    debug('sid=', sid);
   }
  
   let path = process.env.VIYA_SERVER;
   //let path = (process.env.PROXYSERVER == null) ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
-  console.log('proxying to= ', path);
+  debug('proxying to= ', path);
   let params = req.params;
-  console.log('params=', params);
+  debug('params=', params);
   let search = req.url.search;
-  console.log('query=', search);
+  debug('query=', search);
   let uri = path + '/' + params.param;
   if (search != null && search.trim().length > 0) {
     uri = uri + search;
   } 
-  console.log('destination= ',uri);
+  debug('destination= ',uri);
   return {
     uri: uri
   };

package/src/handlers/setCookies.js

@@ -26,7 +26,7 @@ async function setCookies (req, h, options) {
         options.userCache = {...credentials};
         debug(options.allAppEnv.LOGONPAYLOAD);
     }
-    console.log('userCache', options.userCache);
+    debug('userCache', options.userCache);
     
     await req.server.app.cache.set(sid, credentials, 0);
     // Can we get away without setting cookie for this session?

package/src/plugins/setContext.js

@@ -16,11 +16,10 @@
  *
  */
 
-
+let debug = require('debug')('context');
 async function setContext (req,h){
-   let credentials = req.auth.credentials;
-   console.log('in setContext');
-   console.log('credentials=', credentials);
+   let credentials = req.auth.credentials
+   debug(credentials);
    let context = {
         path   : req.path,
         params : req.params,

package/src/plugins/setDefaultRoutes.js

@@ -37,6 +37,7 @@ module.exports = function setDefaultRoutes(server, options) {
   let authDefault = false;
   let authLogon = false;
   if (options.authFlow === "server") {
+    /*
     authDefault =
       options.serverMode === "app"
         ? false
@@ -44,7 +45,11 @@ module.exports = function setDefaultRoutes(server, options) {
           strategies: ["token", "session"],
           mode: "required",
         };
-
+        */
+    authDefault = {
+      strategy: "session",
+      mode: "try",
+    };
     authLogon = {
       mode: "required",
       strategy: "sas",
@@ -96,26 +101,6 @@ module.exports = function setDefaultRoutes(server, options) {
       },
     },
 
-    {
-      method: ["GET"],
-      path: `${appName}/api`,
-      options: {
-        auth: authDefault,
-        handler: async (req, h) => {
-          return h.redirect(`${appName}/documentation`);
-        },
-      },
-    },
-    {
-      method: ["GET"],
-      path: `/develop`,
-      options: {
-        auth: false,
-        cors: true,
-        handler: reactDev,
-      },
-    },
-
     {
       method: ["GET"],
       path: `${appName}/callback`,

package/src/plugins/setupAuth.js

@@ -33,7 +33,7 @@ async function setupAuth (server, options){
 		await server.register({plugin: SASauth,   options: options});
 		// await server.register({plugin: appCookie, options: options});
 		await appCookie(server,options);
-
+		/*
 		let def = 'session';
 		if (options.serverMode === 'api') {
 			await server.register({ plugin: token });
@@ -41,6 +41,7 @@ async function setupAuth (server, options){
 		}
 		log('***********************Default auth', def);
 		server.auth.default(def);
+		*/
 		// console.log(server.registerations);
 	}
 	setDefaultRoutes(server, options);