@sassoftware/viya-serverjs 0.5.0 → 0.5.2

package/.env

@@ -4,16 +4,17 @@ APPLOC=./public
 # VIYA_SERVER=your viya server
 
 APPPORT=8080
-APPNAME=viyaapp
+APPNAME=mcpserver
 AUTHFLOW=code
-CLIENTID=viyaapp
+CLIENTID=mcpserver
 CLIENTSECRET=jellico
+USELOGON=TRUE
+USETOKEN=TRUE
 
-REDIRECT=
+//REDIRECT=mcp
 # APPDIR=./appDir
 HTTPS=true
 
-
 # Most modern browsers do not accept self-signed certs from localhost
 # Options:
 
@@ -26,6 +27,7 @@ HTTPS=true
 // either use the proper ssl/tsl certs or use the "proxy" method
 // to avoid CORS issues with self-signed certs
 // so run all apps thru the proxy and call Viya from there
+
 APPENV_PROXY=false
 
 

package/.env.server

@@ -1,32 +1,43 @@
 APPHOST=localhost
-APPENTRY=index.html
+# APPENTRY=index.html
 APPLOC=./public
-# viya-server set preset
-# VIYA_SERVER=
-APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+# VIYA_SERVER=your viya server
 
 APPPORT=8080
-APPNAME=viyaapp
-AUTHFLOW=server
-CLIENTID=viyaapp
+APPNAME=mcpserver
+AUTHFLOW=code
+CLIENTID=mcpserver
 CLIENTSECRET=jellico
-REDIRECT=/new
+USELOGON=TRUE
+USETOKEN=TRUE
+
+REDIRECT=mcp
 # APPDIR=./appDir
-# HTTPS=true
-USELOGON=YES
+HTTPS=true
+
+# Most modern browsers do not accept self-signed certs from localhost
+# Options:
+
+# 1. provide signed certificates for localhost
+# 2. Use libraries like mkcert to create temporary trusted certs for localhost
+# 3. Use the app server as a proxy to the Viya server to avoid CORS issues.
+#    This requires that the app redirect all Viya API calls to the app server proxy endpoint
+#    Users of restaf can simply set the APPENV_PROXY env to TRUE to enable this behavior
+# 4. set USETOKEN to TRUE and use the token in the APPENV object to make the calls
+// either use the proper ssl/tsl certs or use the "proxy" method
+// to avoid CORS issues with self-signed certs
+// so run all apps thru the proxy and call Viya from there
+APPENV_PROXY=false
 
 
-USETOKEN=YES
-# SHOWENV=YES
-# APPENV=
+# APPENV_PROXYSERVER=true
+# USETOKEN=true
+SHOWENV=true
+
 APPENV_XYZ=AA
 APPENV_BAD=
 
 
 
-# NAMESPACE=viya
-# TLS_CERT=./certs/tls.crt
-# TLS_KEY=./certs/tls.key
-
 
 

package/Dockerfile

@@ -30,7 +30,7 @@ ENV CLIENTSECRET=
 
 # specify ssl/tls cert and key in a folder
 # example below
-ENV SSLCERT=c:/Users/kumar/.tls
+# ENV SSLCERT=c:/Users/kumar/.tls
 #sample setup for creating a temporary cert and key
 ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:SAS Institute,OU:STO,CN:localhost"
 

package/lib/handlers/codeAuth.js

@@ -20,7 +20,7 @@ function codeAuth(_x, _x2, _x3) {
 }
 function _codeAuth() {
   _codeAuth = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, h, options) {
-    var indexHTML;
+    var indexHTML, redirectPath;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -29,22 +29,20 @@ function _codeAuth() {
           return (0, _setCookies["default"])(req, h, options);
         case 1:
           debug(options);
+          // add support for REDIRECT env variable
           indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
+          redirectPath = null;
           if (process.env.REDIRECT != null) {
-            debug('using REDIRECT env variable', process.env.REDIRECT);
-            indexHTML = process.env.REDIRECT;
+            redirectPath = process.env.REDIRECT != null && process.env.REDIRECT.startsWith('/') ? "/".concat(process.env.APPNAME).concat(process.env.REDIRECT) : "/".concat(process.env.REDIRECT);
           }
-          debug('..................', indexHTML);
-          if (!(indexHTML.indexOf('/') === 0)) {
+          debug(indexHTML);
+          debug(redirectPath);
+          if (!(redirectPath !== null)) {
             _context.n = 2;
             break;
           }
-          // added to support create-react-restaf-viya-app cli
-          if (indexHTML !== '/develop') {
-            indexHTML = "/".concat(process.env.APPNAME).concat(indexHTML);
-          }
-          console.log("Redirecting to ".concat(indexHTML));
-          return _context.a(2, h.redirect(indexHTML));
+          debug('redirecting to', redirectPath);
+          return _context.a(2, h.redirect(redirectPath));
         case 2:
           console.log("Visiting ".concat(indexHTML));
           return _context.a(2, h.file(indexHTML));

package/lib/iService.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _file = require("@hapi/inert/lib/file");
 var _setupAuth = _interopRequireDefault(require("./plugins/setupAuth"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
@@ -181,11 +180,13 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
             	},
             });
             */
+            //
             // setup authentication related plugins
             options = {
               serverMode: serverMode,
               authFlow: process.env.AUTHFLOW,
               host: process.env.VIYA_SERVER,
+              useLogon: process.env.USELOGON != null && process.env.USELOGON.toUpperCase() === 'FALSE' ? false : true,
               isSameSite: isSameSite,
               isSecure: isSecure,
               ns: allAppEnv.LOGONPAYLOAD != null ? allAppEnv.LOGONPAYLOAD.ns : null,
@@ -317,6 +318,7 @@ function _getCertificates() {
         case 0:
           options = null;
           tlsdir = process.env.SSLCERT;
+          console.log('Reading SSL certificates from ', tlsdir);
           if (!(tlsdir != null && tlsdir.trim().length > 0)) {
             _context2.n = 1;
             break;
@@ -406,28 +408,42 @@ function _getTls() {
             shortName: 'OU',
             value: d.OU
           }];
-          options.extensions.altNames = [
-          //	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
-          {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME)
-          }, {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/api")
-          }, {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, ":").concat(process.env.APPPORT, "/").concat(process.env.APPNAME, "/logon")
-          }, {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME)
-          }, {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/api")
-          }, {
-            type: 6,
-            value: "https://".concat(process.env.APPHOST, "/").concat(process.env.APPNAME, "/logon")
+          /*
+          	options.extensions.altNames = [
+          		//	{ type: 6, value: `http://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
+          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}` },
+          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/api` },
+          		{ type: 6, value: `https://${process.env.APPHOST}:${process.env.APPPORT}/${process.env.APPNAME}/logon` },
+          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}` },
+          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/api` },
+          		{ type: 6, value: `https://${process.env.APPHOST}/${process.env.APPNAME}/logon` },
+          	];
+          	
+          	options.extensions.altNames = [
+          		  { type: 2, value: 'localhost' },     // DNS
+          		  { type: 7, ip: '127.0.0.1' },        // IPv4
+          		  { type: 7, ip: '::1' }               // IPv6
+          		];
+          */
+          options.extensions = [{
+            name: 'subjectAltName',
+            altNames: [{
+              type: 2,
+              value: 'localhost'
+            },
+            // DNS
+            {
+              type: 7,
+              ip: '127.0.0.1'
+            },
+            // IPv4
+            {
+              type: 7,
+              ip: '::1'
+            } // IPv6
+            ]
           }];
-          debug('tls options ', JSON.stringify(options, null, 4));
+          console.log('tls options ', JSON.stringify(options, null, 4));
           pems = selfsigned.generate(attr, options);
           tls = {
             cert: pems.cert,

package/lib/plugins/setContext.js

@@ -35,6 +35,7 @@ function _setContext() {
       while (1) switch (_context.n) {
         case 0:
           credentials = req.auth.credentials;
+          console.log('+++++++++++++++++++setContext', credentials != null);
           context = {
             path: req.path,
             params: req.params,

package/lib/plugins/setDefaultRoutes.js

@@ -56,7 +56,7 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName, "/logon"),
     options: {
-      auth: options.authFlow === "server" ? {
+      auth: /*authLogon*/options.authFlow === "server" ? {
         mode: "try",
         strategy: "sas"
       } : null,
@@ -72,7 +72,7 @@ module.exports = function setDefaultRoutes(server, options) {
           return _regenerator().w(function (_context) {
             while (1) switch (_context.n) {
               case 0:
-                debug('logonhandler', req.auth.credentials);
+                console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>in logon');
                 _context.n = 1;
                 return (0, _handlers.logon)(req, h);
               case 1:
@@ -90,20 +90,15 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName),
     options: {
-      auth: process.env.USELOGON === 'YES' ? null : options.serverMode === "app" ? authLogon : authDefault,
-      handler: getAppb
-    }
-  }, {
-    method: ["GET"],
-    path: "".concat(appName, "/api"),
-    options: {
-      auth: authDefault,
+      //auth: (process.env.USELOGON.toUpperCase() === 'TRUE') ? null : options.serverMode === "app" ? authLogon : authDefault,
+      auth: null,
       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")));
+                console.log(">>>>>>>>>>>>>>>>>>>>>>>in ".concat(appName));
+                return _context2.a(2, getAppb(req, h));
             }
           }, _callee2);
         }));
@@ -113,6 +108,26 @@ module.exports = function setDefaultRoutes(server, options) {
         return handler;
       }()
     }
+  }, {
+    method: ["GET"],
+    path: "".concat(appName, "/api"),
+    options: {
+      auth: authDefault,
+      handler: function () {
+        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.n) {
+              case 0:
+                return _context3.a(2, h.redirect("".concat(appName, "/documentation")));
+            }
+          }, _callee3);
+        }));
+        function handler(_x5, _x6) {
+          return _handler3.apply(this, arguments);
+        }
+        return handler;
+      }()
+    }
   }, {
     method: ["GET"],
     path: "/develop",
@@ -148,10 +163,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
+        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context3) {
-            while (1) switch (_context3.n) {
+          return _regenerator().w(function (_context4) {
+            while (1) switch (_context4.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -166,12 +181,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   console.log(s);
                 }
                 debug(s);
-                return _context3.a(2, s);
+                return _context4.a(2, s);
             }
-          }, _callee3);
+          }, _callee4);
         }));
-        function handler(_x5, _x6) {
-          return _handler3.apply(this, arguments);
+        function handler(_x7, _x8) {
+          return _handler4.apply(this, arguments);
         }
         return handler;
       }()
@@ -182,10 +197,10 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: /*authDefault*/false,
       handler: function () {
-        var _handler4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(req, h) {
+        var _handler5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(req, h) {
           var allAppEnv, uappenv, s;
-          return _regenerator().w(function (_context4) {
-            while (1) switch (_context4.n) {
+          return _regenerator().w(function (_context5) {
+            while (1) switch (_context5.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
                 if (options.userInfo != null) {
@@ -200,12 +215,12 @@ module.exports = function setDefaultRoutes(server, options) {
                   debug(options.allAppEnv);
                 }
                 debug(s);
-                return _context4.a(2, s);
+                return _context5.a(2, s);
             }
-          }, _callee4);
+          }, _callee5);
         }));
-        function handler(_x7, _x8) {
-          return _handler4.apply(this, arguments);
+        function handler(_x9, _x0) {
+          return _handler5.apply(this, arguments);
         }
         return handler;
       }()
@@ -228,17 +243,17 @@ module.exports = function setDefaultRoutes(server, options) {
     options: {
       auth: authDefault,
       handler: function () {
-        var _handler5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(req, h) {
-          return _regenerator().w(function (_context5) {
-            while (1) switch (_context5.n) {
+        var _handler6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(req, h) {
+          return _regenerator().w(function (_context6) {
+            while (1) switch (_context6.n) {
               case 0:
                 console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in param');
-                return _context5.a(2, (0, _handlers.getApp2)(req, h));
+                return _context6.a(2, (0, _handlers.getApp2)(req, h));
             }
-          }, _callee5);
+          }, _callee6);
         }));
-        function handler(_x9, _x0) {
-          return _handler5.apply(this, arguments);
+        function handler(_x1, _x10) {
+          return _handler6.apply(this, arguments);
         }
         return handler;
       }()
@@ -279,6 +294,7 @@ module.exports = function setDefaultRoutes(server, options) {
       method: _setContext["default"],
       assign: 'context'
     }];
+    console.log, 'Setting pre for route', r.path, r.options.pre;
   });
   var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
   server.route(routeTables);

package/lib/plugins/setupUserRoutes.js

@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _setContext = _interopRequireDefault(require("./setContext"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /*
+/*
  * ------------------------------------------------------------------------------------
  *   Copyright (c) SAS Institute Inc.
  *   Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +23,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * ---------------------------------------------------------------------------------------
  *
  */
+
 function setupUserRoutes(u, options) {
   if (u == null) {
     return [];
@@ -35,11 +31,7 @@ function setupUserRoutes(u, options) {
   var ux = typeof u === 'function' ? u() : u;
   var routes = ux.map(function (rx) {
     //let rx = {...r};
-    /* change it to options */
-    if (rx.config != null) {
-      rx.options = _objectSpread({}, rx.config);
-      delete rx.config;
-    }
+
     if (rx.options.pre == null) {
       rx.options.pre = [{
         method: _setContext["default"],
@@ -57,6 +49,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.2",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -30,11 +30,11 @@
   "scripts": {
     "build": "rimraf lib && babel src --out-dir lib",
     "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",
+    "testbg": "cross-env APPENTRY=auth.html node cli --env=./.env --docker=./Dockerfile",
+    "testmcp": "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",
+    "pub": "npm publish --tag alpha --access public",
     "lint": "npx eslint --fix src/*.js"
   },
   "dependencies": {

package/public/auth.html

@@ -0,0 +1,24 @@
+
+<!DOCTYPE html>
+<html>
+  <body>
+    <script>
+      (function () {
+        try {
+          // Notify parent window that auth succeeded.
+          if (window.opener && !window.opener.closed) {
+            window.opener.postMessage(
+              { type: 'oauth:success', state: 200 },
+              '*'
+            );
+          }
+        } catch (e) {
+          // ignore
+        }
+        // Attempt to close the popup.
+        window.close();
+      })();
+    </script>
+    <p>Server is active. You can close this window.</p>
+  </body>
+</html>`;

package/public/help.html

@@ -1 +1 @@
-<h1> Hellp</h1>
+<h1> MCP Server is ready</h1>

package/server.js

@@ -9,6 +9,7 @@ core(getCustomHandler, true, 'app', null);
 function getCustomHandler() {
 	let appName = `/${process.env.APPNAME}`; /* does not have to be this - your choice */
 	debugger;
+	console.log('getCustomHandler called for appName', appName);
 	let routes = [
 		{
 			method: ["GET"],
@@ -22,24 +23,27 @@ function getCustomHandler() {
 					let hf = 'help.html';
 					return h.file(hf);
 				},
-				auth: false,
+				auth: true,
 				description: "Help",
 				notes: "Help",
 				tags: ["app"],
 			},
 		},
 		{
-			method: ["GET"],
-			path: `${appName}/new`,
+			method: ["POST", "GET"],
+			path: `/mcp`,
 			options: {
 				files: {
 					relativeTo: "./public",
 				},
 				handler: async (req, h) => {
-					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
-					return h.file('index.html');	
+					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in imcp');
+					console.log('credentials', req.auth.credentials);
+					debugger;
+					console.log('pre', req.pre.context);
+					return h.file('help.html');	
 				},
-				// auth: 'logon',
+				auth: 'logon',
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],

package/src/handlers/codeAuth.js

@@ -10,19 +10,19 @@ async function codeAuth (req, h, options) {
 	debug('in codeauth');
 	await setCookies(req, h, options);
 	debug(options);
+	// add support for REDIRECT env variable
 	let indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
+	let redirectPath = null;
 	if (process.env.REDIRECT != null) {
-		debug('using REDIRECT env variable', process.env.REDIRECT);
-		indexHTML = process.env.REDIRECT;
+	    redirectPath = (process.env.REDIRECT != null && process.env.REDIRECT.startsWith('/') 
+	              ? `/${process.env.APPNAME}${process.env.REDIRECT}`
+				  : `/${process.env.REDIRECT}`);
 	}
-	debug('..................', indexHTML);
-	if (indexHTML.indexOf('/') === 0) {
-		// added to support create-react-restaf-viya-app cli
-		if (indexHTML !== '/develop') {
-			indexHTML = `/${process.env.APPNAME}${indexHTML}`;
-		}
-		console.log(`Redirecting to ${indexHTML}`);
-		return h.redirect(indexHTML);
+	debug(indexHTML);
+	debug(redirectPath);
+	if (redirectPath !== null) {
+		debug('redirecting to', redirectPath);
+	   return h.redirect(redirectPath);
 	} else {
 		console.log(`Visiting ${indexHTML}`);
 		return h.file(indexHTML);