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

package/lib/plugins/setDefaultRoutes.js

@@ -1,14 +1,8 @@
 "use strict";
 
-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); }
 var _handlers = require("../handlers");
 var _setContext = _interopRequireDefault(require("./setContext.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-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); }
 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 }; })(); }
 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); }
@@ -33,27 +27,15 @@ var debug = require("debug")("routes");
 module.exports = function setDefaultRoutes(server, options) {
   debug("setDefaultRoutes");
   var appName = "/" + options.appName;
-  var authDefault = false;
-  var authLogon = false;
-  if (options.authFlow === "server") {
-    /*
-    authDefault =
-      options.serverMode === "app"
-        ? false
-        : {
-          strategies: ["token", "session"],
-          mode: "required",
-        };
-        */
-    authDefault = {
-      strategy: "session",
-      mode: "try"
-    };
-    authLogon = {
-      mode: "required",
-      strategy: "sas"
-    };
-  }
+  var authDefault = {
+    strategy: "session",
+    mode: "try"
+  };
+  var authLogon = {
+    strategy: "sas",
+    mode: "required"
+  };
+  console.log("Auth Flow", options.authFlow);
   var getAppb = _handlers.getApp.bind(null, options // process.env.USETOKEN === "YES" ? options : null
   );
   console.log("Default strategy", authDefault);
@@ -101,7 +83,8 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName),
     options: {
-      auth: process.env.USELOGON === 'YES' ? null : options.serverMode === "app" ? authLogon : authDefault,
+      // auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
+      auth: authLogon,
       handler: getAppb
     }
   }, {
@@ -129,20 +112,14 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "".concat(appName, "/appenv"),
     options: {
-      auth: /*authDefault*/false,
+      auth: authDefault,
       handler: function () {
         var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
-          var allAppEnv, uappenv, s;
+          var allAppEnv, s;
           return _regenerator().w(function (_context2) {
             while (1) switch (_context2.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
-                if (options.userInfo != null) {
-                  uappenv = options.userInfo("APPENV", options);
-                  if (uappenv != null) {
-                    allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
-                  }
-                }
                 allAppEnv.credentials = options.credentials;
                 s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
                 if (process.env.SHOWENV != null) {
@@ -163,26 +140,19 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET"],
     path: "/appenv",
     options: {
-      auth: /*authDefault*/false,
+      auth: authDefault,
       handler: function () {
         var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
-          var allAppEnv, uappenv, s;
+          var allAppEnv, s;
           return _regenerator().w(function (_context3) {
             while (1) switch (_context3.n) {
               case 0:
                 allAppEnv = options.allAppEnv;
-                if (options.userInfo != null) {
-                  uappenv = options.userInfo("APPENV", options);
-                  if (uappenv != null) {
-                    allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
-                  }
-                }
                 allAppEnv.credentials = options.credentials;
                 s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
                 if (process.env.SHOWENV != null) {
                   debug(options.allAppEnv);
                 }
-                debug(s);
                 return _context3.a(2, s);
             }
           }, _callee3);
@@ -193,21 +163,9 @@ module.exports = function setDefaultRoutes(server, options) {
         return handler;
       }()
     }
-  },
-  /*
-  {
-    method: ["GET"],
-    path: `${appName}/{param*}`,
-     options: {
-      auth: authDefault,
-      handler: getApp2,
-    },
-  },
-  */
-
-  {
+  }, {
     method: ["GET"],
-    path: "/{param*}",
+    path: "/assets/{param*}",
     options: {
       auth: authDefault,
       handler: _handlers.getApp2
@@ -231,6 +189,7 @@ module.exports = function setDefaultRoutes(server, options) {
     method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
     path: "".concat(appName, "/proxy/{param*}"),
     options: {
+      auth: authDefault,
       handler: {
         proxy: {
           mapUri: _handlers.proxyMapUri,
@@ -242,13 +201,7 @@ module.exports = function setDefaultRoutes(server, options) {
   };
   debug(pr);
   defaultTable.push(pr);
-  var routeTables = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
-  routeTables.forEach(function (r) {
-    r.options.pre = [{
-      method: _setContext["default"],
-      assign: 'context'
-    }];
-    console.log, 'Setting pre for route', r.path, r.options.pre;
-  });
+  var routeTables0 = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
+  var routeTables = (0, _handlers.setupUserRoutes)(routeTables0, options);
   server.route(routeTables);
 };

package/lib/plugins/setupAuth.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _SASauth = _interopRequireDefault(require("./SASauth.js"));
+var _appCookie = _interopRequireDefault(require("./appCookie.js"));
+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 }; })(); }
 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); }); }; }
-/*
+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); }); }; } /*
  *  ------------------------------------------------------------------------------------
  *  * Copyright (c) SAS Institute Inc.
  *  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,12 +27,8 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
  * ----------------------------------------------------------------------------------------
  *
  */
-
-var SASauth = require('./SASauth');
-var appCookie = require('./appCookie');
-var token = require('./token');
 var setDefaultRoutes = require('./setDefaultRoutes');
-var log = require('debug')('auth');
+var debug = require('debug')('auth');
 
 /** Notes:
  * If api then register sasAuth and token - no cookies
@@ -44,19 +42,19 @@ function _setupAuth() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          if (!(options.authFlow === 'server')) {
-            _context.n = 2;
-            break;
-          }
           _context.n = 1;
-          return server.register({
-            plugin: SASauth,
-            options: options
-          });
+          return server.register(require('@hapi/cookie'));
         case 1:
           _context.n = 2;
-          return appCookie(server, options);
+          return server.register(require('@hapi/bell'));
         case 2:
+          _context.n = 3;
+          return (0, _appCookie["default"])(server, options);
+        case 3:
+          _context.n = 4;
+          return (0, _SASauth["default"])(server, options);
+        case 4:
+          // setup default routes now that we have auth strategies
           setDefaultRoutes(server, options);
           return _context.a(2, true);
       }

package/lib/plugins/setupUserRoutes.js

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

package/lib/readCerts.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _fs = _interopRequireDefault(require("fs"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-/**
- * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
+/**
+ * Copyright © 2025, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 function getCerts(tlsdir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassoftware/viya-serverjs",
-  "version": "0.6.1-2",
+  "version": "0.6.1-3",
   "description": "Easy to use app server for SAS Viya applications",
   "author": "Deva Kumaraswamy <deva.kumar@sas.com>",
   "license": "Apache-2.0",
@@ -30,7 +30,7 @@
   "scripts": {
     "build": "rimraf lib && babel src --out-dir lib",
     "test": "cross-env  node cli --env=./.env --docker=./Dockerfile",
-    "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env.proxy --docker=./Dockerfile",
+    "server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env --docker=./Dockerfile",
     "proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
     "pub": "npm publish --tag dev --access public",
     "bump": "npm version prerelease",

package/server.js

@@ -39,15 +39,14 @@ function getCustomHandler() {
 				},
 				handler: async (req, h) => {
 					debugger;
+					let r = await req.server.app.cache.get('session');
 					console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
-					console.log({userCache});
-					console.log(req.pre.context);
+					console.log('credentials', req.pre.context);
+
+					
 					return h.file('index.html');	
 				},
-				auth: {
-					strategy: 'session',
-					mode: 'optional'
-				},
+				auth: true,
 				description: "Create new application",
 				notes: "Index file created from env data",
 				tags: ["app"],
@@ -56,316 +55,5 @@ function getCustomHandler() {
 	];
 	return routes;
 }
-function customize(key, options) {
-	let info = {
-		swaggerOptions: {
-			info: {
-				title: "Test API",
-				version: "0.0.1",
-				description: "This document was auto-generated at run time",
-			},
-			documentationPage: true,
-			documentationPath: `/${process.env.APPNAME}/documentation`,
-			swaggerUI: true,
-			swaggerUIPath: `/${process.env.APPNAME}/swaggerui`,
-			schemes: ["https", "http"],
-			cors: true,
-			auth: options.authDefault,
-		},
-		APPENV: {
-			x: 1,
-			y: 2,
-		},
-	};
-	let r = info[key];
-	return r == null ? {} : r;
-}
-
-function getIndex() {
-
-	let template = `
-  <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-
-		<script
-			crossorigin
-			src="https://unpkg.com/react@16/umd/react.production.min.js"
-		></script>
-		<script
-			crossorigin
-			src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"
-		></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-standalone/6.26.0/babel.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
-		<script src="https://unpkg.com/@sassoftware/restaf@5.2.4/dist/restaf.js"></script>
-		<script src="https://unpkg.com/@sassoftware/restaflib@5.2.4/dist/restaflib.js"></script>
-		
-		<style>
-			.container {
-				display: flex;
-				flex-direction: column;
-				flex-wrap: nowrap;
-				min-height: 800px;
-			}
-			.elabel {
-				display: inline-block;
-
-				clear: left;
-				width: 250px;
-				text-align: right;
-			}
-			.einput {
-				display: inline-block;
-			}
-			.div1 {
-				border: 1px solid black;
-				background: lightskyblue;
-			}
-			.div2 {
-				border: 1px solid black;
-				background: lightskyblue;
-				height: 200px;
-			}
-		</style>
-
-	  <script>
-    let LOGONPAYLOAD = {
-      host: "${process.env.VIYA_SERVER}",
-      authType: "server",
-      appName: "${process.env.APPNAME}",
-      };
-    </script>
-
-		<script>
-			debugger;
-			let store = restaf.initStore({
-				casProxy: true});
-			debugger;	console.log(store.config);
-
-			let session = null;
-			let servers = null;
-			let services = null;
-			let files = null;
-			let reports = null;
-			let compute = null;
-
-			function setup() {
-				debugger;
-				document.getElementById('output').innerHTML = '...initializing';
-				
-				initSession()
-					.then(r => {
-						document.getElementById('output').innerHTML = 'ready';
-						keepAlive();
-					})
-					.catch(e => {
-						
-						console.log(e);
-					});
-			}
-			
-
-			async function initSession() {
-			
-				console.log(LOGONPAYLOAD);
-				debugger;
-				let msg = await store.logon(LOGONPAYLOAD);
-				console.log(msg);
-
-			//	let { identities } = await store.addServices('identities');
-				let name = 'user';
-			//	if (identities.links('currentUser') !=  null) {
-			//		let c = await store.apiCall(identities.links('currentUser'));
-			//		name = c.items('id');
-			//	}
-				console.log(name);
-				debugger;
-				/*
-				services = await store.addServices(
-					'files', 'compute', 'casManagement'
-				);
-				console.log(services.casManagement.links().toJS())
-				*/
-				debugger;
-				return 'done';
-			}
-			function runit(type) {
-				
-				
-				document.getElementById('output').innerHTML = '...running';
-				let testcase;
-				switch (type) {
-					case 'files': {
-						testcase = SASfileService;
-						break;
-					}
-					case 'compute': {
-						testcase = dsCompute;
-						break;
-					}
-					case 'cas': {
-						testcase = runCas;
-						break;
-					}
-
-					case 'spre': {
-						testcase= spre;
-						
-						break;
-					}
-					default: {
-						testcase = SASfileService;
-						break;
-					}
-				}
-
-				testcase(store)
-					.then(r => {
-						document.getElementById(
-							'output'
-						).innerHTML = JSON.stringify(r, null, 4);
-					})
-					.catch(err => {
-						
-						document.getElementById(
-							'output'
-						).innerHTML = JSON.stringify(err, null, 4);
-					});
-			}
-			async function noaction() {
-				r = {msg: 'redirects completed'};
-				return r;
-			}
-			async function spre(store) {
-				let p = {
-					method: 'GET',
-					url   : 'http://localhost:3000/api/test',
-					withCredentials: true
-				}
-				let r = await store.request(p);
-				return r.data;
-			}
-			async function runCas(store) {
-				
-				let {casManagement} = await store.addServices('casManagement');
-				let servers = await store.apiCall(
-					casManagement.links('servers')
-				);
-				let serverName = servers.itemsList(0);
-				let session = await store.apiCall(
-					servers.itemsCmd(serverName, 'createSession')
-				);
-				let payload = {
-					action: 'builtins.echo',
-					data: { code: { x: 1 } }
-				};
-				console.log(JSON.stringify(session.links("execute"), null, 4));
-				let r = await store.runAction(session, payload);
-				console.log('echo completed');
-				await store.apiCall(session.links('delete'));
-				return r.items();
-			}
-
-			async function SASfileService(store) {
-				debugger;
-				let content;
-				try {
-					debugger;
-				let {files} = await store.addServices('files');
-				debugger;
-				console.log(JSON.stringify(files.links(), null, 4));
-				//console.log('items - should be an array of files(empty array is ok)')
-			//	console.log(files.items().toJS());
-				let payload = {
-					data: { x: 1, y: 'This was saved earlier in the step' },
-					headers: { 'content-type': 'application/json' }
-				};
-				let createCmd = files.links('create');
-				let newFile = await store.apiCall(createCmd, payload);
-				debugger;
-				console.log(JSON.stringify(newFile.links('content'), null, 4));
-				content = await store.apiCall(newFile.links('content'));
-				
-			} catch(err) {
-				console.log(JSON.stringify(err, null, 4));
-				debugger;
-			}
-				console.log(content);
-				return content.items();
-			}
-			async function dsCompute(store) {
-				let log = null;
-				debugger;
-				let {compute} = await store.addServices('compute');
-				let servers = await store.apiCall(compute.links('servers'));
-
-				let contexts = await store.apiCall(compute.links('contexts'));
-
-				// lookup the name of the first context and then use it to get the associated createSession restafLink
-				let createSession = contexts.itemsCmd(
-					contexts.itemsList(0),
-					'createSession'
-				);
-				let session = await store.apiCall(createSession);
-
-				// Now run a simple data step in that session
-				let payload = {
-					data: {
-						code: ["data _null_; do i = 1 to 100; x=1; end; run; "]
-					}
-				};
-
-				// Now execute the data step and wait for completion
-				let job = await store.apiCall(
-					session.links('execute'),
-					payload
-				);
-				let status = await store.jobState(job, null, 5, 2);
 
-				if (status.data === 'running') {
-					throw "ERROR: Job did not complete in allotted time";
-				} else {
-					switch (status.data) {
-						case 'warning':
-							console.log("Warning: check your log for warnings");
-							break;
-						case 'error':
-							throw "Please correct errors and rerun program";
-						default:
-							log = await store.apiCall(status.job.links('log'));
-							break;
-					}
-				}
-				return log === null ? status : log.items();
-			}
-		</script>
-	</head>
-	<body onload="setup()">
-		<h1 id="head">Hi</h1>
-		<div>
 
-			<button onclick="runit('files')">
-				Press to make a call to file service
-			</button>
-			<br />
-			<br />
-			<button onclick="runit('compute')">
-				Press to make a call compute service
-			</button>
-			<br />
-			<br />
-			<button onclick="runit('cas')">
-				Press to make a call to cas echo
-			</button>
-			<br />
-			<br />
-			
-		<div>
-			<pre id="output"></pre>
-		</div>
-	</body>
-</html>
-  `;
-	return template;
-}

package/src/handlers/codeAuth.js

@@ -4,12 +4,12 @@
  */
 'use strict';
 
-import setCookies from './setCookies';
+import setCookies from '../plugins/setCookies';
 let debug = require('debug')('codeauth');
 async function codeAuth (req, h, options) {  
-	debug('in codeauth');
+	debug('calling setCookies in codeAuth');
 	await setCookies(req, h, options);
-	debug(options);
+	
 	let indexHTML = process.env.APPENTRY == null ? 'index.html' : process.env.APPENTRY;
 	if (process.env.REDIRECT != null) {
 		debug('using REDIRECT env variable', process.env.REDIRECT);

package/src/handlers/getApp.js

@@ -30,7 +30,6 @@ async function getApp (options, req, h) {
         
         debug('calling codeauth');
         let r = codeAuth(req, h, options);
-        debug(options.userCache);
         return r;
 
     } else {

package/src/handlers/logon.js

@@ -3,22 +3,14 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-import setCookies from './setCookies';
+import setCookies from '../plugins/setCookies';
 let debug = require('debug')('logon');
 async function logon (req, h, options) {
    debugger;
-   debug('.................................................in logon');
-   
-   
    let r = await setCookies(req, h, options);
    debug(r.redirect);
    debug('in logon after setcookie', r.redirect);
    return h.redirect(r.redirect);
 }
 
-
-
-
-
-
 export default logon;

package/src/handlers/proxyMapUri.js

@@ -2,6 +2,8 @@ let debug = require('debug')('proxyMapUri');
 async function proxyMapUri (req) {
   let credentials = req.auth.credentials;
   debug('------------------------------------------');
+  debug('serverstate', req.server.state  );
+  debug('state', req.state);
   if (credentials != null) {
     let sid = credentials.sid;
     debug('sid=', sid);