@sassoftware/viya-serverjs 0.5.3 → 0.5.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env +1 -1
- package/lib/iService.js +3 -1
- package/lib/plugins/setDefaultRoutes.js +2 -2
- package/package.json +1 -1
- package/src/iService.js +2 -1
- package/src/plugins/setDefaultRoutes.js +2 -2
package/.env
CHANGED
package/lib/iService.js
CHANGED
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports["default"] = void 0;
|
|
8
|
+
var _console = require("console");
|
|
8
9
|
var _setupAuth = _interopRequireDefault(require("./plugins/setupAuth"));
|
|
9
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
10
11
|
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 }; })(); }
|
|
@@ -104,7 +105,8 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
|
|
|
104
105
|
};
|
|
105
106
|
if (process.env.HAPIDEBUG === 'YES') {
|
|
106
107
|
sConfig.debug = {
|
|
107
|
-
request: '*'
|
|
108
|
+
request: '*',
|
|
109
|
+
log: '*'
|
|
108
110
|
};
|
|
109
111
|
}
|
|
110
112
|
debug(JSON.stringify(sConfig, null, 4));
|
|
@@ -90,8 +90,8 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
90
90
|
method: ["GET"],
|
|
91
91
|
path: "".concat(appName),
|
|
92
92
|
options: {
|
|
93
|
-
|
|
94
|
-
auth: null,
|
|
93
|
+
auth: process.env.USELOGON.toUpperCase() === 'TRUE' ? null : options.serverMode === "app" ? authLogon : authDefault,
|
|
94
|
+
// auth: null,
|
|
95
95
|
handler: function () {
|
|
96
96
|
var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
|
|
97
97
|
return _regenerator().w(function (_context2) {
|
package/package.json
CHANGED
package/src/iService.js
CHANGED
|
@@ -28,6 +28,7 @@ let Vision = require('@hapi/vision');
|
|
|
28
28
|
let inert = require('@hapi/inert');
|
|
29
29
|
let selfsigned = require('selfsigned');
|
|
30
30
|
|
|
31
|
+
import { log } from 'console';
|
|
31
32
|
import setupAuth from './plugins/setupAuth';
|
|
32
33
|
|
|
33
34
|
let os = require('os');
|
|
@@ -89,7 +90,7 @@ function iService(userRouteTable, useDefault, asset, allAppEnv, serverMode, user
|
|
|
89
90
|
},
|
|
90
91
|
};
|
|
91
92
|
if (process.env.HAPIDEBUG === 'YES') {
|
|
92
|
-
sConfig.debug = { request: '*' };
|
|
93
|
+
sConfig.debug = { request: '*' ,log: '*'};
|
|
93
94
|
}
|
|
94
95
|
debug(JSON.stringify(sConfig, null, 4));
|
|
95
96
|
if (process.env.HTTPS === 'true') {
|
|
@@ -90,8 +90,8 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
90
90
|
path: `${appName}`,
|
|
91
91
|
|
|
92
92
|
options: {
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
auth: (process.env.USELOGON.toUpperCase() === 'TRUE') ? null : options.serverMode === "app" ? authLogon : authDefault,
|
|
94
|
+
// auth: null,
|
|
95
95
|
handler: async (req,h) => {
|
|
96
96
|
console.log(`>>>>>>>>>>>>>>>>>>>>>>>in ${appName}`);
|
|
97
97
|
return getAppb(req, h);
|