@sassoftware/viya-serverjs 0.3.0 → 0.4.0

package/src/plugins/setDefaultRoutes.js

@@ -1,253 +1,256 @@
-/*
- *  ------------------------------------------------------------------------------------
- *  * 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.
- * ----------------------------------------------------------------------------------------
- *
- */
-
-import {
-  getApp,
-  getApp2,
-  appCallback,
-  favicon,
-  keepAlive,
-  keepAlive2,
-  logout,
-  logon,
-  setupUserRoutes,
-  reactDev,
-  proxyMapUri,
-} from "../handlers";
-let debug = require("debug")("routes");
-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",
-          };
-
-    authLogon = {
-      mode: "required",
-      strategy: "sas",
-    };
-  }
-  let getAppb = getApp.bind(
-    null,
-    process.env.USETOKEN === "YES" ? options : null
-  );
-
-  console.log("Default strategy", authDefault);
-  console.log("Logon strategy", authLogon);
-  options.authDefault = authDefault;
-  options.authLogon = authLogon;
-  
-  debug(options.userRouteTable);
-  let uTable =
-    options.userRouteTable !== null
-      ? setupUserRoutes(options.userRouteTable, options)
-      : null;
-  
-  let defaultTable = [
-    {
-      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
-        // set auth to null on all protected routes
-        plugins: {
-          "hapi-auth-cookie": { redirectTo: false },
-        },
-        handler: async (req,h) => {
-          debug('logonhandler', req.auth.credentials);
-          return await logon(req,h);
-        }
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}`,
-     
-      options: {
-        auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
-        handler: getAppb,
-      },
-    },
-
-    {
-      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`,
-      options: {
-        auth: authDefault,
-        handler: appCallback,
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}/logout`,
-      options: {
-        auth: authDefault,
-        handler: logout,
-      },
-    },
-    {
-      method: ["GET", "POST"],
-      path: `${appName}/keepAlive`,
-
-      options: {
-        auth: authDefault,
-        handler: keepAlive,
-      },
-    },
-    {
-      method: ["GET"],
-      path: `${appName}/appenv`,
-      options: {
-        auth: /*authDefault*/ false,
-        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;
-        },
-      },
-    },
-    {
-      method: ["GET"],
-      path: `/appenv`,
-      options: {
-        auth: /*authDefault*/ false,
-        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*}`,
-
-      options: {
-        auth: authDefault,
-        handler: getApp2,
-      },
-    },
-    {
-      method: ["GET"],
-      path: `/favicon.ico`,
-      options: {
-        auth: false,
-        handler: favicon,
-      },
-    },
-    {
-      method: ["GET", "POST"],
-      path: `${appName}/keepAlive2`,
-      options: {
-        auth: authDefault,
-        handler: keepAlive2,
-      },
-    },
-  ];
-
-    let pr = {
-      method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
-      path: `${appName}/proxy/{param*}`,
-      options: {
-        handler: {
-          proxy: {
-            mapUri: proxyMapUri,
-            xforward: true,
-            passThrough: true,
-          },
-        },
-      },
-    };
-    debug(pr);
-    defaultTable.push(pr);
-  
-  let routeTables =
-    uTable !== null ? defaultTable.concat(uTable) : defaultTable;
-  server.route(routeTables);
-};
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * 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.
+ * ----------------------------------------------------------------------------------------
+ *
+ */
+
+import {
+  getApp,
+  getApp2,
+  appCallback,
+  favicon,
+  keepAlive,
+  keepAlive2,
+  logout,
+  logon,
+  setupUserRoutes,
+  reactDev,
+  proxyMapUri,
+} from "../handlers";
+let debug = require("debug")("routes");
+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",
+        };
+
+    authLogon = {
+      mode: "required",
+      strategy: "sas",
+    };
+  }
+  let getAppb = getApp.bind(
+    null,
+    process.env.USETOKEN === "YES" ? options : null
+  );
+
+  console.log("Default strategy", authDefault);
+  console.log("Logon strategy", authLogon);
+  options.authDefault = authDefault;
+  options.authLogon = authLogon;
+
+  debug(options.userRouteTable);
+  let uTable =
+    options.userRouteTable !== null
+      ? setupUserRoutes(options.userRouteTable, options)
+      : null;
+
+  let defaultTable = [
+    {
+      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
+        // set auth to null on all protected routes
+        plugins: {
+          "hapi-auth-cookie": { redirectTo: false },
+        },
+        handler: async (req, h) => {
+          debug('logonhandler', req.auth.credentials);
+          return await logon(req, h);
+        }
+      },
+    },
+    {
+      method: ["GET"],
+      path: `${appName}`,
+
+      options: {
+        auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
+        handler: getAppb,
+      },
+    },
+
+    {
+      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`,
+      options: {
+        auth: authDefault,
+        handler: appCallback,
+      },
+    },
+    {
+      method: ["GET"],
+      path: `${appName}/logout`,
+      options: {
+        auth: authDefault,
+        handler: logout,
+      },
+    },
+    {
+      method: ["GET", "POST"],
+      path: `${appName}/keepAlive`,
+
+      options: {
+        auth: authDefault,
+        handler: keepAlive,
+      },
+    },
+    {
+      method: ["GET"],
+      path: `${appName}/appenv`,
+      options: {
+        auth: /*authDefault*/ false,
+        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;
+        },
+      },
+    },
+    {
+      method: ["GET"],
+      path: `/appenv`,
+      options: {
+        auth: /*authDefault*/ false,
+        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*}`,
+
+      options: {
+        auth: authDefault,
+        handler: async (req, h) => {
+          console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in param');
+          return getApp2(req, h);
+        }
+      }
+    },
+    {
+      method: ["GET"],
+      path: `/favicon.ico`,
+      options: {
+        auth: false,
+        handler: favicon,
+      },
+    },
+    {
+      method: ["GET", "POST"],
+      path: `${appName}/keepAlive2`,
+      options: {
+        auth: authDefault,
+        handler: keepAlive2,
+      },
+    },
+  ];
+
+  let pr = {
+    method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
+    path: `${appName}/proxy/{param*}`,
+    options: {
+      handler: {
+        proxy: {
+          mapUri: proxyMapUri,
+          xforward: true,
+          passThrough: true,
+        },
+      },
+    },
+  };
+  debug(pr);
+  defaultTable.push(pr);
+
+  let routeTables =
+    uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  server.route(routeTables);
+};

package/src/plugins/setupAuth.js

@@ -1,50 +1,50 @@
-/*
- *  ------------------------------------------------------------------------------------
- *  * 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 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
- * If app, then register sasAuth and cookie(session) but no token 
- */
-async function setupAuth (server, options){
-	
-	if (options.authFlow === 'server') {
-		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 });
-			def = 'token';
-		}
-		log('***********************Default auth', def);
-		server.auth.default(def);
-		// console.log(server.registerations);
-	}
-	setDefaultRoutes(server, options);
-	return true;
-};
-
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * 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 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
+ * If app, then register sasAuth and cookie(session) but no token 
+ */
+async function setupAuth (server, options){
+	
+	if (options.authFlow === 'server') {
+		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 });
+			def = 'token';
+		}
+		log('***********************Default auth', def);
+		server.auth.default(def);
+		// console.log(server.registerations);
+	}
+	setDefaultRoutes(server, options);
+	return true;
+};
+
 export default setupAuth;