@sassoftware/viya-serverjs 0.5.5 → 0.6.1-0

package/.env

@@ -1,44 +1,27 @@
+
 APPHOST=localhost
-# APPENTRY=index.html
+APPENTRY=index.html
 APPLOC=./public
-# VIYA_SERVER=your viya server
 
 APPPORT=8080
-APPNAME=mcpserver
-AUTHFLOW=code
-CLIENTID=mcpserver
-# CLIENTSECRET=jellico
-USELOGON=FALSE
-USETOKEN=TRUE
-
-
-# REDIRECT=mcp
+APPNAME=viyaapp
+AUTHFLOW=server
+CLIENTID=viyaapp
+CLIENTSECRET=jellico
+REDIRECT=
 # APPDIR=./appDir
 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
-
-
-# APPENV_PROXYSERVER=true
-# USETOKEN=true
-SHOWENV=true
-
+USETOKEN=YES
+USELOGON=YES
+SHOWENV=YES
+VIYACERT=c:\Users\kumar\viyaCert
+NODE_TLS_REJECT_UNAUTHORIZED=0
 APPENV_XYZ=AA
 APPENV_BAD=
 
+# APPENV_PUPID=NS=https://sas-logon-app.viya.svc.cluster.local
+
+# NAMESPACE=viya
 
 
 

package/.env.proxy

@@ -0,0 +1,24 @@
+APPHOST=localhost
+# APPENTRY=index.html
+APPENTRY=index.html
+APPLOC=./public
+VIYA_SERVER=
+# APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+APPENV_USEPROXY=YES
+APPPORT=8080
+APPNAME=viyaapp
+AUTHFLOW=server
+CLIENTID=viyaapp
+CLIENTSECRET=jellico
+
+REDIRECT=
+
+# APPDIR=./appDir
+# HTTPS=true
+USELOGON=NO
+USETOKEN=YES
+SHOWENV=YES
+VIYACERT=c:\Users\kumar\viyaCert
+
+
+

package/.env.server

@@ -1,43 +1,28 @@
 APPHOST=localhost
-# APPENTRY=index.html
+APPENTRY=indexProxy.html
 APPLOC=./public
-# VIYA_SERVER=your viya server
-
+VIYA_SERVER=
+# APPENV_PROXYSERVER=https://localhost:8080/viyaapp/proxy
+APPENV_USEPROXY=YES
 APPPORT=8080
-APPNAME=mcpserver
-AUTHFLOW=code
-CLIENTID=mcpserver
+APPNAME=viyaapp
+AUTHFLOW=server
+CLIENTID=viyaapp
 CLIENTSECRET=jellico
-USELOGON=TRUE
-USETOKEN=TRUE
-
-REDIRECT=mcp
+REDIRECT=
 # APPDIR=./appDir
-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
-
-
-# APPENV_PROXYSERVER=true
-# USETOKEN=true
-SHOWENV=true
-
-APPENV_XYZ=AA
-APPENV_BAD=
-
-
+# HTTPS=true
+USELOGON=YES
+USETOKEN=YES
+# SHOWENV=YES
+# APPENV=
+VIYACERT=c:\Users\kumar\viyaCert
+NODE_TLS_REJECT_UNAUTHORIZED=0
+
+
+# NAMESPACE=viya
+# TLS_CERT=./certs/tls.crt
+# TLS_KEY=./certs/tls.key
 
 
 

package/Dockerfile

@@ -8,43 +8,37 @@ RUN npm install
 
 # will auto change to localhost in non-docker environments
 ENV APPHOST=0.0.0.0
-ENV APPLOC=./public
 ENV PORT=8080
 EXPOSE 8080
 ENV HTTPS=true
+# ENV APPSERVERLEVEL=v2
+#######################################################################
+# You can override these(but in container leave APPHOST as shown below)
+########################################################################
 
-ENV APPPORT=8080
-ENV APPNAME=mcpserver
-ENV AUTHFLOW=code
-ENV CLIENTID=mcpserver
-ENV CLIENTSECRET=jellico
-ENV USELOGON=FALSE
-ENV USETOKEN=TRUE
-
-ENV SSLCERT=
-ENV VIYACERT=
+# set this the same as EXPOSE here and override in env or as -p option in dockerrun
+# ENV APPPORT=8080
 
+ENV APPNAME=viyaapp
+# ENV AUTHFLOW=
+ENV CLIENTID=viyaapp
+ENV CLIENTSECRET=jellico
+ENV HAPIDEBUG=NO
+# ENV LOGLEVEL=info
+# ENV USETOKEN=YES
 
-# 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
+#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"
 
-ENV APPENV_PROXY=false
+# You can specify your own cet and key
+# ENV TLS_CRT=./tls/tls.crt
+# ENV TLS_KEY=./tls/tls.key
 
+# Samesite specification
+ENV SAMESITE=None,secure
 
-# APPENV_PROXYSERVER=true
-# USETOKEN=true
-ENV SHOWENV=true
+# If your Viya instance still has a unsigned certificate set this value prior to invoking the server
+# ENV NODE_TLS_REJECT_UNAUTHORIZED=0
 
-ENV APPENV_XYZ=AA
-ENV APPENV_BAD=
-CMD ["npm", "start"]
+#####################################################################
+CMD ["npm", "run", "indocker"]

package/README.md

@@ -1,67 +1,99 @@
-# `Application server for use with SAS Viya`
+# `Application servers for use with SAS Viya`
 
-viya-serverjs is a app server designed to support user written SAS Viya applications. The applications can be written using any framework.
+This package has two servers:
 
-Key features:
+1. viya-appserverjs - Use this for developing an app server for web applications(see packages/appjs)
 
-1. Handles authentication
-2. Extendable with additional end points
+2. viya-apiserverjs - Use this to develop rest api servers(see packages/apijs)
 
 ## Usage
 
+Specify it as a dependency in your package.json just as you do with other dependencies
+
 Use npx command to start the server
 
 ```sh
-npx @sassoftware/viya-serverjs
+npx @sassoftware/viyaappserverjs
 ```
 
 ## `Basic configuration`
 
-Configure the server using a .env file
+1. Set the default settings in Dockerfile. This will ensure these are set when you build containers.
+2. The defaults can be overriden using environment variables.
 
 ### `Sample env file`
 
->[Note] Sample values shown below. See Advanced section for other ways to configure the server
+When running on a non-docker environment, you can use a .env
 
 ```env
-
-# Base setup
-# With the configuration below the app server url will be
-# https://localhost:8080/viyaapp
-#
-APPHOST=localhost
-APPPORT=8080
-HTTPS=true
+VIYA_SERVER=<your viya server>
+APPHOST=localhost < can also be dns name of your server. ex: viyaiscool.unx.sas.com>
+APPPORT=5000   <any port of your choice>
 APPNAME=viyaapp
 
-# Most modern browsers will reject self-signed certs from localhost
-# And SAS Viya might also refuse connection.
-# Supply your own SSL/TLS values in a folder. All files in this folder will be used.
-# Options:
-# 1. provide signed certificates for localhost
-# 2. Use libraries like mkcert to create temporary trusted certs for localhost
-# 3. For other options see the Advanced Section
-SSLCERT=./tls  
+CLIENTID=viyaapp
+CLIENTSECRET=secret
+```
 
-# AUTHENTICATION
-VIYA_SERVER=<viya servrer url>
+### `Sample Dockerfile`
+
+```env
+FROM node:12.16.1-alpine
+LABEL maintainer="your email"
+WORKDIR /usr/src/app
+COPY . .
+RUN npm install
+# RUN npm run build (if you have to build something)
+EXPOSE 8080
+ENV APPHOST=0.0.0.0
 
-# By default it uses authorization_code flow
+AUTHFLOW=code
 
-CLIENTID=<clientid>
-CLIENTSECRET=<clientSecret if present>
-AUTHFLOW=code|pkce
+# The following are defaults. Override them as needed
+# APPLOC - where the file specified in APPENTRY is
+# APPENTRY - the main entry of the application
+ENV APPLOC=./public
+ENV APPENTRY=index.html
+# if your app takes advantage of appenv.js to pass configuration to the web application 
+# ENV APPENV=appenv.js 
 
-##########################
-# Read the Advanced Section in the README before turning on these options
-#
-APPENV_PROXY=false
-USETOKEN=false
+# See notes below on running with SSL enabled
+ENV TLS_CREATE="C:US,ST:NC,L:Cary,O:yourcompany,OU:STO,CN:localhost"
+ENV SAMESITE=None,secure
 
-APPENV_A=somevalue
-APPENV_B=somevalue
+# It is better to set this before invoking the server
+ENV NODE_TLS_REJECT_UNAUTHORIZED=0
+
+# set this to YES if you want access to the authentication token in the app
+ENV USETOKEN=NO
+
+CMD ["npx", "@sassoftware/viya-appserverjs"]
 
 ```
 
+### `Running with SSL enabled -- Recommended`
+
+This is the recommended setting. This will also make browsers like Chrome run with the SAMESITE settings set to Default - your users will thank you.
+
+Make sure you specify the VIYA_SERVER with a protocol of https.
 
+### `TLS certificates`
 
+- Option 1: Let server create a temporary unsigned certificate
+
+    ```env
+    ENV TLS_CREATE=C:US,ST:NC,L:Cary,O:YourCompany,OU:yourgroup,CN:localhost
+    ```
+
+- Option 2: Provide your own key and certificate key
+
+```env
+ENV TLS_KEY=../certs/self/key.pem
+ENV TLS_CERT=../certs/self/certificate.pem
+```
+
+- Option 3:  Provide key and certificate as a pfx file
+
+```env
+ENV TLS_PFX=../certs/sascert/sascert2.pfx
+```

package/cli.js

@@ -6,4 +6,5 @@
 
 let core = require('./lib/index.js');
 console.log('Starting the cli for @sassoftware/viya-serverjs');
-core(null, true, 'app', null);
+let userCache = {};
+core(null, true, 'app', null, userCache);

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, redirectPath;
+    var indexHTML;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -29,20 +29,22 @@ 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) {
-            redirectPath = process.env.REDIRECT != null && process.env.REDIRECT.startsWith('/') ? "/".concat(process.env.APPNAME).concat(process.env.REDIRECT) : "/".concat(process.env.REDIRECT);
+            debug('using REDIRECT env variable', process.env.REDIRECT);
+            indexHTML = process.env.REDIRECT;
           }
-          debug(indexHTML);
-          debug(redirectPath);
-          if (!(redirectPath !== null)) {
+          debug('..................', indexHTML);
+          if (!(indexHTML.indexOf('/') === 0)) {
             _context.n = 2;
             break;
           }
-          debug('redirecting to', redirectPath);
-          return _context.a(2, h.redirect(redirectPath));
+          // 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));
         case 2:
           console.log("Visiting ".concat(indexHTML));
           return _context.a(2, h.file(indexHTML));

package/lib/handlers/getApp.js

@@ -19,10 +19,11 @@ function getApp(_x, _x2, _x3) {
 }
 function _getApp() {
   _getApp = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(options, req, h) {
-    var x, redirect, redirectUri, protocol, url, indexHTML;
+    var x, redirect, redirectUri, protocol, url, r, indexHTML;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
+          console.log('In getApp handler', options);
           if (!(process.env.AUTHFLOW === 'implicit')) {
             _context.n = 1;
             break;
@@ -49,7 +50,9 @@ function _getApp() {
             break;
           }
           debug('calling codeauth');
-          return _context.a(2, (0, _codeAuth["default"])(req, h, options));
+          r = (0, _codeAuth["default"])(req, h, options);
+          console.log(options.userCache);
+          return _context.a(2, r);
         case 2:
           debug('default processing in  getapp');
           console.log('Processing non authenticated use case');

package/lib/handlers/logon.js

@@ -14,11 +14,11 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 * SPDX-License-Identifier: Apache-2.0
 */
 var debug = require('debug')('logon');
-function logon(_x, _x2) {
+function logon(_x, _x2, _x3) {
   return _logon.apply(this, arguments);
 }
 function _logon() {
-  _logon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, h) {
+  _logon = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req, h, options) {
     var r;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
@@ -26,12 +26,11 @@ function _logon() {
           debugger;
           debug('.................................................in logon');
           _context.n = 1;
-          return (0, _setCookies["default"])(req, h, null);
+          return (0, _setCookies["default"])(req, h, options);
         case 1:
           r = _context.v;
-          console.log('logon setcookie result:', r);
           debug(r.redirect);
-          console.log('in logon after setcookie', r.redirect);
+          debug('in logon after setcookie', r.redirect);
           return _context.a(2, h.redirect(r.redirect));
       }
     }, _callee);

package/lib/handlers/proxyMapUri.js

@@ -23,7 +23,7 @@ function _proxyMapUri() {
             sid = credentials.sid;
             console.log('sid=', sid);
           }
-          path = process.env.PROXYSERVER == null ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
+          path = process.env.VIYA_SERVER; //let path = (process.env.PROXYSERVER == null) ? process.env.VIYA_SERVER : process.env.PROXYSERVER;
           console.log('proxying to= ', path);
           params = req.params;
           console.log('params=', params);

package/lib/handlers/setCookies.js

@@ -4,8 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+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 _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 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 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); }); }; }
 /*
@@ -23,30 +29,32 @@ function _setCookies() {
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
-          debugger;
           credentials = req.auth.credentials;
-          debug('setcookie', credentials != null);
-          if (credentials != null && req.auth.error != null) {
-            console.log('setcookie credentials', credentials);
-            debug('setcookie error', req.auth.error);
-            console.log('Authentication error:', req.auth.error);
-            process.exit(0);
-            // return { status: false, error: req.auth.error, redirect: '/error' };
+          debug('setcookie', credentials);
+          if (!(credentials != null && req.auth.error != null)) {
+            _context.n = 1;
+            break;
           }
-
+          debug('setcookie credentials', credentials);
+          debug('setcookie error', req.auth.error);
+          debug('logon failed');
+          return _context.a(2, {
+            status: false,
+            error: req.auth.error
+          });
+        case 1:
           // create a cookie(sid) and save credentials in cache
           sid = uuid.v4();
           credentials.sid = sid;
           if (options != null) {
             options.allAppEnv.LOGONPAYLOAD.token = credentials.token;
             options.allAppEnv.LOGONPAYLOAD.tokenType = 'bearer';
-            //  debug(options.allAppEnv.LOGONPAYLOAD);
+            options.userCache = _objectSpread({}, credentials);
+            debug(options.allAppEnv.LOGONPAYLOAD);
           }
-          _context.n = 1;
-          return req.server.app.cache.set(sid, credentials, 0);
-        case 1:
+          console.log('userCache', options.userCache);
           _context.n = 2;
-          return req.server.app.cache.set('credentials', credentials, 0);
+          return req.server.app.cache.set(sid, credentials, 0);
         case 2:
           // Can we get away without setting cookie for this session?
           // Need to also modify keepAlive
@@ -55,7 +63,6 @@ function _setCookies() {
             req.cookieAuth.set({
               sid: sid
             });
-            // req.cookieAuth.set({auth: credentials});
           }
           ;
           debug('credentials query', credentials.query);