@balena/pinejs 15.0.0-build-15-x-4acccbc677d2f8b6c23ace10945cd167339fc8df-1 → 15.0.0-build-15-x-c180fde6d07051ad2942276faea12f10ae026031-1
Sign up to get free protection for your applications and to get access to all the features.
- package/.pinejs-cache.json +1 -1
- package/.versionbot/CHANGELOG.yml +1980 -66
- package/CHANGELOG.md +734 -2
- package/out/bin/abstract-sql-compiler.js.map +1 -1
- package/out/bin/sbvr-compiler.js.map +1 -1
- package/out/config-loader/config-loader.js +16 -4
- package/out/config-loader/config-loader.js.map +1 -1
- package/out/database-layer/db.d.ts +1 -0
- package/out/database-layer/db.js +3 -0
- package/out/database-layer/db.js.map +1 -1
- package/out/migrator/async.js +14 -8
- package/out/migrator/async.js.map +1 -1
- package/out/migrator/utils.d.ts +3 -4
- package/out/migrator/utils.js +11 -1
- package/out/migrator/utils.js.map +1 -1
- package/out/passport-pinejs/passport-pinejs.d.ts +1 -1
- package/out/passport-pinejs/passport-pinejs.js +3 -3
- package/out/passport-pinejs/passport-pinejs.js.map +1 -1
- package/out/pinejs-session-store/pinejs-session-store.d.ts +1 -1
- package/out/sbvr-api/abstract-sql.js.map +1 -1
- package/out/sbvr-api/hooks.js +1 -1
- package/out/sbvr-api/hooks.js.map +1 -1
- package/out/sbvr-api/permissions.js +1 -1
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.d.ts +3 -3
- package/out/sbvr-api/sbvr-utils.js +28 -5
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/sbvr-api/translations.js +26 -11
- package/out/sbvr-api/translations.js.map +1 -1
- package/out/sbvr-api/uri-parser.d.ts +1 -1
- package/out/sbvr-api/uri-parser.js.map +1 -1
- package/package.json +19 -17
- package/src/bin/abstract-sql-compiler.ts +1 -2
- package/src/bin/sbvr-compiler.ts +1 -2
- package/src/config-loader/config-loader.ts +24 -7
- package/src/database-layer/db.ts +3 -0
- package/src/migrator/async.ts +22 -12
- package/src/migrator/utils.ts +16 -5
- package/src/passport-pinejs/passport-pinejs.ts +4 -4
- package/src/sbvr-api/abstract-sql.ts +2 -1
- package/src/sbvr-api/hooks.ts +1 -1
- package/src/sbvr-api/permissions.ts +6 -4
- package/src/sbvr-api/sbvr-utils.ts +65 -7
- package/src/sbvr-api/translations.ts +43 -14
- package/src/sbvr-api/uri-parser.ts +5 -5
- package/tsconfig.dev.json +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uri-parser.js","sourceRoot":"","sources":["../../src/sbvr-api/uri-parser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"uri-parser.js","sourceRoot":"","sources":["../../src/sbvr-api/uri-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs",
|
|
3
|
-
"version": "15.0.0-build-15-x-
|
|
3
|
+
"version": "15.0.0-build-15-x-c180fde6d07051ad2942276faea12f10ae026031-1",
|
|
4
4
|
"main": "out/server-glue/module",
|
|
5
5
|
"repository": "git@github.com:balena-io/pinejs.git",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -24,27 +24,27 @@
|
|
|
24
24
|
"prettify": "balena-lint -e js -e ts --fix src build typings Gruntfile.ts"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@balena/abstract-sql-compiler": "
|
|
28
|
-
"@balena/abstract-sql-to-typescript": "2.0.0-build-2-x-
|
|
29
|
-
"@balena/env-parsing": "^1.1.
|
|
30
|
-
"@balena/lf-to-abstract-sql": "^
|
|
31
|
-
"@balena/odata-parser": "^
|
|
32
|
-
"@balena/odata-to-abstract-sql": "^
|
|
27
|
+
"@balena/abstract-sql-compiler": "9.0.0-build-8-x-86e7db1f10d87661af5de8184f6ca8c621d9dfcc-1",
|
|
28
|
+
"@balena/abstract-sql-to-typescript": "2.0.0-build-2-x-9258cf7866b55ef5ffa051bd4a1aa5b612350d03-1",
|
|
29
|
+
"@balena/env-parsing": "^1.1.5",
|
|
30
|
+
"@balena/lf-to-abstract-sql": "^5.0.0",
|
|
31
|
+
"@balena/odata-parser": "^3.0.0",
|
|
32
|
+
"@balena/odata-to-abstract-sql": "^6.0.1",
|
|
33
33
|
"@balena/sbvr-parser": "^1.4.3",
|
|
34
|
-
"@balena/sbvr-types": "4.0.0
|
|
34
|
+
"@balena/sbvr-types": "^4.0.0",
|
|
35
35
|
"@types/body-parser": "^1.19.2",
|
|
36
36
|
"@types/compression": "^1.7.2",
|
|
37
37
|
"@types/cookie-parser": "^1.4.3",
|
|
38
38
|
"@types/deep-freeze": "^0.1.2",
|
|
39
|
-
"@types/express": "^4.17.
|
|
40
|
-
"@types/express-session": "^1.17.
|
|
39
|
+
"@types/express": "^4.17.17",
|
|
40
|
+
"@types/express-session": "^1.17.6",
|
|
41
41
|
"@types/lodash": "^4.14.191",
|
|
42
42
|
"@types/memoizee": "^0.4.8",
|
|
43
43
|
"@types/method-override": "^0.0.32",
|
|
44
44
|
"@types/multer": "^1.4.7",
|
|
45
45
|
"@types/mysql": "^2.15.21",
|
|
46
|
-
"@types/node": "^18.
|
|
47
|
-
"@types/passport": "^1.0.
|
|
46
|
+
"@types/node": "^18.14.1",
|
|
47
|
+
"@types/passport": "^1.0.12",
|
|
48
48
|
"@types/passport-local": "^1.0.35",
|
|
49
49
|
"@types/passport-strategy": "^0.2.35",
|
|
50
50
|
"@types/pg": "^8.6.6",
|
|
@@ -62,6 +62,7 @@
|
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"@balena/lint": "^6.2.1",
|
|
65
|
+
"@faker-js/faker": "^7.6.0",
|
|
65
66
|
"@types/chai": "^4.3.4",
|
|
66
67
|
"@types/chai-as-promised": "^7.1.5",
|
|
67
68
|
"@types/grunt": "^0.4.27",
|
|
@@ -82,22 +83,23 @@
|
|
|
82
83
|
"grunt-ts": "^6.0.0-beta.22",
|
|
83
84
|
"grunt-webpack": "^5.0.0",
|
|
84
85
|
"husky": "^8.0.3",
|
|
85
|
-
"lint-staged": "^13.1.
|
|
86
|
+
"lint-staged": "^13.1.2",
|
|
86
87
|
"load-grunt-tasks": "^5.1.0",
|
|
87
88
|
"mocha": "^10.2.0",
|
|
89
|
+
"pinejs-client-supertest": "^1.4.0",
|
|
88
90
|
"raw-loader": "^4.0.2",
|
|
89
91
|
"require-npm4-to-publish": "^1.0.0",
|
|
90
92
|
"supertest": "^6.3.3",
|
|
91
93
|
"terser-webpack-plugin": "^5.3.6",
|
|
92
94
|
"ts-loader": "^9.4.2",
|
|
93
95
|
"ts-node": "^10.9.1",
|
|
94
|
-
"typescript": "^4.9.
|
|
96
|
+
"typescript": "^4.9.5",
|
|
95
97
|
"webpack": "^5.75.0",
|
|
96
98
|
"webpack-dev-server": "^4.11.1"
|
|
97
99
|
},
|
|
98
100
|
"optionalDependencies": {
|
|
99
101
|
"bcrypt": "^5.1.0",
|
|
100
|
-
"body-parser": "^1.20.
|
|
102
|
+
"body-parser": "^1.20.2",
|
|
101
103
|
"compression": "^1.7.4",
|
|
102
104
|
"cookie-parser": "^1.4.6",
|
|
103
105
|
"express": "^4.18.2",
|
|
@@ -106,7 +108,7 @@
|
|
|
106
108
|
"mysql": "^2.18.1",
|
|
107
109
|
"passport": "^0.6.0",
|
|
108
110
|
"passport-local": "^1.0.0",
|
|
109
|
-
"pg": "^8.
|
|
111
|
+
"pg": "^8.9.0",
|
|
110
112
|
"pg-connection-string": "^2.5.0",
|
|
111
113
|
"serve-static": "^1.15.0"
|
|
112
114
|
},
|
|
@@ -132,6 +134,6 @@
|
|
|
132
134
|
"recursive": true
|
|
133
135
|
},
|
|
134
136
|
"versionist": {
|
|
135
|
-
"publishedAt": "2023-
|
|
137
|
+
"publishedAt": "2023-04-27T09:01:38.758Z"
|
|
136
138
|
}
|
|
137
139
|
}
|
|
@@ -22,8 +22,7 @@ const generateTypes = (inputFile: string, outputFile?: string) => {
|
|
|
22
22
|
const { abstractSqlToTypescriptTypes } =
|
|
23
23
|
require('@balena/abstract-sql-to-typescript') as typeof import('@balena/abstract-sql-to-typescript');
|
|
24
24
|
const abstractSql = getAbstractSqlModelFromFile(inputFile);
|
|
25
|
-
|
|
26
|
-
const types = abstractSqlToTypescriptTypes(abstractSql as any);
|
|
25
|
+
const types = abstractSqlToTypescriptTypes(abstractSql);
|
|
27
26
|
|
|
28
27
|
writeAll(types, outputFile);
|
|
29
28
|
};
|
package/src/bin/sbvr-compiler.ts
CHANGED
|
@@ -48,8 +48,7 @@ const generateTypes = (inputFile: string, outputFile?: string) => {
|
|
|
48
48
|
);
|
|
49
49
|
const { abstractSqlToTypescriptTypes } =
|
|
50
50
|
require('@balena/abstract-sql-to-typescript') as typeof import('@balena/abstract-sql-to-typescript');
|
|
51
|
-
|
|
52
|
-
const types = abstractSqlToTypescriptTypes(models.abstractSql as any);
|
|
51
|
+
const types = abstractSqlToTypescriptTypes(models.abstractSql);
|
|
53
52
|
|
|
54
53
|
writeAll(types, outputFile);
|
|
55
54
|
};
|
|
@@ -16,6 +16,8 @@ import {
|
|
|
16
16
|
Migrations,
|
|
17
17
|
defaultMigrationCategory,
|
|
18
18
|
MigrationCategories,
|
|
19
|
+
isSyncMigration,
|
|
20
|
+
isAsyncMigration,
|
|
19
21
|
} from '../migrator/utils';
|
|
20
22
|
|
|
21
23
|
import * as fs from 'fs';
|
|
@@ -193,8 +195,15 @@ export const setup = (app: Express.Application) => {
|
|
|
193
195
|
);
|
|
194
196
|
|
|
195
197
|
const apiRoute = `/${model.apiRoot}/*`;
|
|
196
|
-
app
|
|
197
|
-
|
|
198
|
+
app
|
|
199
|
+
.route(apiRoute)
|
|
200
|
+
.options((_req, res) => res.status(200).end())
|
|
201
|
+
.get(sbvrUtils.handleODataRequest)
|
|
202
|
+
.put(sbvrUtils.handleODataRequest)
|
|
203
|
+
.post(sbvrUtils.handleODataRequest)
|
|
204
|
+
.patch(sbvrUtils.handleODataRequest)
|
|
205
|
+
.merge(sbvrUtils.handleODataRequest)
|
|
206
|
+
.delete(sbvrUtils.handleODataRequest);
|
|
198
207
|
|
|
199
208
|
console.info(
|
|
200
209
|
'Successfully executed ' + model.modelName + ' model.',
|
|
@@ -342,11 +351,19 @@ export const setup = (app: Express.Application) => {
|
|
|
342
351
|
case '.coffee':
|
|
343
352
|
case '.ts':
|
|
344
353
|
case '.js':
|
|
345
|
-
const
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
354
|
+
const loadeMigration = nodeRequire(filePath);
|
|
355
|
+
const migration = loadeMigration.default ?? loadeMigration;
|
|
356
|
+
|
|
357
|
+
if (
|
|
358
|
+
!isAsyncMigration(migration) &&
|
|
359
|
+
!isSyncMigration(migration)
|
|
360
|
+
) {
|
|
361
|
+
throw new Error(
|
|
362
|
+
`loaded migraton file at ${filePath} is neither a synchron nor a asyncron migration definition`,
|
|
363
|
+
);
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
assignMigrationWithCategory(migrationKey, migration);
|
|
350
367
|
break;
|
|
351
368
|
case '.sql':
|
|
352
369
|
if (migrationCategory === MigrationCategories.async) {
|
package/src/database-layer/db.ts
CHANGED
package/src/migrator/async.ts
CHANGED
|
@@ -14,7 +14,6 @@ type InitialMigrationStatus = MigrationStatus &
|
|
|
14
14
|
import {
|
|
15
15
|
MigrationTuple,
|
|
16
16
|
AsyncMigrationFn,
|
|
17
|
-
setExecutedMigrations,
|
|
18
17
|
getExecutedMigrations,
|
|
19
18
|
migratorEnv,
|
|
20
19
|
lockMigrations,
|
|
@@ -64,19 +63,10 @@ const $run = async (
|
|
|
64
63
|
}> = [];
|
|
65
64
|
|
|
66
65
|
// get a transaction for setting up the async migrator
|
|
67
|
-
const modelIsNew = await sbvrUtils.isModelNew(setupTx, modelName);
|
|
68
|
-
const executedMigrations = await getExecutedMigrations(setupTx, modelName);
|
|
69
66
|
|
|
70
|
-
|
|
71
|
-
(sbvrUtils.api.migrations?.logger.info ?? console.info)(
|
|
72
|
-
'First time model has executed, skipping async migrations',
|
|
73
|
-
);
|
|
67
|
+
const executedMigrations = await getExecutedMigrations(setupTx, modelName);
|
|
74
68
|
|
|
75
|
-
|
|
76
|
-
...executedMigrations,
|
|
77
|
-
...Object.keys(migrations),
|
|
78
|
-
]);
|
|
79
|
-
}
|
|
69
|
+
// if the model is new, the sync migration parts (marked by finalize=true) are already marked in the sync migration runner.
|
|
80
70
|
|
|
81
71
|
/**
|
|
82
72
|
* preflight check if there are already migrations executed before starting the async scheduler
|
|
@@ -246,6 +236,26 @@ const $run = async (
|
|
|
246
236
|
// when it fails it would break the transaction for managing the migration status
|
|
247
237
|
const migratedRows = await sbvrUtils.db.transaction(
|
|
248
238
|
async (migrationTx) => {
|
|
239
|
+
// disable automatic close on the management transaction as the migration transaction consumes up to max autoClose time
|
|
240
|
+
// disable first here, to let if fail when it takes to long before coming here to actually migrate.
|
|
241
|
+
tx.disableAutomaticClose();
|
|
242
|
+
const rollbackMigrationTx = async () => {
|
|
243
|
+
// if the parent transaction fails for any reason, the actual running migration transaction has to be rolled back to stop parallel unsafe async migrations.
|
|
244
|
+
try {
|
|
245
|
+
if (!migrationTx.isClosed()) {
|
|
246
|
+
await migrationTx.rollback();
|
|
247
|
+
}
|
|
248
|
+
} catch (err) {
|
|
249
|
+
(
|
|
250
|
+
sbvrUtils.api.migrations?.logger.error ??
|
|
251
|
+
console.error
|
|
252
|
+
)(
|
|
253
|
+
`error rolling back pending async migration tx on mgmt tx end/rollback: ${key}: ${err}`,
|
|
254
|
+
);
|
|
255
|
+
}
|
|
256
|
+
};
|
|
257
|
+
tx.on('rollback', rollbackMigrationTx);
|
|
258
|
+
tx.on('end', rollbackMigrationTx);
|
|
249
259
|
return (
|
|
250
260
|
(await asyncRunnerMigratorFn?.(migrationTx)) ?? 0
|
|
251
261
|
);
|
package/src/migrator/utils.ts
CHANGED
|
@@ -19,11 +19,17 @@ export const migrations: Migrations = {
|
|
|
19
19
|
await tx.executeSql(`\
|
|
20
20
|
ALTER TABLE "migration"
|
|
21
21
|
MODIFY "executed migrations" JSON NOT NULL;`);
|
|
22
|
+
await tx.executeSql(`\
|
|
23
|
+
ALTER TABLE "migration status"
|
|
24
|
+
MODIFY "is backing off" JSON NOT NULL;`);
|
|
22
25
|
break;
|
|
23
26
|
case 'postgres':
|
|
24
27
|
await tx.executeSql(`\
|
|
25
28
|
ALTER TABLE "migration"
|
|
26
29
|
ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
30
|
+
await tx.executeSql(`\
|
|
31
|
+
ALTER TABLE "migration status"
|
|
32
|
+
ALTER COLUMN "is backing off" SET DATA TYPE JSONB USING b::JSONB;`);
|
|
27
33
|
break;
|
|
28
34
|
// No need to migrate for websql
|
|
29
35
|
}
|
|
@@ -53,8 +59,7 @@ export type AsyncMigrationFn = (
|
|
|
53
59
|
) => Resolvable<Result>;
|
|
54
60
|
|
|
55
61
|
type AddFn<T extends {}, x extends 'sync' | 'async'> = T & {
|
|
56
|
-
syncFn:
|
|
57
|
-
asyncFn: AsyncMigrationFn;
|
|
62
|
+
[key in `${x}Fn`]: key extends 'syncFn' ? MigrationFn : AsyncMigrationFn;
|
|
58
63
|
} & {
|
|
59
64
|
[key in `${x}Sql`]?: undefined;
|
|
60
65
|
};
|
|
@@ -79,13 +84,19 @@ export type AsyncMigration =
|
|
|
79
84
|
| AddFn<AddSql<BaseAsyncMigration, 'sync'>, 'async'>;
|
|
80
85
|
|
|
81
86
|
export function isAsyncMigration(
|
|
82
|
-
migration: AsyncMigration | RunnableMigrations,
|
|
87
|
+
migration: string | MigrationFn | AsyncMigration | RunnableMigrations,
|
|
83
88
|
): migration is AsyncMigration {
|
|
84
|
-
return (
|
|
89
|
+
return (
|
|
90
|
+
((typeof (migration as AsyncMigration).asyncFn === 'function' ||
|
|
91
|
+
typeof (migration as AsyncMigration).asyncSql === 'string') &&
|
|
92
|
+
(typeof (migration as AsyncMigration).syncFn === 'function' ||
|
|
93
|
+
typeof (migration as AsyncMigration).syncSql === 'string')) ||
|
|
94
|
+
(migration as AsyncMigration).type === MigrationCategories.async
|
|
95
|
+
);
|
|
85
96
|
}
|
|
86
97
|
|
|
87
98
|
export function isSyncMigration(
|
|
88
|
-
migration: string | MigrationFn | RunnableMigrations,
|
|
99
|
+
migration: string | MigrationFn | RunnableMigrations | AsyncMigration,
|
|
89
100
|
): migration is MigrationFn {
|
|
90
101
|
return typeof migration === 'function' || typeof migration === 'string';
|
|
91
102
|
}
|
|
@@ -10,7 +10,7 @@ import * as permissions from '../sbvr-api/permissions';
|
|
|
10
10
|
export let login: (
|
|
11
11
|
fn: (
|
|
12
12
|
err: any,
|
|
13
|
-
user: {} | undefined,
|
|
13
|
+
user: {} | null | false | undefined,
|
|
14
14
|
req: Express.Request,
|
|
15
15
|
res: Express.Response,
|
|
16
16
|
next: Express.NextFunction,
|
|
@@ -54,15 +54,15 @@ const setup: ConfigLoader.SetupFunction = async (app: Express.Application) => {
|
|
|
54
54
|
passport.use(new LocalStrategy(checkPassword));
|
|
55
55
|
|
|
56
56
|
login = (fn) => (req, res, next) =>
|
|
57
|
-
passport.authenticate('local', (err, user
|
|
58
|
-
if (err || user == null) {
|
|
57
|
+
passport.authenticate('local', ((err, user) => {
|
|
58
|
+
if (err || user == null || user === false) {
|
|
59
59
|
fn(err, user, req, res, next);
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
req.login(user, (error) => {
|
|
63
63
|
fn(error, user, req, res, next);
|
|
64
64
|
});
|
|
65
|
-
})(req, res, next);
|
|
65
|
+
}) as Passport.AuthenticateCallback)(req, res, next);
|
|
66
66
|
|
|
67
67
|
logout = (req, _res, next) => {
|
|
68
68
|
req.logout((error) => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as _ from 'lodash';
|
|
2
2
|
|
|
3
3
|
import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
|
|
4
|
+
import type { BindKey } from '@balena/odata-parser';
|
|
4
5
|
import {
|
|
5
6
|
ODataBinds,
|
|
6
7
|
odataNameToSqlName,
|
|
@@ -123,7 +124,7 @@ export const getAndCheckBindValues = async (
|
|
|
123
124
|
throw new Error('Invalid binding');
|
|
124
125
|
}
|
|
125
126
|
let dataType;
|
|
126
|
-
[dataType, value] = odataBinds[bindValue];
|
|
127
|
+
[dataType, value] = odataBinds[bindValue as BindKey];
|
|
127
128
|
field = { dataType };
|
|
128
129
|
} else {
|
|
129
130
|
throw new Error(`Unknown binding: ${binding}`);
|
package/src/sbvr-api/hooks.ts
CHANGED
|
@@ -442,7 +442,7 @@ export const runHooks = async <T extends keyof Hooks>(
|
|
|
442
442
|
await Promise.all(
|
|
443
443
|
(modelHooks as Array<Hook<HookFn>>).map(async (hook) => {
|
|
444
444
|
if (hook.readOnlyTx) {
|
|
445
|
-
modelReadOnlyArgs ??= getReadOnlyArgs(modelName,
|
|
445
|
+
modelReadOnlyArgs ??= getReadOnlyArgs(modelName, modelArgs);
|
|
446
446
|
await hook.run(modelReadOnlyArgs);
|
|
447
447
|
} else {
|
|
448
448
|
await hook.run(modelArgs);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type {
|
|
2
2
|
AbstractSqlModel,
|
|
3
3
|
AbstractSqlQuery,
|
|
4
|
-
AbstractSqlType,
|
|
5
4
|
AliasNode,
|
|
5
|
+
AnyTypeNodes,
|
|
6
6
|
Definition,
|
|
7
7
|
FieldNode,
|
|
8
8
|
ReferencedFieldNode,
|
|
@@ -657,7 +657,7 @@ const generateConstrainedAbstractSql = (
|
|
|
657
657
|
const select = abstractSqlQuery.find(
|
|
658
658
|
(v): v is SelectNode => v[0] === 'Select',
|
|
659
659
|
)!;
|
|
660
|
-
select[1] = select[1].map((selectField):
|
|
660
|
+
select[1] = select[1].map((selectField): AnyTypeNodes => {
|
|
661
661
|
if (selectField[0] === 'Alias') {
|
|
662
662
|
const sqlName = odataNameToSqlName((selectField as AliasNode<any>)[2]);
|
|
663
663
|
const maybeField = (
|
|
@@ -1045,7 +1045,9 @@ const getBoundConstrainedMemoizer = memoizeWeak(
|
|
|
1045
1045
|
permissionsLookup,
|
|
1046
1046
|
permissions,
|
|
1047
1047
|
vocabulary,
|
|
1048
|
-
sqlNameToODataName(
|
|
1048
|
+
sqlNameToODataName(
|
|
1049
|
+
permissionsTable.modifyName ?? permissionsTable.name,
|
|
1050
|
+
),
|
|
1049
1051
|
),
|
|
1050
1052
|
);
|
|
1051
1053
|
|
|
@@ -1603,7 +1605,7 @@ const getGuestPermissions = memoize(
|
|
|
1603
1605
|
|
|
1604
1606
|
const getReqPermissions = async (
|
|
1605
1607
|
req: PermissionReq,
|
|
1606
|
-
odataBinds: ODataBinds = [],
|
|
1608
|
+
odataBinds: ODataBinds = [] as any as ODataBinds,
|
|
1607
1609
|
) => {
|
|
1608
1610
|
const guestPermissions = await (async () => {
|
|
1609
1611
|
if (
|
|
@@ -23,6 +23,7 @@ import { version as AbstractSQLCompilerVersion } from '@balena/abstract-sql-comp
|
|
|
23
23
|
import * as LF2AbstractSQL from '@balena/lf-to-abstract-sql';
|
|
24
24
|
|
|
25
25
|
import {
|
|
26
|
+
ODataBinds,
|
|
26
27
|
odataNameToSqlName,
|
|
27
28
|
sqlNameToODataName,
|
|
28
29
|
SupportedMethod,
|
|
@@ -372,12 +373,60 @@ export const isModelNew = async (
|
|
|
372
373
|
return !cachedIsModelNew.has(modelName);
|
|
373
374
|
};
|
|
374
375
|
|
|
376
|
+
const bindsForAffectedIds = (
|
|
377
|
+
bindings: AbstractSQLCompiler.Binding[],
|
|
378
|
+
request?: Pick<
|
|
379
|
+
uriParser.ODataRequest,
|
|
380
|
+
| 'vocabulary'
|
|
381
|
+
| 'abstractSqlModel'
|
|
382
|
+
| 'method'
|
|
383
|
+
| 'resourceName'
|
|
384
|
+
| 'affectedIds'
|
|
385
|
+
>,
|
|
386
|
+
) => {
|
|
387
|
+
if (request?.affectedIds == null) {
|
|
388
|
+
return {};
|
|
389
|
+
}
|
|
390
|
+
|
|
391
|
+
const tableName =
|
|
392
|
+
getAbstractSqlModel(request).tables[resolveSynonym(request)].name;
|
|
393
|
+
|
|
394
|
+
// If we're deleting the affected IDs then we can't narrow our rule to
|
|
395
|
+
// those IDs that are now missing
|
|
396
|
+
const isDelete = request.method === 'DELETE';
|
|
397
|
+
|
|
398
|
+
const odataBinds: { [key: string]: any } = {};
|
|
399
|
+
for (const bind of bindings) {
|
|
400
|
+
if (
|
|
401
|
+
bind.length !== 2 ||
|
|
402
|
+
bind[0] !== 'Bind' ||
|
|
403
|
+
typeof bind[1] !== 'string'
|
|
404
|
+
) {
|
|
405
|
+
continue;
|
|
406
|
+
}
|
|
407
|
+
|
|
408
|
+
const bindName = bind[1];
|
|
409
|
+
if (!isDelete && bindName === tableName) {
|
|
410
|
+
odataBinds[bindName] = ['Text', `{${request.affectedIds}}`];
|
|
411
|
+
} else {
|
|
412
|
+
odataBinds[bindName] = ['Text', '{}'];
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
return odataBinds;
|
|
417
|
+
};
|
|
418
|
+
|
|
375
419
|
export const validateModel = async (
|
|
376
420
|
tx: Db.Tx,
|
|
377
421
|
modelName: string,
|
|
378
422
|
request?: Pick<
|
|
379
423
|
uriParser.ODataRequest,
|
|
380
|
-
|
|
424
|
+
| 'abstractSqlQuery'
|
|
425
|
+
| 'modifiedFields'
|
|
426
|
+
| 'method'
|
|
427
|
+
| 'vocabulary'
|
|
428
|
+
| 'resourceName'
|
|
429
|
+
| 'affectedIds'
|
|
381
430
|
>,
|
|
382
431
|
): Promise<void> => {
|
|
383
432
|
const { sql } = models[modelName];
|
|
@@ -394,7 +443,16 @@ export const validateModel = async (
|
|
|
394
443
|
const values = await getAndCheckBindValues(
|
|
395
444
|
{
|
|
396
445
|
vocabulary: modelName,
|
|
397
|
-
|
|
446
|
+
// TODO: `odataBinds` is of type `ODataBinds`, which is an
|
|
447
|
+
// array with extra arbitrary fields. `getAndCheckBindValues`
|
|
448
|
+
// accepts that and also a pure object form for this
|
|
449
|
+
// argument. Given how arrays have predefined symbols,
|
|
450
|
+
// `bindsForAffectedIds` cannot return an `ODataBinds`.
|
|
451
|
+
// Both `ODataBinds` and `getAndCheckBindValues` should be
|
|
452
|
+
// fixed to accept a pure object with both string and
|
|
453
|
+
// numerical keys, for named and positional binds
|
|
454
|
+
// respectively
|
|
455
|
+
odataBinds: bindsForAffectedIds(rule.bindings, request) as any,
|
|
398
456
|
values: {},
|
|
399
457
|
engine: db.engine,
|
|
400
458
|
},
|
|
@@ -832,7 +890,7 @@ export const runRule = (() => {
|
|
|
832
890
|
const values = await getAndCheckBindValues(
|
|
833
891
|
{
|
|
834
892
|
vocabulary: vocab,
|
|
835
|
-
odataBinds: [],
|
|
893
|
+
odataBinds: [] as any as ODataBinds,
|
|
836
894
|
values: {},
|
|
837
895
|
engine: db.engine,
|
|
838
896
|
},
|
|
@@ -1479,7 +1537,8 @@ const updateBinds = (
|
|
|
1479
1537
|
request: uriParser.ODataRequest,
|
|
1480
1538
|
) => {
|
|
1481
1539
|
if (request._defer) {
|
|
1482
|
-
|
|
1540
|
+
for (let i = 0; i < request.odataBinds.length; i++) {
|
|
1541
|
+
const [tag, id] = request.odataBinds[i];
|
|
1483
1542
|
if (tag === 'ContentReference') {
|
|
1484
1543
|
const ref = changeSetResults.get(id);
|
|
1485
1544
|
if (
|
|
@@ -1491,10 +1550,9 @@ const updateBinds = (
|
|
|
1491
1550
|
'Reference to a non existing resource in Changeset',
|
|
1492
1551
|
);
|
|
1493
1552
|
}
|
|
1494
|
-
|
|
1553
|
+
request.odataBinds[i] = uriParser.parseId(ref.body.id);
|
|
1495
1554
|
}
|
|
1496
|
-
|
|
1497
|
-
});
|
|
1555
|
+
}
|
|
1498
1556
|
}
|
|
1499
1557
|
return request;
|
|
1500
1558
|
};
|
|
@@ -24,47 +24,75 @@ export type AliasValidNodeType =
|
|
|
24
24
|
| UnknownTypeNodes
|
|
25
25
|
| NullNode;
|
|
26
26
|
const aliasFields = (
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
fromAbstractSqlModel: AbstractSqlModel,
|
|
28
|
+
toAbstractSqlModel: AbstractSqlModel,
|
|
29
|
+
fromResourceName: string,
|
|
30
|
+
toResource: string,
|
|
29
31
|
aliases: Dictionary<string | AliasValidNodeType>,
|
|
30
32
|
): SelectNode[1] => {
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
);
|
|
34
|
-
const nonexistentFields = _.difference(Object.keys(aliases),
|
|
33
|
+
const fromFieldNames = fromAbstractSqlModel.tables[
|
|
34
|
+
fromResourceName
|
|
35
|
+
].fields.map(({ fieldName }) => fieldName);
|
|
36
|
+
const nonexistentFields = _.difference(Object.keys(aliases), fromFieldNames);
|
|
35
37
|
if (nonexistentFields.length > 0) {
|
|
36
38
|
throw new Error(
|
|
37
39
|
`Tried to alias non-existent fields: '${nonexistentFields.join(', ')}'`,
|
|
38
40
|
);
|
|
39
41
|
}
|
|
40
|
-
|
|
42
|
+
const toFieldNames = toAbstractSqlModel.tables[toResource].fields.map(
|
|
43
|
+
({ fieldName }) => fieldName,
|
|
44
|
+
);
|
|
45
|
+
const checkToFieldExists = (fromFieldName: string, toFieldName: string) => {
|
|
46
|
+
if (!toFieldNames.includes(toFieldName)) {
|
|
47
|
+
throw new Error(
|
|
48
|
+
`Tried to alias '${fromFieldName}' to the non-existent target field: '${toFieldName}'`,
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
return fromFieldNames.map(
|
|
41
53
|
(fieldName): AliasNode<AliasValidNodeType> | ReferencedFieldNode => {
|
|
42
54
|
const alias = aliases[fieldName];
|
|
43
55
|
if (alias) {
|
|
44
56
|
if (typeof alias === 'string') {
|
|
45
|
-
|
|
57
|
+
checkToFieldExists(fieldName, alias);
|
|
58
|
+
return [
|
|
59
|
+
'Alias',
|
|
60
|
+
['ReferencedField', fromResourceName, alias],
|
|
61
|
+
fieldName,
|
|
62
|
+
];
|
|
46
63
|
}
|
|
47
64
|
return ['Alias', alias, fieldName];
|
|
48
65
|
}
|
|
49
|
-
|
|
66
|
+
checkToFieldExists(fieldName, fieldName);
|
|
67
|
+
return ['ReferencedField', fromResourceName, fieldName];
|
|
50
68
|
},
|
|
51
69
|
);
|
|
52
70
|
};
|
|
53
71
|
|
|
54
72
|
const aliasResource = (
|
|
55
|
-
|
|
56
|
-
|
|
73
|
+
fromAbstractSqlModel: AbstractSqlModel,
|
|
74
|
+
toAbstractSqlModel: AbstractSqlModel,
|
|
75
|
+
fromResourceName: string,
|
|
57
76
|
toResource: string,
|
|
58
77
|
aliases: Dictionary<string | AliasValidNodeType>,
|
|
59
78
|
): Definition => {
|
|
60
|
-
if (!
|
|
79
|
+
if (!toAbstractSqlModel.tables[toResource]) {
|
|
61
80
|
throw new Error(`Tried to alias to a non-existent resource: ${toResource}`);
|
|
62
81
|
}
|
|
63
82
|
return {
|
|
64
83
|
abstractSql: [
|
|
65
84
|
'SelectQuery',
|
|
66
|
-
[
|
|
67
|
-
|
|
85
|
+
[
|
|
86
|
+
'Select',
|
|
87
|
+
aliasFields(
|
|
88
|
+
fromAbstractSqlModel,
|
|
89
|
+
toAbstractSqlModel,
|
|
90
|
+
fromResourceName,
|
|
91
|
+
toResource,
|
|
92
|
+
aliases,
|
|
93
|
+
),
|
|
94
|
+
],
|
|
95
|
+
['From', ['Alias', ['Resource', toResource], fromResourceName]],
|
|
68
96
|
],
|
|
69
97
|
};
|
|
70
98
|
};
|
|
@@ -196,6 +224,7 @@ export const translateAbstractSqlModel = (
|
|
|
196
224
|
} else {
|
|
197
225
|
table.definition = aliasResource(
|
|
198
226
|
fromAbstractSqlModel,
|
|
227
|
+
toAbstractSqlModel,
|
|
199
228
|
key,
|
|
200
229
|
toResource,
|
|
201
230
|
definition,
|