@sassoftware/viya-serverjs 0.5.0 → 0.5.1

package/.env

@@ -4,9 +4,9 @@ APPLOC=./public
 # VIYA_SERVER=your viya server
 
 APPPORT=8080
-APPNAME=viyaapp
+APPNAME=mcpapp
 AUTHFLOW=code
-CLIENTID=viyaapp
+CLIENTID=mcpapp
 CLIENTSECRET=jellico
 
 REDIRECT=
@@ -14,6 +14,7 @@ REDIRECT=
 HTTPS=true
 
 
+
 # Most modern browsers do not accept self-signed certs from localhost
 # Options:
 

package/lib/iService.js

@@ -181,6 +181,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             	},
             });
             */
+            //
             // setup authentication related plugins
             options = {
               serverMode: serverMode,

package/lib/plugins/setupUserRoutes.js

@@ -57,6 +57,7 @@ function setupUserRoutes(u, options) {
     } else if (rx.options.auth === 'logon') {
       rx.options.auth = options.authLogon;
     }
+    console.log('route auth', rx.options.auth);
     return rx;
   });
   return routes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -32,6 +32,7 @@
     "test": "node cli --env=./.env --docker=./Dockerfile",
     "submit": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 APPENTRY=simplesubmit.html node cli --env=./.env --docker=./Dockerfile",
     "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env.server --docker=./Dockerfile",
+    "server2": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env --docker=./Dockerfile",
     "debug": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0  node --inspect-brk server.js --env=./.env.server --docker=./Dockerfile",
     "proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
     "pub": "npm publish --tag dev --access public",

package/public/help.html

@@ -1 +1 @@
-<h1> Hellp</h1>
+<h1> Hello</h1>

package/server.js

@@ -22,7 +22,7 @@ function getCustomHandler() {
 					let hf = 'help.html';
 					return h.file(hf);
 				},
-				auth: false,
+				auth: true,
 				description: "Help",
 				notes: "Help",
 				tags: ["app"],
@@ -30,16 +30,19 @@ function getCustomHandler() {
 		},
 		{
 			method: ["GET"],
-			path: `${appName}/new`,
+			path: `/mcp`,
 			options: {
 				files: {
 					relativeTo: "./public",
 				},
 				handler: async (req, h) => {
-					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in mcp');
+					console.log(req.auth.credentials);
+					debugger;
+					console.log(req.context);
 					return h.file('index.html');	
 				},
-				// auth: 'logon',
+				auth: 'logon',
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],

package/src/iService.js

@@ -152,6 +152,7 @@ function iService (userRouteTable, useDefault, asset, allAppEnv, serverMode, use
 		});
 		*/
 		
+		//
 		// setup authentication related plugins
 		
 		let options = {

package/src/plugins/setupUserRoutes.js

@@ -25,11 +25,7 @@ function setupUserRoutes (u, options) {
     let ux = (typeof u === 'function') ? u() : u;
     let routes = ux.map(rx => {
         //let rx = {...r};
-        /* change it to options */
-        if (rx.config != null) {
-            rx.options = {...rx.config};
-            delete rx.config;
-        }
+   
         if (rx.options.pre == null) {
           rx.options.pre = [{method: setContext, assign: 'context'}];
         } else{
@@ -41,7 +37,7 @@ function setupUserRoutes (u, options) {
         } else if (rx.options.auth === 'logon') {
             rx.options.auth = options.authLogon;
         } 
-       
+        console.log('route auth', rx.options.auth);
         return rx;
     });
     return routes;