@balena/pinejs 19.7.2-build-renovate-postgres-17-x-38c77839796930404f59a924e2e4573ffdc6405d-1 → 19.7.2-build-esm-ce2a147ed7533c40f456b27f17ac4e559a0f9da8-1
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/.versionbot/CHANGELOG.yml +5 -6
- package/CHANGELOG.md +1 -1
- package/{Gruntfile.ts → Gruntfile.cts} +9 -22
- package/bin/abstract-sql-compiler.js +1 -1
- package/bin/odata-compiler.js +1 -1
- package/bin/sbvr-compiler.js +1 -1
- package/build/{browser.ts → browser.cts} +1 -1
- package/build/{config.ts → config.cts} +5 -1
- package/build/{module.ts → module.cts} +1 -1
- package/build/{server.ts → server.cts} +1 -1
- package/docker-compose.npm-test.yml +1 -1
- package/out/bin/abstract-sql-compiler.js +17 -19
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/odata-compiler.js +19 -21
- package/out/bin/odata-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js +19 -54
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/bin/utils.d.ts +3 -3
- package/out/bin/utils.js +16 -53
- package/out/bin/utils.js.map +1 -1
- package/out/config-loader/config-loader.d.ts +6 -6
- package/out/config-loader/config-loader.js +23 -63
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/config-loader/env.d.ts +1 -1
- package/out/config-loader/env.js +24 -66
- package/out/config-loader/env.js.map +1 -1
- package/out/data-server/sbvr-server.d.ts +3 -3
- package/out/data-server/sbvr-server.js +5 -42
- package/out/data-server/sbvr-server.js.map +1 -1
- package/out/database-layer/db.d.ts +3 -3
- package/out/database-layer/db.js +37 -83
- package/out/database-layer/db.js.map +1 -1
- package/out/express-emulator/express.js.map +1 -1
- package/out/extended-sbvr-parser/extended-sbvr-parser.js +8 -11
- package/out/extended-sbvr-parser/extended-sbvr-parser.js.map +1 -1
- package/out/http-transactions/transactions.d.ts +2 -2
- package/out/http-transactions/transactions.js +4 -4
- package/out/http-transactions/transactions.js.map +1 -1
- package/out/migrator/async.d.ts +2 -2
- package/out/migrator/async.js +20 -60
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/migrations.js +1 -2
- package/out/migrator/sync.d.ts +6 -6
- package/out/migrator/sync.js +20 -61
- package/out/migrator/sync.js.map +1 -1
- package/out/migrator/utils.d.ts +4 -4
- package/out/migrator/utils.js +42 -97
- package/out/migrator/utils.js.map +1 -1
- package/out/odata-metadata/odata-metadata-generator.js +7 -14
- package/out/odata-metadata/odata-metadata-generator.js.map +1 -1
- package/out/passport-pinejs/mount-login-router.d.ts +1 -1
- package/out/passport-pinejs/mount-login-router.js +4 -41
- package/out/passport-pinejs/mount-login-router.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +1 -1
- package/out/passport-pinejs/passport-pinejs.js +11 -46
- package/out/passport-pinejs/passport-pinejs.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.d.ts +1 -1
- package/out/pinejs-session-store/pinejs-session-store.js +11 -48
- package/out/pinejs-session-store/pinejs-session-store.js.map +1 -1
- package/out/sbvr-api/abstract-sql.d.ts +2 -2
- package/out/sbvr-api/abstract-sql.js +22 -65
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/cached-compile.js +8 -15
- package/out/sbvr-api/cached-compile.js.map +1 -1
- package/out/sbvr-api/common-types.js +1 -2
- package/out/sbvr-api/control-flow.d.ts +1 -1
- package/out/sbvr-api/control-flow.js +12 -25
- package/out/sbvr-api/control-flow.js.map +1 -1
- package/out/sbvr-api/dev.js +1 -2
- package/out/sbvr-api/errors.d.ts +1 -1
- package/out/sbvr-api/errors.js +47 -95
- package/out/sbvr-api/errors.js.map +1 -1
- package/out/sbvr-api/express-extension.d.ts +2 -2
- package/out/sbvr-api/express-extension.js +1 -2
- package/out/sbvr-api/hooks.d.ts +4 -4
- package/out/sbvr-api/hooks.js +23 -35
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/odata-response.d.ts +2 -2
- package/out/sbvr-api/odata-response.js +19 -29
- package/out/sbvr-api/odata-response.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +8 -8
- package/out/sbvr-api/permissions.js +106 -159
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +38 -16
- package/out/sbvr-api/sbvr-utils.js +222 -285
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.d.ts +1 -1
- package/out/sbvr-api/translations.js +10 -17
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +6 -6
- package/out/sbvr-api/uri-parser.js +39 -84
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/out/sbvr-api/user.js +1 -2
- package/out/server-glue/global-ext.d.ts +0 -3
- package/out/server-glue/module.d.ts +15 -15
- package/out/server-glue/module.js +20 -59
- package/out/server-glue/module.js.map +1 -1
- package/out/server-glue/sbvr-loader.d.ts +2 -1
- package/out/server-glue/sbvr-loader.js +4 -11
- package/out/server-glue/sbvr-loader.js.map +1 -1
- package/out/server-glue/server.d.ts +2 -2
- package/out/server-glue/server.js +17 -59
- package/out/server-glue/server.js.map +1 -1
- package/out/tasks/common.d.ts +1 -1
- package/out/tasks/common.js +3 -9
- package/out/tasks/common.js.map +1 -1
- package/out/tasks/index.d.ts +8 -8
- package/out/tasks/index.js +25 -63
- package/out/tasks/index.js.map +1 -1
- package/out/tasks/tasks.js +1 -2
- package/out/tasks/worker.d.ts +3 -3
- package/out/tasks/worker.js +14 -51
- package/out/tasks/worker.js.map +1 -1
- package/out/webresource-handler/handlers/NoopHandler.d.ts +1 -1
- package/out/webresource-handler/handlers/NoopHandler.js +1 -5
- package/out/webresource-handler/handlers/NoopHandler.js.map +1 -1
- package/out/webresource-handler/handlers/S3Handler.d.ts +1 -1
- package/out/webresource-handler/handlers/S3Handler.js +17 -24
- package/out/webresource-handler/handlers/S3Handler.js.map +1 -1
- package/out/webresource-handler/handlers/index.d.ts +2 -2
- package/out/webresource-handler/handlers/index.js +2 -18
- package/out/webresource-handler/handlers/index.js.map +1 -1
- package/out/webresource-handler/index.d.ts +1 -1
- package/out/webresource-handler/index.js +35 -85
- package/out/webresource-handler/index.js.map +1 -1
- package/package.json +10 -10
- package/src/bin/abstract-sql-compiler.ts +3 -3
- package/src/bin/odata-compiler.ts +3 -3
- package/src/bin/sbvr-compiler.ts +2 -2
- package/src/bin/utils.ts +20 -15
- package/src/config-loader/config-loader.ts +11 -11
- package/src/config-loader/env.ts +3 -3
- package/src/data-server/sbvr-server.ts +4 -4
- package/src/database-layer/db.ts +18 -11
- package/src/extended-sbvr-parser/extended-sbvr-parser.ts +5 -5
- package/src/http-transactions/transactions.js +4 -4
- package/src/migrator/async.ts +5 -5
- package/src/migrator/sync.ts +8 -8
- package/src/migrator/utils.ts +7 -7
- package/src/odata-metadata/odata-metadata-generator.ts +3 -2
- package/src/passport-pinejs/mount-login-router.ts +3 -3
- package/src/passport-pinejs/passport-pinejs.ts +3 -3
- package/src/pinejs-session-store/pinejs-session-store.ts +4 -4
- package/src/sbvr-api/abstract-sql.ts +5 -5
- package/src/sbvr-api/cached-compile.ts +1 -1
- package/src/sbvr-api/control-flow.ts +1 -1
- package/src/sbvr-api/errors.ts +1 -1
- package/src/sbvr-api/express-extension.ts +2 -2
- package/src/sbvr-api/hooks.ts +5 -5
- package/src/sbvr-api/odata-response.ts +8 -4
- package/src/sbvr-api/permissions.ts +17 -17
- package/src/sbvr-api/sbvr-utils.ts +37 -31
- package/src/sbvr-api/translations.ts +1 -1
- package/src/sbvr-api/uri-parser.ts +9 -9
- package/src/server-glue/global-ext.d.ts +0 -3
- package/src/server-glue/module.ts +19 -19
- package/src/server-glue/sbvr-loader.ts +15 -27
- package/src/server-glue/server.ts +13 -24
- package/src/tasks/common.ts +1 -1
- package/src/tasks/index.ts +14 -14
- package/src/tasks/worker.ts +8 -8
- package/src/webresource-handler/handlers/NoopHandler.ts +5 -1
- package/src/webresource-handler/handlers/S3Handler.ts +1 -1
- package/src/webresource-handler/handlers/index.ts +2 -2
- package/src/webresource-handler/index.ts +8 -8
- package/tsconfig.dev.json +4 -2
- package/tsconfig.json +1 -1
- package/typings/lf-to-abstract-sql.d.ts +2 -2
- package/typings/memoizee.d.ts +1 -1
@@ -1,3 +1,3 @@
|
|
1
1
|
import type { Express } from 'express';
|
2
|
-
import type { setup } from '../config-loader/config-loader';
|
2
|
+
import type { setup } from '../config-loader/config-loader.js';
|
3
3
|
export declare const mountLoginRouter: (configLoader: ReturnType<typeof setup>, expressApp: Express) => Promise<void>;
|
@@ -1,45 +1,9 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
19
|
-
var ownKeys = function(o) {
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
-
var ar = [];
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
-
return ar;
|
24
|
-
};
|
25
|
-
return ownKeys(o);
|
26
|
-
};
|
27
|
-
return function (mod) {
|
28
|
-
if (mod && mod.__esModule) return mod;
|
29
|
-
var result = {};
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
-
__setModuleDefault(result, mod);
|
32
|
-
return result;
|
33
|
-
};
|
34
|
-
})();
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
-
exports.mountLoginRouter = void 0;
|
37
|
-
const passportPinejs = __importStar(require("./passport-pinejs"));
|
38
|
-
const pinejs_session_store_1 = require("../pinejs-session-store/pinejs-session-store");
|
39
|
-
const mountLoginRouter = async (configLoader, expressApp) => {
|
1
|
+
import * as passportPinejs from './passport-pinejs.js';
|
2
|
+
import { PinejsSessionStore } from '../pinejs-session-store/pinejs-session-store.js';
|
3
|
+
export const mountLoginRouter = async (configLoader, expressApp) => {
|
40
4
|
await Promise.all([
|
41
5
|
configLoader.loadConfig(passportPinejs.config),
|
42
|
-
configLoader.loadConfig(
|
6
|
+
configLoader.loadConfig(PinejsSessionStore.config),
|
43
7
|
]);
|
44
8
|
if (typeof process === 'undefined' || !process?.env.DISABLE_DEFAULT_AUTH) {
|
45
9
|
expressApp.post('/login', passportPinejs.login((err, user, req, res) => {
|
@@ -69,5 +33,4 @@ const mountLoginRouter = async (configLoader, expressApp) => {
|
|
69
33
|
});
|
70
34
|
}
|
71
35
|
};
|
72
|
-
exports.mountLoginRouter = mountLoginRouter;
|
73
36
|
//# sourceMappingURL=mount-login-router.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"mount-login-router.js","sourceRoot":"","sources":["../../src/passport-pinejs/mount-login-router.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"mount-login-router.js","sourceRoot":"","sources":["../../src/passport-pinejs/mount-login-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AAGrF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACpC,YAAsC,EACtC,UAAmB,EAClB,EAAE;IACH,MAAM,OAAO,CAAC,GAAG,CAAC;QACjB,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC;QAC9C,YAAY,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC;KAClD,CAAC,CAAC;IAEH,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC1E,UAAU,CAAC,IAAI,CACd,QAAQ,EACR,cAAc,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5C,IAAI,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;gBACvC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACvB,CAAC;iBAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;gBAC3B,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC7B,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvB,CAAC;qBAAM,CAAC;oBACP,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC;YACF,CAAC;QACF,CAAC,CAAC,CACF,CAAC;QAEF,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC9D,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,CAAC"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import type * as Express from 'express';
|
2
2
|
import type * as PassportLocal from 'passport-local';
|
3
|
-
import type * as ConfigLoader from '../config-loader/config-loader';
|
3
|
+
import type * as ConfigLoader from '../config-loader/config-loader.js';
|
4
4
|
export declare let login: (fn: (err: any, user: object | null | false | undefined, req: Express.Request, res: Express.Response, next: Express.NextFunction) => void) => Express.RequestHandler;
|
5
5
|
export declare let logout: Express.RequestHandler;
|
6
6
|
export declare const checkPassword: PassportLocal.VerifyFunction;
|
@@ -1,41 +1,7 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
19
|
-
var ownKeys = function(o) {
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
-
var ar = [];
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
-
return ar;
|
24
|
-
};
|
25
|
-
return ownKeys(o);
|
26
|
-
};
|
27
|
-
return function (mod) {
|
28
|
-
if (mod && mod.__esModule) return mod;
|
29
|
-
var result = {};
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
-
__setModuleDefault(result, mod);
|
32
|
-
return result;
|
33
|
-
};
|
34
|
-
})();
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
-
exports.config = exports.checkPassword = exports.logout = exports.login = void 0;
|
37
|
-
const permissions = __importStar(require("../sbvr-api/permissions"));
|
38
|
-
const checkPassword = async (username, password, done) => {
|
1
|
+
import * as permissions from '../sbvr-api/permissions.js';
|
2
|
+
export let login;
|
3
|
+
export let logout;
|
4
|
+
export const checkPassword = async (username, password, done) => {
|
39
5
|
try {
|
40
6
|
const result = await permissions.checkPassword(username, password);
|
41
7
|
done(undefined, result);
|
@@ -44,7 +10,6 @@ const checkPassword = async (username, password, done) => {
|
|
44
10
|
done(undefined, false);
|
45
11
|
}
|
46
12
|
};
|
47
|
-
exports.checkPassword = checkPassword;
|
48
13
|
const setup = async (app) => {
|
49
14
|
if (!process.browser) {
|
50
15
|
const { default: passport } = await import('passport');
|
@@ -57,8 +22,8 @@ const setup = async (app) => {
|
|
57
22
|
passport.deserializeUser((user, done) => {
|
58
23
|
done(null, user);
|
59
24
|
});
|
60
|
-
passport.use(new LocalStrategy(
|
61
|
-
|
25
|
+
passport.use(new LocalStrategy(checkPassword));
|
26
|
+
login = (fn) => (req, res, next) => passport.authenticate('local', ((err, user) => {
|
62
27
|
if (err || user == null || user === false) {
|
63
28
|
fn(err, user, req, res, next);
|
64
29
|
return;
|
@@ -67,7 +32,7 @@ const setup = async (app) => {
|
|
67
32
|
fn(error, user, req, res, next);
|
68
33
|
});
|
69
34
|
}))(req, res, next);
|
70
|
-
|
35
|
+
logout = (req, _res, next) => {
|
71
36
|
req.logout((error) => {
|
72
37
|
if (error) {
|
73
38
|
next(error);
|
@@ -86,8 +51,8 @@ const setup = async (app) => {
|
|
86
51
|
}
|
87
52
|
next();
|
88
53
|
});
|
89
|
-
|
90
|
-
|
54
|
+
login = (fn) => (req, res, next) => {
|
55
|
+
checkPassword(req.body.username, req.body.password, (err, user) => {
|
91
56
|
if (user) {
|
92
57
|
loggedIn = true;
|
93
58
|
loggedInUser = user;
|
@@ -95,7 +60,7 @@ const setup = async (app) => {
|
|
95
60
|
fn(err, user, req, res, next);
|
96
61
|
});
|
97
62
|
};
|
98
|
-
|
63
|
+
logout = (req, _res, next) => {
|
99
64
|
delete req.user;
|
100
65
|
loggedIn = false;
|
101
66
|
loggedInUser = null;
|
@@ -103,7 +68,7 @@ const setup = async (app) => {
|
|
103
68
|
};
|
104
69
|
}
|
105
70
|
};
|
106
|
-
|
71
|
+
export const config = {
|
107
72
|
models: [
|
108
73
|
{
|
109
74
|
customServerCode: { setup },
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"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"}
|
@@ -1,43 +1,7 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
19
|
-
var ownKeys = function(o) {
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
-
var ar = [];
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
-
return ar;
|
24
|
-
};
|
25
|
-
return ownKeys(o);
|
26
|
-
};
|
27
|
-
return function (mod) {
|
28
|
-
if (mod && mod.__esModule) return mod;
|
29
|
-
var result = {};
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
-
__setModuleDefault(result, mod);
|
32
|
-
return result;
|
33
|
-
};
|
34
|
-
})();
|
35
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
36
|
-
exports.PinejsSessionStore = exports.Store = void 0;
|
37
|
-
const express_session_1 = require("express-session");
|
38
|
-
Object.defineProperty(exports, "Store", { enumerable: true, get: function () { return express_session_1.Store; } });
|
39
|
-
const permissions = __importStar(require("../sbvr-api/permissions"));
|
40
|
-
const sbvr_utils_1 = require("../sbvr-api/sbvr-utils");
|
1
|
+
import { Store } from 'express-session';
|
2
|
+
import * as permissions from '../sbvr-api/permissions.js';
|
3
|
+
import { api } from '../sbvr-api/sbvr-utils.js';
|
4
|
+
export { Store };
|
41
5
|
const sessionModel = `
|
42
6
|
Vocabulary: session
|
43
7
|
|
@@ -75,9 +39,9 @@ const asCallback = async (callback, promise) => {
|
|
75
39
|
catch {
|
76
40
|
}
|
77
41
|
};
|
78
|
-
class PinejsSessionStore extends
|
42
|
+
export class PinejsSessionStore extends Store {
|
79
43
|
get = ((sid, callback) => {
|
80
|
-
void asCallback(callback,
|
44
|
+
void asCallback(callback, api.session
|
81
45
|
.get({
|
82
46
|
resource: 'session',
|
83
47
|
id: sid,
|
@@ -100,7 +64,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
100
64
|
data,
|
101
65
|
expiry_time: data?.cookie?.expires ?? null,
|
102
66
|
};
|
103
|
-
void asCallback(callback,
|
67
|
+
void asCallback(callback, api.session.put({
|
104
68
|
resource: 'session',
|
105
69
|
id: sid,
|
106
70
|
passthrough: {
|
@@ -110,7 +74,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
110
74
|
}));
|
111
75
|
});
|
112
76
|
destroy = ((sid, callback) => {
|
113
|
-
void asCallback(callback,
|
77
|
+
void asCallback(callback, api.session.delete({
|
114
78
|
resource: 'session',
|
115
79
|
id: sid,
|
116
80
|
passthrough: {
|
@@ -119,7 +83,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
119
83
|
}));
|
120
84
|
});
|
121
85
|
all = ((callback) => {
|
122
|
-
void asCallback(callback,
|
86
|
+
void asCallback(callback, api.session
|
123
87
|
.get({
|
124
88
|
resource: 'session',
|
125
89
|
passthrough: {
|
@@ -135,7 +99,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
135
99
|
.then((sessions) => sessions.map((s) => s.session_id)));
|
136
100
|
});
|
137
101
|
clear = ((callback) => {
|
138
|
-
void asCallback(callback,
|
102
|
+
void asCallback(callback, api.session.delete({
|
139
103
|
resource: 'session',
|
140
104
|
passthrough: {
|
141
105
|
req: permissions.root,
|
@@ -143,7 +107,7 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
143
107
|
}));
|
144
108
|
});
|
145
109
|
length = ((callback) => {
|
146
|
-
void asCallback(callback,
|
110
|
+
void asCallback(callback, api.session.get({
|
147
111
|
resource: 'session/',
|
148
112
|
passthrough: {
|
149
113
|
req: permissions.rootRead,
|
@@ -193,5 +157,4 @@ class PinejsSessionStore extends express_session_1.Store {
|
|
193
157
|
],
|
194
158
|
};
|
195
159
|
}
|
196
|
-
exports.PinejsSessionStore = PinejsSessionStore;
|
197
160
|
//# sourceMappingURL=pinejs-session-store.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"pinejs-session-store.js","sourceRoot":"","sources":["../../src/pinejs-session-store/pinejs-session-store.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
2
2
|
import { type ODataBinds } from '@balena/odata-to-abstract-sql';
|
3
|
-
import * as sbvrUtils from './sbvr-utils';
|
4
|
-
import type { ODataRequest } from './uri-parser';
|
3
|
+
import * as sbvrUtils from './sbvr-utils.js';
|
4
|
+
import type { ODataRequest } from './uri-parser.js';
|
5
5
|
export declare const compileRequest: (request: ODataRequest) => sbvrUtils.ODataRequest;
|
6
6
|
export declare const resolveOdataBind: (odataBinds: ODataBinds, value: any) => any;
|
7
7
|
export declare const getAndCheckBindValues: (request: Required<Pick<ODataRequest, "vocabulary" | "odataBinds" | "values" | "engine">>, bindings: AbstractSQLCompiler.Binding[]) => Promise<any[]>;
|
@@ -1,51 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
19
|
-
var ownKeys = function(o) {
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
21
|
-
var ar = [];
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
23
|
-
return ar;
|
24
|
-
};
|
25
|
-
return ownKeys(o);
|
26
|
-
};
|
27
|
-
return function (mod) {
|
28
|
-
if (mod && mod.__esModule) return mod;
|
29
|
-
var result = {};
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
31
|
-
__setModuleDefault(result, mod);
|
32
|
-
return result;
|
33
|
-
};
|
34
|
-
})();
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
37
|
-
};
|
38
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
39
|
-
exports.isRuleAffected = exports.getAndCheckBindValues = exports.resolveOdataBind = exports.compileRequest = void 0;
|
40
|
-
const lodash_1 = __importDefault(require("lodash"));
|
41
|
-
const AbstractSQLCompiler = __importStar(require("@balena/abstract-sql-compiler"));
|
42
|
-
const odata_to_abstract_sql_1 = require("@balena/odata-to-abstract-sql");
|
43
|
-
const deepFreeze = require("deep-freeze");
|
44
|
-
const memoizee_1 = __importDefault(require("memoizee"));
|
45
|
-
const env = __importStar(require("../config-loader/env"));
|
46
|
-
const errors_1 = require("./errors");
|
47
|
-
const sbvrUtils = __importStar(require("./sbvr-utils"));
|
48
|
-
const getMemoizedCompileRule = (0, memoizee_1.default)((engine) => env.createCache('abstractSqlCompiler', (abstractSqlQuery) => {
|
1
|
+
import _ from 'lodash';
|
2
|
+
import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
3
|
+
import { odataNameToSqlName, isBindReference, } from '@balena/odata-to-abstract-sql';
|
4
|
+
import deepFreeze from 'deep-freeze';
|
5
|
+
import memoize from 'memoizee';
|
6
|
+
import * as env from '../config-loader/env.js';
|
7
|
+
import { BadRequestError, SqlCompilationError } from './errors.js';
|
8
|
+
import * as sbvrUtils from './sbvr-utils.js';
|
9
|
+
const getMemoizedCompileRule = memoize((engine) => env.createCache('abstractSqlCompiler', (abstractSqlQuery) => {
|
49
10
|
const sqlQuery = AbstractSQLCompiler[engine].compileRule(abstractSqlQuery);
|
50
11
|
const modifiedFields = AbstractSQLCompiler[engine].getModifiedFields(abstractSqlQuery);
|
51
12
|
if (modifiedFields != null) {
|
@@ -56,11 +17,11 @@ const getMemoizedCompileRule = (0, memoizee_1.default)((engine) => env.createCac
|
|
56
17
|
modifiedFields,
|
57
18
|
};
|
58
19
|
}, { weak: true }), { primitive: true });
|
59
|
-
const compileRequest = (request) => {
|
20
|
+
export const compileRequest = (request) => {
|
60
21
|
if (request.abstractSqlQuery != null) {
|
61
22
|
const { engine } = request;
|
62
23
|
if (engine == null) {
|
63
|
-
throw new
|
24
|
+
throw new SqlCompilationError('No database engine specified');
|
64
25
|
}
|
65
26
|
try {
|
66
27
|
const { sqlQuery, modifiedFields } = getMemoizedCompileRule(engine)(request.abstractSqlQuery);
|
@@ -69,20 +30,18 @@ const compileRequest = (request) => {
|
|
69
30
|
}
|
70
31
|
catch (err) {
|
71
32
|
sbvrUtils.logger[request.vocabulary].error('Failed to compile abstract sql: ', request.abstractSqlQuery, err);
|
72
|
-
throw new
|
33
|
+
throw new SqlCompilationError(err);
|
73
34
|
}
|
74
35
|
}
|
75
36
|
return request;
|
76
37
|
};
|
77
|
-
|
78
|
-
|
79
|
-
if (value != null && typeof value === 'object' && (0, odata_to_abstract_sql_1.isBindReference)(value)) {
|
38
|
+
export const resolveOdataBind = (odataBinds, value) => {
|
39
|
+
if (value != null && typeof value === 'object' && isBindReference(value)) {
|
80
40
|
[, value] = odataBinds[value.bind];
|
81
41
|
}
|
82
42
|
return value;
|
83
43
|
};
|
84
|
-
|
85
|
-
const getAndCheckBindValues = async (request, bindings) => {
|
44
|
+
export const getAndCheckBindValues = async (request, bindings) => {
|
86
45
|
const { odataBinds, values, engine } = request;
|
87
46
|
const sqlModelTables = sbvrUtils.getAbstractSqlModel(request).tables;
|
88
47
|
return await Promise.all(bindings.map(async (binding) => {
|
@@ -99,9 +58,9 @@ const getAndCheckBindValues = async (request, bindings) => {
|
|
99
58
|
if (value === undefined) {
|
100
59
|
value = values[fieldName];
|
101
60
|
}
|
102
|
-
value =
|
103
|
-
const sqlTableName =
|
104
|
-
const sqlFieldName =
|
61
|
+
value = resolveOdataBind(odataBinds, value);
|
62
|
+
const sqlTableName = odataNameToSqlName(tableName);
|
63
|
+
const sqlFieldName = odataNameToSqlName(fieldName);
|
105
64
|
const table = sqlModelTables[sqlTableName];
|
106
65
|
const maybeField = (table.modifyFields ?? table.fields).find((f) => f.fieldName === sqlFieldName);
|
107
66
|
if (maybeField == null) {
|
@@ -143,11 +102,10 @@ const getAndCheckBindValues = async (request, bindings) => {
|
|
143
102
|
return await AbstractSQLCompiler[engine].dataTypeValidate(value, field);
|
144
103
|
}
|
145
104
|
catch (err) {
|
146
|
-
throw new
|
105
|
+
throw new BadRequestError(`"${fieldName}" ${err.message}`);
|
147
106
|
}
|
148
107
|
}));
|
149
108
|
};
|
150
|
-
exports.getAndCheckBindValues = getAndCheckBindValues;
|
151
109
|
const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
|
152
110
|
const refs = ruleReferencedFields[modifiedFields.table];
|
153
111
|
if (refs == null) {
|
@@ -159,10 +117,10 @@ const checkModifiedFields = (ruleReferencedFields, modifiedFields) => {
|
|
159
117
|
if (modifiedFields.fields == null) {
|
160
118
|
return true;
|
161
119
|
}
|
162
|
-
return (
|
120
|
+
return (_.intersection(refs[modifiedFields.action], modifiedFields.fields).length >
|
163
121
|
0);
|
164
122
|
};
|
165
|
-
const isRuleAffected = (rule, request) => {
|
123
|
+
export const isRuleAffected = (rule, request) => {
|
166
124
|
if (request?.abstractSqlQuery == null) {
|
167
125
|
return false;
|
168
126
|
}
|
@@ -175,9 +133,8 @@ const isRuleAffected = (rule, request) => {
|
|
175
133
|
return true;
|
176
134
|
}
|
177
135
|
if (Array.isArray(modifiedFields)) {
|
178
|
-
return modifiedFields.some(
|
136
|
+
return modifiedFields.some(_.partial(checkModifiedFields, rule.ruleReferencedFields));
|
179
137
|
}
|
180
138
|
return checkModifiedFields(rule.ruleReferencedFields, modifiedFields);
|
181
139
|
};
|
182
|
-
exports.isRuleAffected = isRuleAffected;
|
183
140
|
//# sourceMappingURL=abstract-sql.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"abstract-sql.js","sourceRoot":"","sources":["../../src/sbvr-api/abstract-sql.ts"],"names":[],"mappings":"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"}
|
@@ -1,20 +1,14 @@
|
|
1
|
-
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
-
};
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.cachedCompile = void 0;
|
7
|
-
const lodash_1 = __importDefault(require("lodash"));
|
1
|
+
import _ from 'lodash';
|
8
2
|
const cacheFile = process.env.PINEJS_CACHE_FILE || '.pinejs-cache.json';
|
9
3
|
let cache = null;
|
10
4
|
let fs;
|
11
5
|
try {
|
12
|
-
fs =
|
6
|
+
fs = await import('fs');
|
13
7
|
}
|
14
8
|
catch {
|
15
9
|
}
|
16
10
|
const SAVE_DEBOUNCE_TIME = 5000;
|
17
|
-
const saveCache =
|
11
|
+
const saveCache = _.debounce(() => {
|
18
12
|
if (fs != null) {
|
19
13
|
fs.writeFile(cacheFile, JSON.stringify(cache), 'utf8', (err) => {
|
20
14
|
if (err) {
|
@@ -23,10 +17,10 @@ const saveCache = lodash_1.default.debounce(() => {
|
|
23
17
|
});
|
24
18
|
}
|
25
19
|
}, SAVE_DEBOUNCE_TIME);
|
26
|
-
const clearCache =
|
20
|
+
const clearCache = _.debounce(() => {
|
27
21
|
cache = null;
|
28
22
|
}, SAVE_DEBOUNCE_TIME * 2);
|
29
|
-
const cachedCompile = (name, version, src, fn) => {
|
23
|
+
export const cachedCompile = (name, version, src, fn) => {
|
30
24
|
if (cache == null) {
|
31
25
|
if (fs != null) {
|
32
26
|
try {
|
@@ -38,14 +32,13 @@ const cachedCompile = (name, version, src, fn) => {
|
|
38
32
|
cache ??= {};
|
39
33
|
}
|
40
34
|
const key = [name, version, JSON.stringify(src)];
|
41
|
-
let result =
|
35
|
+
let result = _.get(cache, key);
|
42
36
|
if (result == null) {
|
43
37
|
result = fn();
|
44
|
-
|
38
|
+
_.set(cache, key, result);
|
45
39
|
saveCache();
|
46
40
|
}
|
47
41
|
clearCache();
|
48
|
-
return
|
42
|
+
return _.cloneDeep(result);
|
49
43
|
};
|
50
|
-
exports.cachedCompile = cachedCompile;
|
51
44
|
//# sourceMappingURL=cached-compile.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"cached-compile.js","sourceRoot":"","sources":["../../src/sbvr-api/cached-compile.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;AACxE,IAAI,KAAK,GAML,IAAI,CAAC;AACT,IAAI,EAAyB,CAAC;AAC9B,IAAI,CAAC;IACJ,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC;AAAC,MAAM,CAAC;AAET,CAAC;AAED,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IACjC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;QAChB,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YAC9D,IAAI,GAAG,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC,EAAE,kBAAkB,CAAC,CAAC;AAEvB,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;IAClC,KAAK,GAAG,IAAI,CAAC;AACd,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;AAE3B,MAAM,CAAC,MAAM,aAAa,GAAG,CAC5B,IAAY,EACZ,OAAe,EACf,GAAQ,EACR,EAAW,EACP,EAAE;IACN,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QACnB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC;YAChB,IAAI,CAAC;gBACJ,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;QACF,CAAC;QACD,KAAK,KAAK,EAAE,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACpB,MAAM,GAAG,EAAE,EAAE,CAAC;QACd,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC;IACb,CAAC;IAKD,UAAU,EAAE,CAAC;IACb,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC,CAAC"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import type { Resolvable } from './common-types';
|
1
|
+
import type { Resolvable } from './common-types.js';
|
2
2
|
import { TypedError } from 'typed-error';
|
3
3
|
export type MappingFunction = <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<Array<U | Error>>;
|
4
4
|
export declare const mapSeries: <T, U>(a: T[], fn: (v: T) => Resolvable<U>) => Promise<U[]>;
|