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

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-1",
+  "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

@@ -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/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);