@balena/pinejs 15.0.0-delete-state-default-user-permissions-57ce3dc6141cd1e8159f4c34da29d1fb113242c6 → 15.0.0-delete-state-default-user-permissions-8b5de27c634f2e7581f0bcf3600066d2fe4bbf40
Sign up to get free protection for your applications and to get access to all the features.
- package/.versionbot/CHANGELOG.yml +85 -2
- package/CHANGELOG.md +35 -1
- package/out/config-loader/config-loader.d.ts +2 -4
- package/out/config-loader/config-loader.js +25 -3
- 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.map +1 -1
- package/out/migrator/sync.d.ts +9 -0
- package/out/migrator/sync.js +121 -0
- package/out/migrator/sync.js.map +1 -0
- package/out/migrator/utils.d.ts +28 -0
- package/out/migrator/utils.js +105 -0
- package/out/migrator/utils.js.map +1 -0
- package/out/passport-pinejs/passport-pinejs.js +3 -2
- package/out/passport-pinejs/passport-pinejs.js.map +1 -1
- package/out/sbvr-api/permissions.d.ts +5 -4
- package/out/sbvr-api/permissions.js +20 -18
- package/out/sbvr-api/permissions.js.map +1 -1
- package/out/sbvr-api/sbvr-utils.js +3 -3
- package/out/sbvr-api/sbvr-utils.js.map +1 -1
- package/out/server-glue/module.d.ts +2 -2
- package/out/server-glue/module.js +2 -1
- package/out/server-glue/module.js.map +1 -1
- package/package.json +14 -14
- package/src/config-loader/config-loader.ts +54 -9
- package/src/config-loader/env.ts +3 -1
- package/src/migrator/sync.ts +171 -0
- package/src/migrator/utils.ts +160 -0
- package/src/passport-pinejs/passport-pinejs.ts +3 -2
- package/src/sbvr-api/permissions.ts +44 -20
- package/src/sbvr-api/sbvr-utils.ts +3 -3
- package/src/server-glue/module.ts +3 -2
- package/out/migrator/migrator.d.ts +0 -17
- package/out/migrator/migrator.js +0 -185
- package/out/migrator/migrator.js.map +0 -1
- package/src/migrator/migrator.ts +0 -278
@@ -1,6 +1,6 @@
|
|
1
1
|
- commits:
|
2
2
|
- subject: Delete default user permissions that are no longer in the config
|
3
|
-
hash:
|
3
|
+
hash: 8b5de27c634f2e7581f0bcf3600066d2fe4bbf40
|
4
4
|
body: ""
|
5
5
|
footer:
|
6
6
|
Change-type: major
|
@@ -13,7 +13,90 @@
|
|
13
13
|
nested: []
|
14
14
|
version: 15.0.0
|
15
15
|
title: "'Delete default user permissions that are no longer in the config'"
|
16
|
-
date: 2022-
|
16
|
+
date: 2022-07-07T13:01:19.425Z
|
17
|
+
- commits:
|
18
|
+
- subject: Fix for passport.js update 0.6.0
|
19
|
+
hash: c26d33dd13e4139b970e5bd594982786a1c56cea
|
20
|
+
body: |
|
21
|
+
passport.js 0.6.0 introduces a mandatory callback done function.
|
22
|
+
Updated logout argument which should remain backwards compatible
|
23
|
+
footer:
|
24
|
+
Change-type: minor
|
25
|
+
change-type: minor
|
26
|
+
Signed-off-by: Harald Fischer <harald@balena.io>
|
27
|
+
signed-off-by: Harald Fischer <harald@balena.io>
|
28
|
+
author: Harald Fischer
|
29
|
+
nested: []
|
30
|
+
version: 14.46.0
|
31
|
+
title: "'Fix for passport.js update 0.6.0'"
|
32
|
+
date: 2022-06-21T23:27:28.468Z
|
33
|
+
- commits:
|
34
|
+
- subject: Update dependencies
|
35
|
+
hash: fb47772d628789b77288e7e0e90f3740f6cd27d8
|
36
|
+
body: |
|
37
|
+
Update @balena/odata-parser from 2.2.9 to 2.3.0
|
38
|
+
Update @balena/odata-to-abstract-sql from 5.4.11 to 5.4.12
|
39
|
+
footer:
|
40
|
+
Change-type: patch
|
41
|
+
change-type: patch
|
42
|
+
author: Pagan Gazzard
|
43
|
+
nested:
|
44
|
+
- commits:
|
45
|
+
- subject: Add source map
|
46
|
+
hash: a6bb5e67fac1cdcc69491800ad042f003fa13556
|
47
|
+
body: ""
|
48
|
+
footer:
|
49
|
+
Change-type: minor
|
50
|
+
change-type: minor
|
51
|
+
author: Pagan Gazzard
|
52
|
+
version: odata-parser-2.3.0
|
53
|
+
title: "'Add source map'"
|
54
|
+
date: 2022-06-06T15:59:20.389Z
|
55
|
+
- commits:
|
56
|
+
- subject: Use nullish coalescing when sensible
|
57
|
+
hash: c69dff4d46792c4c858f869646adca9272210364
|
58
|
+
body: ""
|
59
|
+
footer:
|
60
|
+
Change-type: patch
|
61
|
+
change-type: patch
|
62
|
+
author: Pagan Gazzard
|
63
|
+
nested: []
|
64
|
+
version: odata-to-abstract-sql-5.4.12
|
65
|
+
title: "'Use nullish coalescing when sensible'"
|
66
|
+
date: 2022-06-03T15:45:18.251Z
|
67
|
+
version: 14.45.1
|
68
|
+
title: "'Update dependencies'"
|
69
|
+
date: 2022-06-08T08:16:26.230Z
|
70
|
+
- commits:
|
71
|
+
- subject: Generalisation and decouple migrator functions. Prepare for migration
|
72
|
+
categories.
|
73
|
+
hash: 0184e6119088170f6990996a3afcfbd78a2497fc
|
74
|
+
body: |
|
75
|
+
Add basic test for sync migrator
|
76
|
+
footer:
|
77
|
+
Change-type: minor
|
78
|
+
change-type: minor
|
79
|
+
Signed-off-by: Harald Fischer <harald@balena.io>
|
80
|
+
signed-off-by: Harald Fischer <harald@balena.io>
|
81
|
+
author: Harald Fischer
|
82
|
+
nested: []
|
83
|
+
version: 14.45.0
|
84
|
+
title: "'Generalisation of migrator'"
|
85
|
+
date: 2022-06-03T17:08:40.433Z
|
86
|
+
- commits:
|
87
|
+
- subject: "permissions: Add optional transaction param to user & api key methods"
|
88
|
+
hash: 42253a2928a8cb7c4356bec3960bb4555321f859
|
89
|
+
body: ""
|
90
|
+
footer:
|
91
|
+
Change-type: minor
|
92
|
+
change-type: minor
|
93
|
+
Signed-off-by: Thodoris Greasidis <thodoris@balena.io>
|
94
|
+
signed-off-by: Thodoris Greasidis <thodoris@balena.io>
|
95
|
+
author: Thodoris Greasidis
|
96
|
+
nested: []
|
97
|
+
version: 14.44.0
|
98
|
+
title: "'permissions: Add optional transaction param to user & api key methods'"
|
99
|
+
date: 2022-05-30T09:23:42.149Z
|
17
100
|
- commits:
|
18
101
|
- subject: Update typescript to 4.7
|
19
102
|
hash: 6c25444730ccbb0120468a6ce063be7a7f4610be
|
package/CHANGELOG.md
CHANGED
@@ -5,10 +5,44 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
6
6
|
|
7
7
|
# v15.0.0
|
8
|
-
## (2022-
|
8
|
+
## (2022-07-07)
|
9
9
|
|
10
10
|
* Delete default user permissions that are no longer in the config [Thodoris Greasidis]
|
11
11
|
|
12
|
+
# v14.46.0
|
13
|
+
## (2022-06-21)
|
14
|
+
|
15
|
+
* Fix for passport.js update 0.6.0 [Harald Fischer]
|
16
|
+
|
17
|
+
# v14.45.1
|
18
|
+
## (2022-06-08)
|
19
|
+
|
20
|
+
|
21
|
+
<details>
|
22
|
+
<summary> Update dependencies [Pagan Gazzard] </summary>
|
23
|
+
|
24
|
+
> ## odata-parser-2.3.0
|
25
|
+
> ### (2022-06-06)
|
26
|
+
>
|
27
|
+
> * Add source map [Pagan Gazzard]
|
28
|
+
>
|
29
|
+
> ## odata-to-abstract-sql-5.4.12
|
30
|
+
> ### (2022-06-03)
|
31
|
+
>
|
32
|
+
> * Use nullish coalescing when sensible [Pagan Gazzard]
|
33
|
+
>
|
34
|
+
</details>
|
35
|
+
|
36
|
+
# v14.45.0
|
37
|
+
## (2022-06-03)
|
38
|
+
|
39
|
+
* Generalisation and decouple migrator functions. Prepare for migration categories. [Harald Fischer]
|
40
|
+
|
41
|
+
# v14.44.0
|
42
|
+
## (2022-05-30)
|
43
|
+
|
44
|
+
* permissions: Add optional transaction param to user & api key methods [Thodoris Greasidis]
|
45
|
+
|
12
46
|
# v14.43.6
|
13
47
|
## (2022-05-27)
|
14
48
|
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import type * as Express from 'express';
|
2
2
|
import type { AbstractSqlModel } from '@balena/abstract-sql-compiler';
|
3
3
|
import type { Database } from '../database-layer/db';
|
4
|
-
import type { Migration } from '../migrator/migrator';
|
5
4
|
import type { Resolvable } from '../sbvr-api/common-types';
|
5
|
+
import { Migrations } from '../migrator/utils';
|
6
6
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
7
7
|
export declare type SetupFunction = (app: Express.Application, sbvrUtilsInstance: typeof sbvrUtils, db: Database) => Resolvable<void>;
|
8
8
|
export interface Model {
|
@@ -12,9 +12,7 @@ export interface Model {
|
|
12
12
|
modelText?: string;
|
13
13
|
abstractSql?: AbstractSqlModel;
|
14
14
|
migrationsPath?: string;
|
15
|
-
migrations?:
|
16
|
-
[index: string]: Migration;
|
17
|
-
};
|
15
|
+
migrations?: Migrations;
|
18
16
|
initSqlPath?: string;
|
19
17
|
initSql?: string;
|
20
18
|
customServerCode?: string | {
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.setup = void 0;
|
4
|
+
const utils_1 = require("../migrator/utils");
|
4
5
|
const fs = require("fs");
|
5
6
|
const _ = require("lodash");
|
6
7
|
const path = require("path");
|
@@ -182,15 +183,36 @@ const setup = (app) => {
|
|
182
183
|
const fileNames = await fs.promises.readdir(migrationsPath);
|
183
184
|
await Promise.all(fileNames.map(async (filename) => {
|
184
185
|
const filePath = path.join(migrationsPath, filename);
|
186
|
+
const fileNameParts = filename.split('.', 3);
|
187
|
+
const fileExtension = path.extname(filename);
|
185
188
|
const [migrationKey] = filename.split('-', 1);
|
186
|
-
|
189
|
+
let migrationCategory = utils_1.defaultMigrationCategory;
|
190
|
+
if (fileNameParts.length === 3) {
|
191
|
+
if (fileNameParts[1] in utils_1.MigrationCategories) {
|
192
|
+
migrationCategory = fileNameParts[1];
|
193
|
+
}
|
194
|
+
else {
|
195
|
+
console.error(`Unrecognised migration file category ${fileNameParts[1]}, skipping: ${path.extname(filename)}`);
|
196
|
+
return;
|
197
|
+
}
|
198
|
+
}
|
199
|
+
const assignMigrationWithCategory = (newMigrationKey, newMigration) => {
|
200
|
+
const catMigrations = migrations[migrationCategory] || {};
|
201
|
+
if (typeof catMigrations === 'object') {
|
202
|
+
migrations[migrationCategory] = {
|
203
|
+
[newMigrationKey]: newMigration,
|
204
|
+
...catMigrations,
|
205
|
+
};
|
206
|
+
}
|
207
|
+
};
|
208
|
+
switch (fileExtension) {
|
187
209
|
case '.coffee':
|
188
210
|
case '.ts':
|
189
211
|
case '.js':
|
190
|
-
|
212
|
+
assignMigrationWithCategory(migrationKey, nodeRequire(filePath));
|
191
213
|
break;
|
192
214
|
case '.sql':
|
193
|
-
|
215
|
+
assignMigrationWithCategory(migrationKey, await fs.promises.readFile(filePath, 'utf8'));
|
194
216
|
break;
|
195
217
|
default:
|
196
218
|
console.error(`Unrecognised migration file extension, skipping: ${path.extname(filename)}`);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":";;;
|
1
|
+
{"version":3,"file":"config-loader.js","sourceRoot":"","sources":["../../src/config-loader/config-loader.ts"],"names":[],"mappings":"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"}
|
@@ -26,7 +26,7 @@ export declare const cache: {
|
|
26
26
|
};
|
27
27
|
import * as memoize from 'memoizee';
|
28
28
|
import memoizeWeak = require('memoizee/weak');
|
29
|
-
export declare const createCache: <T extends (...args: any[]) => any>(cacheName: keyof typeof cache, fn: T, opts
|
29
|
+
export declare const createCache: <T extends (...args: any[]) => any>(cacheName: keyof typeof cache, fn: T, opts: CacheFnOpts<T>) => T;
|
30
30
|
export declare const db: {
|
31
31
|
poolSize: number;
|
32
32
|
idleTimeoutMillis: number | undefined;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/config-loader/env.ts"],"names":[],"mappings":";;;AACA,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AACzD,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;IAEtD,OAAO,CAAC,IAAI,CAAC,mCAAmC,YAAY,GAAG,CAAC,CAAC;CACjE;AAEY,QAAA,KAAK,GACjB,YAAY,KAAK,GAAG,IAAI,CAAC,YAAY,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC;AA0BpD,QAAA,KAAK,GAAG;IACpB,iBAAiB,EAAE;QAClB,GAAG,EAAE,IAAI;KACI;IACd,gBAAgB,EAAE;QACjB,GAAG,EAAE,MAAM;KACE;IACd,UAAU,EAAE;QACX,GAAG,EAAE,MAAM;KACE;IACd,kBAAkB,EAAE;QACnB,GAAG,EAAE,KAAK;KACG;IACd,mBAAmB,EAAE;QACpB,GAAG,EAAE,KAAK;KACG;IACd,eAAe,EAAE,KAAkB;IACnC,iBAAiB,EAAE,KAAkB;IACrC,aAAa,EAAE,KAAkB;CACjC,CAAC;AAEF,oCAAoC;AACpC,6CAA8C;AACvC,MAAM,WAAW,GAAG,CAC1B,SAA6B,EAC7B,EAAK,
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/config-loader/env.ts"],"names":[],"mappings":";;;AACA,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AACzD,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;IAEtD,OAAO,CAAC,IAAI,CAAC,mCAAmC,YAAY,GAAG,CAAC,CAAC;CACjE;AAEY,QAAA,KAAK,GACjB,YAAY,KAAK,GAAG,IAAI,CAAC,YAAY,KAAK,GAAG,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC;AA0BpD,QAAA,KAAK,GAAG;IACpB,iBAAiB,EAAE;QAClB,GAAG,EAAE,IAAI;KACI;IACd,gBAAgB,EAAE;QACjB,GAAG,EAAE,MAAM;KACE;IACd,UAAU,EAAE;QACX,GAAG,EAAE,MAAM;KACE;IACd,kBAAkB,EAAE;QACnB,GAAG,EAAE,KAAK;KACG;IACd,mBAAmB,EAAE;QACpB,GAAG,EAAE,KAAK;KACG;IACd,eAAe,EAAE,KAAkB;IACnC,iBAAiB,EAAE,KAAkB;IACrC,aAAa,EAAE,KAAkB;CACjC,CAAC;AAEF,oCAAoC;AACpC,6CAA8C;AACvC,MAAM,WAAW,GAAG,CAC1B,SAA6B,EAC7B,EAAK,EAGL,IAAoB,EACnB,EAAE;IACH,MAAM,SAAS,GAAG,aAAK,CAAC,SAAS,CAAC,CAAC;IACnC,IAAI,SAAS,KAAK,KAAK,EAAE;QACxB,OAAO,EAAE,CAAC;KACV;IACD,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE;QACpC,OAAO,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;KAC3B;IACD,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,IAAI,EAAE;QACxB,OAAO,WAAW,CAAC,EAAE,EAAE;YACtB,GAAG,SAAS;YACZ,GAAG,IAAI;SACP,CAAC,CAAC;KACH;IACD,OAAO,OAAO,CAAC,EAAE,EAAE;QAClB,GAAG,SAAS;QACZ,GAAG,IAAI;KACP,CAAC,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,WAAW,eAwBtB;AAEF,IAAI,SAAiB,CAAC;AACtB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;IACvC,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,EAAE;QAC9C,MAAM,IAAI,KAAK,CACd,6CAA6C,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,CACjF,CAAC;KACF;CACD;KAAM;IACN,SAAS,GAAG,KAAK,CAAC;CAClB;AAEY,QAAA,EAAE,GAAG;IACjB,QAAQ,EAAE,EAAE;IACZ,iBAAiB,EAAE,KAA2B;IAC9C,gBAAgB,EAAE,SAA+B;IACjD,YAAY,EAAE,SAA+B;IAC7C,uBAAuB,EAAE,KAA2B;IACpD,SAAS,EAAE,IAA2B;IACtC,eAAe,EAAE,KAAK;IACtB,SAAS;IACT,OAAO,EAAE,QAAQ;IACjB,kBAAkB,EAAE,CAAC;CACrB,CAAC;AAEW,QAAA,QAAQ,GAAG;IACvB,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAE1B,aAAa,EAAE,EAAE,GAAG,IAAI;CACxB,CAAC"}
|
@@ -0,0 +1,9 @@
|
|
1
|
+
import type { Tx } from '../database-layer/db';
|
2
|
+
import type { Config, Model } from '../config-loader/config-loader';
|
3
|
+
declare type ApiRootModel = Model & {
|
4
|
+
apiRoot: string;
|
5
|
+
};
|
6
|
+
export declare const postRun: (tx: Tx, model: ApiRootModel) => Promise<void>;
|
7
|
+
export declare const run: (tx: Tx, model: ApiRootModel) => Promise<void>;
|
8
|
+
export declare const config: Config;
|
9
|
+
export {};
|
@@ -0,0 +1,121 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.config = exports.run = exports.postRun = void 0;
|
4
|
+
const utils_1 = require("./utils");
|
5
|
+
const _ = require("lodash");
|
6
|
+
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
7
|
+
const postRun = async (tx, model) => {
|
8
|
+
var _a, _b;
|
9
|
+
const { initSql } = model;
|
10
|
+
if (initSql == null) {
|
11
|
+
return;
|
12
|
+
}
|
13
|
+
const modelName = model.apiRoot;
|
14
|
+
const exists = await (0, utils_1.checkModelAlreadyExists)(tx, modelName);
|
15
|
+
if (!exists) {
|
16
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)('First time executing, running init script');
|
17
|
+
await (0, utils_1.lockMigrations)(tx, modelName, async () => {
|
18
|
+
var _a, _b;
|
19
|
+
try {
|
20
|
+
await tx.executeSql(initSql);
|
21
|
+
}
|
22
|
+
catch (err) {
|
23
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.error) !== null && _b !== void 0 ? _b : console.error)(`initSql execution error ${err} `);
|
24
|
+
throw new utils_1.MigrationError(err);
|
25
|
+
}
|
26
|
+
});
|
27
|
+
}
|
28
|
+
};
|
29
|
+
exports.postRun = postRun;
|
30
|
+
const run = async (tx, model) => {
|
31
|
+
const { migrations } = model;
|
32
|
+
if (migrations == null || _.isEmpty(migrations)) {
|
33
|
+
return;
|
34
|
+
}
|
35
|
+
const defaultMigrations = migrations[utils_1.defaultMigrationCategory];
|
36
|
+
const runMigrations = utils_1.defaultMigrationCategory in migrations
|
37
|
+
? typeof defaultMigrations === 'object'
|
38
|
+
? defaultMigrations
|
39
|
+
: {}
|
40
|
+
: migrations;
|
41
|
+
return $run(tx, model, runMigrations);
|
42
|
+
};
|
43
|
+
exports.run = run;
|
44
|
+
const $run = async (tx, model, migrations) => {
|
45
|
+
var _a, _b;
|
46
|
+
const modelName = model.apiRoot;
|
47
|
+
const exists = await (0, utils_1.checkModelAlreadyExists)(tx, modelName);
|
48
|
+
if (!exists) {
|
49
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)('First time model has executed, skipping migrations');
|
50
|
+
return await (0, utils_1.setExecutedMigrations)(tx, modelName, Object.keys(migrations));
|
51
|
+
}
|
52
|
+
await (0, utils_1.lockMigrations)(tx, modelName, async () => {
|
53
|
+
var _a, _b;
|
54
|
+
try {
|
55
|
+
const executedMigrations = await (0, utils_1.getExecutedMigrations)(tx, modelName);
|
56
|
+
const pendingMigrations = filterAndSortPendingMigrations(migrations, executedMigrations);
|
57
|
+
if (pendingMigrations.length === 0) {
|
58
|
+
return;
|
59
|
+
}
|
60
|
+
const newlyExecutedMigrations = await executeMigrations(tx, pendingMigrations);
|
61
|
+
await (0, utils_1.setExecutedMigrations)(tx, modelName, [
|
62
|
+
...executedMigrations,
|
63
|
+
...newlyExecutedMigrations,
|
64
|
+
]);
|
65
|
+
}
|
66
|
+
catch (err) {
|
67
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.error) !== null && _b !== void 0 ? _b : console.error)(`Failed to executed synchronous migrations from api root model ${err}`);
|
68
|
+
throw new utils_1.MigrationError(err);
|
69
|
+
}
|
70
|
+
});
|
71
|
+
};
|
72
|
+
const filterAndSortPendingMigrations = (migrations, executedMigrations) => _(migrations).omit(executedMigrations)
|
73
|
+
.toPairs()
|
74
|
+
.sortBy(([migrationKey]) => migrationKey)
|
75
|
+
.value();
|
76
|
+
const executeMigrations = async (tx, migrations = []) => {
|
77
|
+
var _a, _b;
|
78
|
+
try {
|
79
|
+
for (const migration of migrations) {
|
80
|
+
await executeMigration(tx, migration);
|
81
|
+
}
|
82
|
+
}
|
83
|
+
catch (err) {
|
84
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.error) !== null && _b !== void 0 ? _b : console.error)('Error while executing migrations, rolled back');
|
85
|
+
throw new utils_1.MigrationError(err);
|
86
|
+
}
|
87
|
+
return migrations.map(([migrationKey]) => migrationKey);
|
88
|
+
};
|
89
|
+
const executeMigration = async (tx, [key, migration]) => {
|
90
|
+
var _a, _b;
|
91
|
+
((_b = (_a = sbvrUtils.api.migrations) === null || _a === void 0 ? void 0 : _a.logger.info) !== null && _b !== void 0 ? _b : console.info)(`Running migration ${JSON.stringify(key)}`);
|
92
|
+
if (typeof migration === 'function') {
|
93
|
+
await migration(tx, sbvrUtils);
|
94
|
+
}
|
95
|
+
else if (typeof migration === 'string') {
|
96
|
+
await tx.executeSql(migration);
|
97
|
+
}
|
98
|
+
else {
|
99
|
+
throw new utils_1.MigrationError(`Invalid migration type: ${typeof migration}`);
|
100
|
+
}
|
101
|
+
};
|
102
|
+
exports.config = {
|
103
|
+
models: [
|
104
|
+
{
|
105
|
+
modelName: 'migrations',
|
106
|
+
apiRoot: 'migrations',
|
107
|
+
modelText: utils_1.modelText,
|
108
|
+
migrations: {
|
109
|
+
'11.0.0-modified-at': `
|
110
|
+
ALTER TABLE "migration"
|
111
|
+
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
112
|
+
`,
|
113
|
+
'11.0.1-modified-at': `
|
114
|
+
ALTER TABLE "migration lock"
|
115
|
+
ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
|
116
|
+
`,
|
117
|
+
},
|
118
|
+
},
|
119
|
+
],
|
120
|
+
};
|
121
|
+
//# sourceMappingURL=sync.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../src/migrator/sync.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,28 @@
|
|
1
|
+
import type { Tx } from '../database-layer/db';
|
2
|
+
import type { Resolvable } from '../sbvr-api/common-types';
|
3
|
+
import { TypedError } from 'typed-error';
|
4
|
+
export { migrator as migratorEnv } from '../config-loader/env';
|
5
|
+
export declare const modelText: any;
|
6
|
+
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
7
|
+
export declare enum MigrationCategories {
|
8
|
+
'sync' = "sync"
|
9
|
+
}
|
10
|
+
export declare const defaultMigrationCategory = MigrationCategories['sync'];
|
11
|
+
export declare type CategorizedMigrations = {
|
12
|
+
[key in MigrationCategories]: RunnableMigrations;
|
13
|
+
};
|
14
|
+
declare type SbvrUtils = typeof sbvrUtils;
|
15
|
+
export declare type MigrationTuple = [string, Migration];
|
16
|
+
export declare type MigrationFn = (tx: Tx, sbvrUtils: SbvrUtils) => Resolvable<void>;
|
17
|
+
export declare type Migration = string | MigrationFn;
|
18
|
+
export declare type RunnableMigrations = {
|
19
|
+
[key: string]: Migration;
|
20
|
+
};
|
21
|
+
export declare type Migrations = CategorizedMigrations | RunnableMigrations;
|
22
|
+
export declare class MigrationError extends TypedError {
|
23
|
+
}
|
24
|
+
export declare const binds: (strings: TemplateStringsArray, ...bindNums: number[]) => string;
|
25
|
+
export declare const lockMigrations: <T>(tx: Tx, modelName: string, fn: () => Promise<T>) => Promise<T>;
|
26
|
+
export declare const checkModelAlreadyExists: (tx: Tx, modelName: string) => Promise<boolean>;
|
27
|
+
export declare const setExecutedMigrations: (tx: Tx, modelName: string, executedMigrations: string[]) => Promise<void>;
|
28
|
+
export declare const getExecutedMigrations: (tx: Tx, modelName: string) => Promise<string[]>;
|
@@ -0,0 +1,105 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.getExecutedMigrations = exports.setExecutedMigrations = exports.checkModelAlreadyExists = exports.lockMigrations = exports.binds = exports.MigrationError = exports.defaultMigrationCategory = exports.MigrationCategories = exports.modelText = exports.migratorEnv = void 0;
|
4
|
+
const typed_error_1 = require("typed-error");
|
5
|
+
const env_1 = require("../config-loader/env");
|
6
|
+
var env_2 = require("../config-loader/env");
|
7
|
+
Object.defineProperty(exports, "migratorEnv", { enumerable: true, get: function () { return env_2.migrator; } });
|
8
|
+
const control_flow_1 = require("../sbvr-api/control-flow");
|
9
|
+
exports.modelText = require('./migrations.sbvr');
|
10
|
+
const sbvrUtils = require("../sbvr-api/sbvr-utils");
|
11
|
+
var MigrationCategories;
|
12
|
+
(function (MigrationCategories) {
|
13
|
+
MigrationCategories["sync"] = "sync";
|
14
|
+
})(MigrationCategories = exports.MigrationCategories || (exports.MigrationCategories = {}));
|
15
|
+
exports.defaultMigrationCategory = MigrationCategories.sync;
|
16
|
+
class MigrationError extends typed_error_1.TypedError {
|
17
|
+
}
|
18
|
+
exports.MigrationError = MigrationError;
|
19
|
+
const binds = (strings, ...bindNums) => strings
|
20
|
+
.map((str, i) => {
|
21
|
+
if (i === bindNums.length) {
|
22
|
+
return str;
|
23
|
+
}
|
24
|
+
if (i + 1 !== bindNums[i]) {
|
25
|
+
throw new SyntaxError('Migration sql binds must be sequential');
|
26
|
+
}
|
27
|
+
if (sbvrUtils.db.engine === "postgres") {
|
28
|
+
return str + `$${bindNums[i]}`;
|
29
|
+
}
|
30
|
+
return str + `?`;
|
31
|
+
})
|
32
|
+
.join('');
|
33
|
+
exports.binds = binds;
|
34
|
+
const lockMigrations = async (tx, modelName, fn) => {
|
35
|
+
try {
|
36
|
+
await tx.executeSql((0, exports.binds) `
|
37
|
+
DELETE FROM "migration lock"
|
38
|
+
WHERE "model name" = ${1}
|
39
|
+
AND "created at" < ${2}`, [modelName, new Date(Date.now() - env_1.migrator.lockTimeout)]);
|
40
|
+
await tx.executeSql((0, exports.binds) `
|
41
|
+
INSERT INTO "migration lock" ("model name")
|
42
|
+
VALUES (${1})`, [modelName]);
|
43
|
+
}
|
44
|
+
catch (err) {
|
45
|
+
await (0, control_flow_1.delay)(env_1.migrator.lockFailDelay);
|
46
|
+
throw err;
|
47
|
+
}
|
48
|
+
try {
|
49
|
+
return await fn();
|
50
|
+
}
|
51
|
+
finally {
|
52
|
+
try {
|
53
|
+
await tx.executeSql((0, exports.binds) `
|
54
|
+
DELETE FROM "migration lock"
|
55
|
+
WHERE "model name" = ${1}`, [modelName]);
|
56
|
+
}
|
57
|
+
catch (_a) {
|
58
|
+
}
|
59
|
+
}
|
60
|
+
};
|
61
|
+
exports.lockMigrations = lockMigrations;
|
62
|
+
const checkModelAlreadyExists = async (tx, modelName) => {
|
63
|
+
const result = await tx.tableList("name = 'migration'");
|
64
|
+
if (result.rows.length === 0) {
|
65
|
+
return false;
|
66
|
+
}
|
67
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
68
|
+
SELECT 1
|
69
|
+
FROM "model"
|
70
|
+
WHERE "model"."is of-vocabulary" = ${1}
|
71
|
+
LIMIT 1`, [modelName]);
|
72
|
+
return rows.length > 0;
|
73
|
+
};
|
74
|
+
exports.checkModelAlreadyExists = checkModelAlreadyExists;
|
75
|
+
const setExecutedMigrations = async (tx, modelName, executedMigrations) => {
|
76
|
+
const stringifiedMigrations = JSON.stringify(executedMigrations);
|
77
|
+
const result = await tx.tableList("name = 'migration'");
|
78
|
+
if (result.rows.length === 0) {
|
79
|
+
return;
|
80
|
+
}
|
81
|
+
const { rowsAffected } = await tx.executeSql((0, exports.binds) `
|
82
|
+
UPDATE "migration"
|
83
|
+
SET "model name" = ${1},
|
84
|
+
"executed migrations" = ${2}
|
85
|
+
WHERE "migration"."model name" = ${3}`, [modelName, stringifiedMigrations, modelName]);
|
86
|
+
if (rowsAffected === 0) {
|
87
|
+
await tx.executeSql((0, exports.binds) `
|
88
|
+
INSERT INTO "migration" ("model name", "executed migrations")
|
89
|
+
VALUES (${1}, ${2})`, [modelName, stringifiedMigrations]);
|
90
|
+
}
|
91
|
+
};
|
92
|
+
exports.setExecutedMigrations = setExecutedMigrations;
|
93
|
+
const getExecutedMigrations = async (tx, modelName) => {
|
94
|
+
const { rows } = await tx.executeSql((0, exports.binds) `
|
95
|
+
SELECT "migration"."executed migrations" AS "executed_migrations"
|
96
|
+
FROM "migration"
|
97
|
+
WHERE "migration"."model name" = ${1}`, [modelName]);
|
98
|
+
const data = rows[0];
|
99
|
+
if (data == null) {
|
100
|
+
return [];
|
101
|
+
}
|
102
|
+
return JSON.parse(data.executed_migrations);
|
103
|
+
};
|
104
|
+
exports.getExecutedMigrations = getExecutedMigrations;
|
105
|
+
//# sourceMappingURL=utils.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/migrator/utils.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":";;;AAMA,uDAAuD;AAgBhD,MAAM,aAAa,GAAiC,KAAK,EAC/D,QAAQ,EACR,QAAQ,EACR,IAA4C,EAC3C,EAAE;IACH,IAAI;QACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACnE,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;KACxB;IAAC,WAAM;QACP,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;KACvB;AACF,CAAC,CAAC;AAXW,QAAA,aAAa,iBAWxB;AAEF,MAAM,KAAK,GAA+B,KAAK,EAAE,GAAwB,EAAE,EAAE;IAC5E,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACrB,MAAM,QAAQ,GAAoB,OAAO,CAAC,UAAU,CAAC,CAAC;QACtD,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAC/B,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5B,MAAM,EACL,QAAQ,EAAE,aAAa,GACvB,GAAyB,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAEpD,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACrC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,qBAAa,CAAC,CAAC,CAAC;QAE/C,aAAK,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,CAClC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,IAAK,EAAE,EAAE;YAC7C,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,EAAE;gBACxB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;gBAC9B,OAAO;aACP;YACD,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;gBACzB,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAEpB,cAAM,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YAC5B,GAAG,CAAC,MAAM,EAAE,
|
1
|
+
{"version":3,"file":"passport-pinejs.js","sourceRoot":"","sources":["../../src/passport-pinejs/passport-pinejs.ts"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import './express-extension';
|
2
2
|
import type * as Express from 'express';
|
3
|
+
import type { Tx } from '../database-layer/db';
|
3
4
|
import type { ApiKey, User } from '../sbvr-api/sbvr-utils';
|
4
5
|
import * as sbvrUtils from '../sbvr-api/sbvr-utils';
|
5
6
|
import { HookReq } from './hooks';
|
@@ -33,12 +34,12 @@ export declare const checkPassword: (username: string, password: string) => Prom
|
|
33
34
|
username: string;
|
34
35
|
permissions: string[];
|
35
36
|
}>;
|
36
|
-
export declare const getUserPermissions: (userId: number) => Promise<string[]>;
|
37
|
-
export declare const getApiKeyPermissions: (apiKey: string) => Promise<string[]>;
|
38
|
-
export declare const resolveAuthHeader: (req: Express.Request, expectedScheme?: string) => Promise<PermissionReq['apiKey']>;
|
37
|
+
export declare const getUserPermissions: (userId: number, tx?: Tx) => Promise<string[]>;
|
38
|
+
export declare const getApiKeyPermissions: (apiKey: string, tx?: Tx) => Promise<string[]>;
|
39
|
+
export declare const resolveAuthHeader: (req: Express.Request, expectedScheme?: string, tx?: Tx) => Promise<PermissionReq['apiKey']>;
|
39
40
|
export declare const customAuthorizationMiddleware: (expectedScheme?: string) => (req: Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
|
40
41
|
export declare const authorizationMiddleware: (req: Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
|
41
|
-
export declare const resolveApiKey: (req: HookReq | Express.Request, paramName?: string) => Promise<PermissionReq['apiKey']>;
|
42
|
+
export declare const resolveApiKey: (req: HookReq | Express.Request, paramName?: string, tx?: Tx) => Promise<PermissionReq['apiKey']>;
|
42
43
|
export declare const customApiKeyMiddleware: (paramName?: string) => (req: HookReq | Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
|
43
44
|
export declare const apiKeyMiddleware: (req: HookReq | Express.Request, _res?: Express.Response, next?: Express.NextFunction) => Promise<void>;
|
44
45
|
export declare const checkPermissions: (req: PermissionReq, actionList: PermissionCheck, resourceName?: string, vocabulary?: string) => Promise<boolean | NestedCheck<string>>;
|