@sassoftware/viya-serverjs 0.6.1-1 → 0.6.1-3
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 +6 -16
- package/.env.server +2 -9
- package/Dockerfile +1 -1
- package/lib/handlers/codeAuth.js +2 -3
- package/lib/handlers/getApp.js +0 -1
- package/lib/handlers/logon.js +1 -2
- package/lib/handlers/proxyMapUri.js +2 -0
- package/lib/iService.js +1 -1
- package/lib/plugins/SASauth.js +28 -20
- package/lib/plugins/appCookie.js +22 -44
- package/lib/plugins/setContext.js +23 -8
- package/lib/{handlers → plugins}/setCookies.js +31 -35
- package/lib/plugins/setDefaultRoutes.js +34 -100
- package/lib/plugins/setupAuth.js +11 -30
- package/lib/plugins/setupUserRoutes.js +1 -0
- package/lib/readCerts.js +3 -3
- package/package.json +2 -2
- package/server.js +5 -313
- package/src/handlers/codeAuth.js +3 -3
- package/src/handlers/getApp.js +0 -1
- package/src/handlers/logon.js +1 -9
- package/src/handlers/proxyMapUri.js +2 -0
- package/src/iService.js +4 -3
- package/src/plugins/SASauth.js +59 -54
- package/src/plugins/appCookie.js +29 -43
- package/src/plugins/setContext.js +24 -13
- package/src/{handlers → plugins}/setCookies.js +38 -29
- package/src/plugins/setDefaultRoutes.js +22 -71
- package/src/plugins/setupAuth.js +10 -17
- package/src/plugins/setupUserRoutes.js +1 -1
- package/src/readCerts.js +32 -32
|
@@ -1,14 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
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); }
|
|
4
3
|
var _handlers = require("../handlers");
|
|
5
4
|
var _setContext = _interopRequireDefault(require("./setContext.js"));
|
|
6
5
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
7
|
-
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; }
|
|
8
|
-
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; }
|
|
9
|
-
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; }
|
|
10
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
11
|
-
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); }
|
|
12
6
|
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 }; })(); }
|
|
13
7
|
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); }
|
|
14
8
|
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,18 +27,15 @@ var debug = require("debug")("routes");
|
|
|
33
27
|
module.exports = function setDefaultRoutes(server, options) {
|
|
34
28
|
debug("setDefaultRoutes");
|
|
35
29
|
var appName = "/" + options.appName;
|
|
36
|
-
var authDefault =
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
strategy: "sas"
|
|
46
|
-
};
|
|
47
|
-
}
|
|
30
|
+
var authDefault = {
|
|
31
|
+
strategy: "session",
|
|
32
|
+
mode: "try"
|
|
33
|
+
};
|
|
34
|
+
var authLogon = {
|
|
35
|
+
strategy: "sas",
|
|
36
|
+
mode: "required"
|
|
37
|
+
};
|
|
38
|
+
console.log("Auth Flow", options.authFlow);
|
|
48
39
|
var getAppb = _handlers.getApp.bind(null, options // process.env.USETOKEN === "YES" ? options : null
|
|
49
40
|
);
|
|
50
41
|
console.log("Default strategy", authDefault);
|
|
@@ -92,37 +83,10 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
92
83
|
method: ["GET"],
|
|
93
84
|
path: "".concat(appName),
|
|
94
85
|
options: {
|
|
95
|
-
auth: process.env.USELOGON === 'YES' ? null : options.serverMode === "app" ? authLogon : authDefault,
|
|
86
|
+
// auth: (process.env.USELOGON === 'YES') ? null : options.serverMode === "app" ? authLogon : authDefault,
|
|
87
|
+
auth: authLogon,
|
|
96
88
|
handler: getAppb
|
|
97
89
|
}
|
|
98
|
-
}, {
|
|
99
|
-
method: ["GET"],
|
|
100
|
-
path: "".concat(appName, "/api"),
|
|
101
|
-
options: {
|
|
102
|
-
auth: authDefault,
|
|
103
|
-
handler: function () {
|
|
104
|
-
var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
|
|
105
|
-
return _regenerator().w(function (_context2) {
|
|
106
|
-
while (1) switch (_context2.n) {
|
|
107
|
-
case 0:
|
|
108
|
-
return _context2.a(2, h.redirect("".concat(appName, "/documentation")));
|
|
109
|
-
}
|
|
110
|
-
}, _callee2);
|
|
111
|
-
}));
|
|
112
|
-
function handler(_x3, _x4) {
|
|
113
|
-
return _handler2.apply(this, arguments);
|
|
114
|
-
}
|
|
115
|
-
return handler;
|
|
116
|
-
}()
|
|
117
|
-
}
|
|
118
|
-
}, {
|
|
119
|
-
method: ["GET"],
|
|
120
|
-
path: "/develop",
|
|
121
|
-
options: {
|
|
122
|
-
auth: false,
|
|
123
|
-
cors: true,
|
|
124
|
-
handler: _handlers.reactDev
|
|
125
|
-
}
|
|
126
90
|
}, {
|
|
127
91
|
method: ["GET"],
|
|
128
92
|
path: "".concat(appName, "/callback"),
|
|
@@ -148,32 +112,26 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
148
112
|
method: ["GET"],
|
|
149
113
|
path: "".concat(appName, "/appenv"),
|
|
150
114
|
options: {
|
|
151
|
-
auth:
|
|
115
|
+
auth: authDefault,
|
|
152
116
|
handler: function () {
|
|
153
|
-
var
|
|
154
|
-
var allAppEnv,
|
|
155
|
-
return _regenerator().w(function (
|
|
156
|
-
while (1) switch (
|
|
117
|
+
var _handler2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(req, h) {
|
|
118
|
+
var allAppEnv, s;
|
|
119
|
+
return _regenerator().w(function (_context2) {
|
|
120
|
+
while (1) switch (_context2.n) {
|
|
157
121
|
case 0:
|
|
158
122
|
allAppEnv = options.allAppEnv;
|
|
159
|
-
if (options.userInfo != null) {
|
|
160
|
-
uappenv = options.userInfo("APPENV", options);
|
|
161
|
-
if (uappenv != null) {
|
|
162
|
-
allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
123
|
allAppEnv.credentials = options.credentials;
|
|
166
124
|
s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
|
|
167
125
|
if (process.env.SHOWENV != null) {
|
|
168
126
|
console.log(s);
|
|
169
127
|
}
|
|
170
128
|
debug(s);
|
|
171
|
-
return
|
|
129
|
+
return _context2.a(2, s);
|
|
172
130
|
}
|
|
173
|
-
},
|
|
131
|
+
}, _callee2);
|
|
174
132
|
}));
|
|
175
|
-
function handler(
|
|
176
|
-
return
|
|
133
|
+
function handler(_x3, _x4) {
|
|
134
|
+
return _handler2.apply(this, arguments);
|
|
177
135
|
}
|
|
178
136
|
return handler;
|
|
179
137
|
}()
|
|
@@ -182,51 +140,32 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
182
140
|
method: ["GET"],
|
|
183
141
|
path: "/appenv",
|
|
184
142
|
options: {
|
|
185
|
-
auth:
|
|
143
|
+
auth: authDefault,
|
|
186
144
|
handler: function () {
|
|
187
|
-
var
|
|
188
|
-
var allAppEnv,
|
|
189
|
-
return _regenerator().w(function (
|
|
190
|
-
while (1) switch (
|
|
145
|
+
var _handler3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(req, h) {
|
|
146
|
+
var allAppEnv, s;
|
|
147
|
+
return _regenerator().w(function (_context3) {
|
|
148
|
+
while (1) switch (_context3.n) {
|
|
191
149
|
case 0:
|
|
192
150
|
allAppEnv = options.allAppEnv;
|
|
193
|
-
if (options.userInfo != null) {
|
|
194
|
-
uappenv = options.userInfo("APPENV", options);
|
|
195
|
-
if (uappenv != null) {
|
|
196
|
-
allAppEnv.APPENV = _objectSpread(_objectSpread({}, allAppEnv.APPENV), uappenv);
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
151
|
allAppEnv.credentials = options.credentials;
|
|
200
152
|
s = "let LOGONPAYLOAD = ".concat(JSON.stringify(allAppEnv.LOGONPAYLOAD), ";") + "let APPENV = ".concat(JSON.stringify(allAppEnv.APPENV), ";");
|
|
201
153
|
if (process.env.SHOWENV != null) {
|
|
202
154
|
debug(options.allAppEnv);
|
|
203
155
|
}
|
|
204
|
-
|
|
205
|
-
return _context4.a(2, s);
|
|
156
|
+
return _context3.a(2, s);
|
|
206
157
|
}
|
|
207
|
-
},
|
|
158
|
+
}, _callee3);
|
|
208
159
|
}));
|
|
209
|
-
function handler(
|
|
210
|
-
return
|
|
160
|
+
function handler(_x5, _x6) {
|
|
161
|
+
return _handler3.apply(this, arguments);
|
|
211
162
|
}
|
|
212
163
|
return handler;
|
|
213
164
|
}()
|
|
214
165
|
}
|
|
215
|
-
},
|
|
216
|
-
/*
|
|
217
|
-
{
|
|
218
|
-
method: ["GET"],
|
|
219
|
-
path: `${appName}/{param*}`,
|
|
220
|
-
options: {
|
|
221
|
-
auth: authDefault,
|
|
222
|
-
handler: getApp2,
|
|
223
|
-
},
|
|
224
|
-
},
|
|
225
|
-
*/
|
|
226
|
-
|
|
227
|
-
{
|
|
166
|
+
}, {
|
|
228
167
|
method: ["GET"],
|
|
229
|
-
path: "/{param*}",
|
|
168
|
+
path: "/assets/{param*}",
|
|
230
169
|
options: {
|
|
231
170
|
auth: authDefault,
|
|
232
171
|
handler: _handlers.getApp2
|
|
@@ -250,6 +189,7 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
250
189
|
method: ["GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"],
|
|
251
190
|
path: "".concat(appName, "/proxy/{param*}"),
|
|
252
191
|
options: {
|
|
192
|
+
auth: authDefault,
|
|
253
193
|
handler: {
|
|
254
194
|
proxy: {
|
|
255
195
|
mapUri: _handlers.proxyMapUri,
|
|
@@ -261,13 +201,7 @@ module.exports = function setDefaultRoutes(server, options) {
|
|
|
261
201
|
};
|
|
262
202
|
debug(pr);
|
|
263
203
|
defaultTable.push(pr);
|
|
264
|
-
var
|
|
265
|
-
routeTables.
|
|
266
|
-
r.options.pre = [{
|
|
267
|
-
method: _setContext["default"],
|
|
268
|
-
assign: 'context'
|
|
269
|
-
}];
|
|
270
|
-
console.log, 'Setting pre for route', r.path, r.options.pre;
|
|
271
|
-
});
|
|
204
|
+
var routeTables0 = uTable !== null ? defaultTable.concat(uTable) : defaultTable;
|
|
205
|
+
var routeTables = (0, _handlers.setupUserRoutes)(routeTables0, options);
|
|
272
206
|
server.route(routeTables);
|
|
273
207
|
};
|
package/lib/plugins/setupAuth.js
CHANGED
|
@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports["default"] = void 0;
|
|
7
|
+
var _SASauth = _interopRequireDefault(require("./SASauth.js"));
|
|
8
|
+
var _appCookie = _interopRequireDefault(require("./appCookie.js"));
|
|
9
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
7
10
|
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 }; })(); }
|
|
8
11
|
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); }
|
|
9
12
|
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); }
|
|
10
|
-
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); }); }; }
|
|
11
|
-
/*
|
|
13
|
+
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); }); }; } /*
|
|
12
14
|
* ------------------------------------------------------------------------------------
|
|
13
15
|
* * Copyright (c) SAS Institute Inc.
|
|
14
16
|
* * Licensed under the Apache License, Version 2.0 (the "License");
|
|
@@ -25,12 +27,8 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
|
|
|
25
27
|
* ----------------------------------------------------------------------------------------
|
|
26
28
|
*
|
|
27
29
|
*/
|
|
28
|
-
|
|
29
|
-
var SASauth = require('./SASauth');
|
|
30
|
-
var appCookie = require('./appCookie');
|
|
31
|
-
var token = require('./token');
|
|
32
30
|
var setDefaultRoutes = require('./setDefaultRoutes');
|
|
33
|
-
var
|
|
31
|
+
var debug = require('debug')('auth');
|
|
34
32
|
|
|
35
33
|
/** Notes:
|
|
36
34
|
* If api then register sasAuth and token - no cookies
|
|
@@ -41,39 +39,22 @@ function setupAuth(_x, _x2) {
|
|
|
41
39
|
}
|
|
42
40
|
function _setupAuth() {
|
|
43
41
|
_setupAuth = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(server, options) {
|
|
44
|
-
var def;
|
|
45
42
|
return _regenerator().w(function (_context) {
|
|
46
43
|
while (1) switch (_context.n) {
|
|
47
44
|
case 0:
|
|
48
|
-
if (!(options.authFlow === 'server')) {
|
|
49
|
-
_context.n = 5;
|
|
50
|
-
break;
|
|
51
|
-
}
|
|
52
45
|
_context.n = 1;
|
|
53
|
-
return server.register(
|
|
54
|
-
plugin: SASauth,
|
|
55
|
-
options: options
|
|
56
|
-
});
|
|
46
|
+
return server.register(require('@hapi/cookie'));
|
|
57
47
|
case 1:
|
|
58
48
|
_context.n = 2;
|
|
59
|
-
return
|
|
49
|
+
return server.register(require('@hapi/bell'));
|
|
60
50
|
case 2:
|
|
61
|
-
def = 'session';
|
|
62
|
-
if (!(options.serverMode === 'api')) {
|
|
63
|
-
_context.n = 4;
|
|
64
|
-
break;
|
|
65
|
-
}
|
|
66
51
|
_context.n = 3;
|
|
67
|
-
return server
|
|
68
|
-
plugin: token
|
|
69
|
-
});
|
|
52
|
+
return (0, _appCookie["default"])(server, options);
|
|
70
53
|
case 3:
|
|
71
|
-
|
|
54
|
+
_context.n = 4;
|
|
55
|
+
return (0, _SASauth["default"])(server, options);
|
|
72
56
|
case 4:
|
|
73
|
-
|
|
74
|
-
server.auth["default"](def);
|
|
75
|
-
// console.log(server.registerations);
|
|
76
|
-
case 5:
|
|
57
|
+
// setup default routes now that we have auth strategies
|
|
77
58
|
setDefaultRoutes(server, options);
|
|
78
59
|
return _context.a(2, true);
|
|
79
60
|
}
|
package/lib/readCerts.js
CHANGED
|
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports["default"] = void 0;
|
|
7
7
|
var _fs = _interopRequireDefault(require("fs"));
|
|
8
8
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
|
|
9
|
-
/**
|
|
10
|
-
* Copyright © 2025, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
|
|
11
|
-
* SPDX-License-Identifier: Apache-2.0
|
|
9
|
+
/**
|
|
10
|
+
* Copyright © 2025, SAS Institute Inc., Cary, NC, USA. All Rights Reserved.
|
|
11
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
function getCerts(tlsdir) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sassoftware/viya-serverjs",
|
|
3
|
-
"version": "0.6.1-
|
|
3
|
+
"version": "0.6.1-3",
|
|
4
4
|
"description": "Easy to use app server for SAS Viya applications",
|
|
5
5
|
"author": "Deva Kumaraswamy <deva.kumar@sas.com>",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"scripts": {
|
|
31
31
|
"build": "rimraf lib && babel src --out-dir lib",
|
|
32
32
|
"test": "cross-env node cli --env=./.env --docker=./Dockerfile",
|
|
33
|
-
"server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env
|
|
33
|
+
"server": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node server.js --env=./.env --docker=./Dockerfile",
|
|
34
34
|
"proxy": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 node cli --env=./.env.proxy --docker=./Dockerfile",
|
|
35
35
|
"pub": "npm publish --tag dev --access public",
|
|
36
36
|
"bump": "npm version prerelease",
|
package/server.js
CHANGED
|
@@ -39,11 +39,14 @@ function getCustomHandler() {
|
|
|
39
39
|
},
|
|
40
40
|
handler: async (req, h) => {
|
|
41
41
|
debugger;
|
|
42
|
+
let r = await req.server.app.cache.get('session');
|
|
42
43
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>in new');
|
|
43
|
-
console.log(
|
|
44
|
-
|
|
44
|
+
console.log('credentials', req.pre.context);
|
|
45
|
+
|
|
46
|
+
|
|
45
47
|
return h.file('index.html');
|
|
46
48
|
},
|
|
49
|
+
auth: true,
|
|
47
50
|
description: "Create new application",
|
|
48
51
|
notes: "Index file created from env data",
|
|
49
52
|
tags: ["app"],
|
|
@@ -52,316 +55,5 @@ function getCustomHandler() {
|
|
|
52
55
|
];
|
|
53
56
|
return routes;
|
|
54
57
|
}
|
|
55
|
-
function customize(key, options) {
|
|
56
|
-
let info = {
|
|
57
|
-
swaggerOptions: {
|
|
58
|
-
info: {
|
|
59
|
-
title: "Test API",
|
|
60
|
-
version: "0.0.1",
|
|
61
|
-
description: "This document was auto-generated at run time",
|
|
62
|
-
},
|
|
63
|
-
documentationPage: true,
|
|
64
|
-
documentationPath: `/${process.env.APPNAME}/documentation`,
|
|
65
|
-
swaggerUI: true,
|
|
66
|
-
swaggerUIPath: `/${process.env.APPNAME}/swaggerui`,
|
|
67
|
-
schemes: ["https", "http"],
|
|
68
|
-
cors: true,
|
|
69
|
-
auth: options.authDefault,
|
|
70
|
-
},
|
|
71
|
-
APPENV: {
|
|
72
|
-
x: 1,
|
|
73
|
-
y: 2,
|
|
74
|
-
},
|
|
75
|
-
};
|
|
76
|
-
let r = info[key];
|
|
77
|
-
return r == null ? {} : r;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
function getIndex() {
|
|
81
|
-
|
|
82
|
-
let template = `
|
|
83
|
-
<html lang="en">
|
|
84
|
-
<head>
|
|
85
|
-
<meta charset="UTF-8" />
|
|
86
|
-
|
|
87
|
-
<script
|
|
88
|
-
crossorigin
|
|
89
|
-
src="https://unpkg.com/react@16/umd/react.production.min.js"
|
|
90
|
-
></script>
|
|
91
|
-
<script
|
|
92
|
-
crossorigin
|
|
93
|
-
src="https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"
|
|
94
|
-
></script>
|
|
95
|
-
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-standalone/6.26.0/babel.min.js"></script>
|
|
96
|
-
<script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/6.26.0/polyfill.min.js"></script>
|
|
97
|
-
<script src="https://unpkg.com/@sassoftware/restaf@5.2.4/dist/restaf.js"></script>
|
|
98
|
-
<script src="https://unpkg.com/@sassoftware/restaflib@5.2.4/dist/restaflib.js"></script>
|
|
99
|
-
|
|
100
|
-
<style>
|
|
101
|
-
.container {
|
|
102
|
-
display: flex;
|
|
103
|
-
flex-direction: column;
|
|
104
|
-
flex-wrap: nowrap;
|
|
105
|
-
min-height: 800px;
|
|
106
|
-
}
|
|
107
|
-
.elabel {
|
|
108
|
-
display: inline-block;
|
|
109
|
-
|
|
110
|
-
clear: left;
|
|
111
|
-
width: 250px;
|
|
112
|
-
text-align: right;
|
|
113
|
-
}
|
|
114
|
-
.einput {
|
|
115
|
-
display: inline-block;
|
|
116
|
-
}
|
|
117
|
-
.div1 {
|
|
118
|
-
border: 1px solid black;
|
|
119
|
-
background: lightskyblue;
|
|
120
|
-
}
|
|
121
|
-
.div2 {
|
|
122
|
-
border: 1px solid black;
|
|
123
|
-
background: lightskyblue;
|
|
124
|
-
height: 200px;
|
|
125
|
-
}
|
|
126
|
-
</style>
|
|
127
|
-
|
|
128
|
-
<script>
|
|
129
|
-
let LOGONPAYLOAD = {
|
|
130
|
-
host: "${process.env.VIYA_SERVER}",
|
|
131
|
-
authType: "server",
|
|
132
|
-
appName: "${process.env.APPNAME}",
|
|
133
|
-
};
|
|
134
|
-
</script>
|
|
135
|
-
|
|
136
|
-
<script>
|
|
137
|
-
debugger;
|
|
138
|
-
let store = restaf.initStore({
|
|
139
|
-
casProxy: true});
|
|
140
|
-
debugger; console.log(store.config);
|
|
141
|
-
|
|
142
|
-
let session = null;
|
|
143
|
-
let servers = null;
|
|
144
|
-
let services = null;
|
|
145
|
-
let files = null;
|
|
146
|
-
let reports = null;
|
|
147
|
-
let compute = null;
|
|
148
|
-
|
|
149
|
-
function setup() {
|
|
150
|
-
debugger;
|
|
151
|
-
document.getElementById('output').innerHTML = '...initializing';
|
|
152
|
-
|
|
153
|
-
initSession()
|
|
154
|
-
.then(r => {
|
|
155
|
-
document.getElementById('output').innerHTML = 'ready';
|
|
156
|
-
keepAlive();
|
|
157
|
-
})
|
|
158
|
-
.catch(e => {
|
|
159
|
-
|
|
160
|
-
console.log(e);
|
|
161
|
-
});
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
async function initSession() {
|
|
166
|
-
|
|
167
|
-
console.log(LOGONPAYLOAD);
|
|
168
|
-
debugger;
|
|
169
|
-
let msg = await store.logon(LOGONPAYLOAD);
|
|
170
|
-
console.log(msg);
|
|
171
|
-
|
|
172
|
-
// let { identities } = await store.addServices('identities');
|
|
173
|
-
let name = 'user';
|
|
174
|
-
// if (identities.links('currentUser') != null) {
|
|
175
|
-
// let c = await store.apiCall(identities.links('currentUser'));
|
|
176
|
-
// name = c.items('id');
|
|
177
|
-
// }
|
|
178
|
-
console.log(name);
|
|
179
|
-
debugger;
|
|
180
|
-
/*
|
|
181
|
-
services = await store.addServices(
|
|
182
|
-
'files', 'compute', 'casManagement'
|
|
183
|
-
);
|
|
184
|
-
console.log(services.casManagement.links().toJS())
|
|
185
|
-
*/
|
|
186
|
-
debugger;
|
|
187
|
-
return 'done';
|
|
188
|
-
}
|
|
189
|
-
function runit(type) {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
document.getElementById('output').innerHTML = '...running';
|
|
193
|
-
let testcase;
|
|
194
|
-
switch (type) {
|
|
195
|
-
case 'files': {
|
|
196
|
-
testcase = SASfileService;
|
|
197
|
-
break;
|
|
198
|
-
}
|
|
199
|
-
case 'compute': {
|
|
200
|
-
testcase = dsCompute;
|
|
201
|
-
break;
|
|
202
|
-
}
|
|
203
|
-
case 'cas': {
|
|
204
|
-
testcase = runCas;
|
|
205
|
-
break;
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
case 'spre': {
|
|
209
|
-
testcase= spre;
|
|
210
|
-
|
|
211
|
-
break;
|
|
212
|
-
}
|
|
213
|
-
default: {
|
|
214
|
-
testcase = SASfileService;
|
|
215
|
-
break;
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
testcase(store)
|
|
220
|
-
.then(r => {
|
|
221
|
-
document.getElementById(
|
|
222
|
-
'output'
|
|
223
|
-
).innerHTML = JSON.stringify(r, null, 4);
|
|
224
|
-
})
|
|
225
|
-
.catch(err => {
|
|
226
|
-
|
|
227
|
-
document.getElementById(
|
|
228
|
-
'output'
|
|
229
|
-
).innerHTML = JSON.stringify(err, null, 4);
|
|
230
|
-
});
|
|
231
|
-
}
|
|
232
|
-
async function noaction() {
|
|
233
|
-
r = {msg: 'redirects completed'};
|
|
234
|
-
return r;
|
|
235
|
-
}
|
|
236
|
-
async function spre(store) {
|
|
237
|
-
let p = {
|
|
238
|
-
method: 'GET',
|
|
239
|
-
url : 'http://localhost:3000/api/test',
|
|
240
|
-
withCredentials: true
|
|
241
|
-
}
|
|
242
|
-
let r = await store.request(p);
|
|
243
|
-
return r.data;
|
|
244
|
-
}
|
|
245
|
-
async function runCas(store) {
|
|
246
|
-
|
|
247
|
-
let {casManagement} = await store.addServices('casManagement');
|
|
248
|
-
let servers = await store.apiCall(
|
|
249
|
-
casManagement.links('servers')
|
|
250
|
-
);
|
|
251
|
-
let serverName = servers.itemsList(0);
|
|
252
|
-
let session = await store.apiCall(
|
|
253
|
-
servers.itemsCmd(serverName, 'createSession')
|
|
254
|
-
);
|
|
255
|
-
let payload = {
|
|
256
|
-
action: 'builtins.echo',
|
|
257
|
-
data: { code: { x: 1 } }
|
|
258
|
-
};
|
|
259
|
-
console.log(JSON.stringify(session.links("execute"), null, 4));
|
|
260
|
-
let r = await store.runAction(session, payload);
|
|
261
|
-
console.log('echo completed');
|
|
262
|
-
await store.apiCall(session.links('delete'));
|
|
263
|
-
return r.items();
|
|
264
|
-
}
|
|
265
|
-
|
|
266
|
-
async function SASfileService(store) {
|
|
267
|
-
debugger;
|
|
268
|
-
let content;
|
|
269
|
-
try {
|
|
270
|
-
debugger;
|
|
271
|
-
let {files} = await store.addServices('files');
|
|
272
|
-
debugger;
|
|
273
|
-
console.log(JSON.stringify(files.links(), null, 4));
|
|
274
|
-
//console.log('items - should be an array of files(empty array is ok)')
|
|
275
|
-
// console.log(files.items().toJS());
|
|
276
|
-
let payload = {
|
|
277
|
-
data: { x: 1, y: 'This was saved earlier in the step' },
|
|
278
|
-
headers: { 'content-type': 'application/json' }
|
|
279
|
-
};
|
|
280
|
-
let createCmd = files.links('create');
|
|
281
|
-
let newFile = await store.apiCall(createCmd, payload);
|
|
282
|
-
debugger;
|
|
283
|
-
console.log(JSON.stringify(newFile.links('content'), null, 4));
|
|
284
|
-
content = await store.apiCall(newFile.links('content'));
|
|
285
|
-
|
|
286
|
-
} catch(err) {
|
|
287
|
-
console.log(JSON.stringify(err, null, 4));
|
|
288
|
-
debugger;
|
|
289
|
-
}
|
|
290
|
-
console.log(content);
|
|
291
|
-
return content.items();
|
|
292
|
-
}
|
|
293
|
-
async function dsCompute(store) {
|
|
294
|
-
let log = null;
|
|
295
|
-
debugger;
|
|
296
|
-
let {compute} = await store.addServices('compute');
|
|
297
|
-
let servers = await store.apiCall(compute.links('servers'));
|
|
298
|
-
|
|
299
|
-
let contexts = await store.apiCall(compute.links('contexts'));
|
|
300
|
-
|
|
301
|
-
// lookup the name of the first context and then use it to get the associated createSession restafLink
|
|
302
|
-
let createSession = contexts.itemsCmd(
|
|
303
|
-
contexts.itemsList(0),
|
|
304
|
-
'createSession'
|
|
305
|
-
);
|
|
306
|
-
let session = await store.apiCall(createSession);
|
|
307
|
-
|
|
308
|
-
// Now run a simple data step in that session
|
|
309
|
-
let payload = {
|
|
310
|
-
data: {
|
|
311
|
-
code: ["data _null_; do i = 1 to 100; x=1; end; run; "]
|
|
312
|
-
}
|
|
313
|
-
};
|
|
314
|
-
|
|
315
|
-
// Now execute the data step and wait for completion
|
|
316
|
-
let job = await store.apiCall(
|
|
317
|
-
session.links('execute'),
|
|
318
|
-
payload
|
|
319
|
-
);
|
|
320
|
-
let status = await store.jobState(job, null, 5, 2);
|
|
321
58
|
|
|
322
|
-
if (status.data === 'running') {
|
|
323
|
-
throw "ERROR: Job did not complete in allotted time";
|
|
324
|
-
} else {
|
|
325
|
-
switch (status.data) {
|
|
326
|
-
case 'warning':
|
|
327
|
-
console.log("Warning: check your log for warnings");
|
|
328
|
-
break;
|
|
329
|
-
case 'error':
|
|
330
|
-
throw "Please correct errors and rerun program";
|
|
331
|
-
default:
|
|
332
|
-
log = await store.apiCall(status.job.links('log'));
|
|
333
|
-
break;
|
|
334
|
-
}
|
|
335
|
-
}
|
|
336
|
-
return log === null ? status : log.items();
|
|
337
|
-
}
|
|
338
|
-
</script>
|
|
339
|
-
</head>
|
|
340
|
-
<body onload="setup()">
|
|
341
|
-
<h1 id="head">Hi</h1>
|
|
342
|
-
<div>
|
|
343
59
|
|
|
344
|
-
<button onclick="runit('files')">
|
|
345
|
-
Press to make a call to file service
|
|
346
|
-
</button>
|
|
347
|
-
<br />
|
|
348
|
-
<br />
|
|
349
|
-
<button onclick="runit('compute')">
|
|
350
|
-
Press to make a call compute service
|
|
351
|
-
</button>
|
|
352
|
-
<br />
|
|
353
|
-
<br />
|
|
354
|
-
<button onclick="runit('cas')">
|
|
355
|
-
Press to make a call to cas echo
|
|
356
|
-
</button>
|
|
357
|
-
<br />
|
|
358
|
-
<br />
|
|
359
|
-
|
|
360
|
-
<div>
|
|
361
|
-
<pre id="output"></pre>
|
|
362
|
-
</div>
|
|
363
|
-
</body>
|
|
364
|
-
</html>
|
|
365
|
-
`;
|
|
366
|
-
return template;
|
|
367
|
-
}
|