@budibase/backend-core 2.22.4 → 2.22.7
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/dist/index.js +27 -32
- package/dist/index.js.map +2 -2
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +4 -4
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/auth/auth.js +4 -2
- package/dist/src/auth/auth.js.map +1 -1
- package/dist/src/cache/base/index.d.ts +1 -3
- package/dist/src/cache/base/index.js +1 -1
- package/dist/src/cache/base/index.js.map +1 -1
- package/dist/src/cache/generic.d.ts +1 -3
- package/dist/src/cache/invite.js.map +1 -1
- package/dist/src/db/lucene.js.map +1 -1
- package/dist/src/db/searchIndexes/searchIndexes.js +2 -2
- package/dist/src/db/searchIndexes/searchIndexes.js.map +1 -1
- package/dist/src/docUpdates/index.js +2 -2
- package/dist/src/docUpdates/index.js.map +1 -1
- package/dist/src/events/processors/AuditLogsProcessor.d.ts +3 -3
- package/dist/src/events/processors/AuditLogsProcessor.js +2 -2
- package/dist/src/events/processors/AuditLogsProcessor.js.map +1 -1
- package/dist/src/events/processors/LoggingProcessor.d.ts +3 -3
- package/dist/src/events/processors/LoggingProcessor.js +3 -3
- package/dist/src/events/processors/LoggingProcessor.js.map +1 -1
- package/dist/src/events/processors/async/DocumentUpdateProcessor.d.ts +1 -1
- package/dist/src/events/processors/async/DocumentUpdateProcessor.js +1 -1
- package/dist/src/events/processors/async/DocumentUpdateProcessor.js.map +1 -1
- package/dist/src/middleware/matchers.js +1 -1
- package/dist/src/middleware/matchers.js.map +1 -1
- package/dist/src/middleware/passport/sso/sso.js +1 -1
- package/dist/src/middleware/passport/sso/sso.js.map +1 -1
- package/dist/src/migrations/migrations.js +0 -4
- package/dist/src/migrations/migrations.js.map +1 -1
- package/dist/src/queue/inMemoryQueue.d.ts +2 -2
- package/dist/src/queue/inMemoryQueue.js +1 -1
- package/dist/src/queue/inMemoryQueue.js.map +1 -1
- package/dist/src/queue/listeners.js +1 -1
- package/dist/src/queue/listeners.js.map +1 -1
- package/dist/src/redis/init.js +2 -0
- package/dist/src/redis/init.js.map +1 -1
- package/dist/src/security/permissions.d.ts +1 -1
- package/package.json +4 -4
- package/src/auth/auth.ts +4 -2
- package/src/cache/base/index.ts +1 -1
- package/src/cache/invite.ts +1 -1
- package/src/cache/writethrough.ts +1 -1
- package/src/db/lucene.ts +0 -4
- package/src/db/searchIndexes/searchIndexes.ts +2 -2
- package/src/docUpdates/index.ts +2 -7
- package/src/events/processors/AuditLogsProcessor.ts +2 -3
- package/src/events/processors/LoggingProcessor.ts +3 -4
- package/src/events/processors/async/DocumentUpdateProcessor.ts +1 -6
- package/src/middleware/matchers.ts +1 -1
- package/src/middleware/passport/datasource/google.ts +1 -1
- package/src/middleware/passport/sso/sso.ts +2 -5
- package/src/migrations/migrations.ts +0 -4
- package/src/objectStore/buckets/tests/app.spec.ts +3 -3
- package/src/platform/tests/tenants.spec.ts +1 -1
- package/src/queue/inMemoryQueue.ts +2 -2
- package/src/queue/listeners.ts +1 -1
- package/src/redis/init.ts +1 -0
- package/src/redis/tests/redis.spec.ts +1 -1
- package/src/users/test/utils.spec.ts +1 -1
|
@@ -27,8 +27,8 @@ function init(processors) {
|
|
|
27
27
|
// if not processing in this instance, kick it off
|
|
28
28
|
if (!processingPromise) {
|
|
29
29
|
processingPromise = asyncEvents_1.asyncEventQueue.process((job) => __awaiter(this, void 0, void 0, function* () {
|
|
30
|
-
const { event, identity, properties
|
|
31
|
-
yield documentProcessor.processEvent(event, identity, properties
|
|
30
|
+
const { event, identity, properties } = job.data;
|
|
31
|
+
yield documentProcessor.processEvent(event, identity, properties);
|
|
32
32
|
}));
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/docUpdates/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAA0E;AAC1E,iHAG2D;AAE3D,IAAI,iBAAgC,CAAA;AACpC,IAAI,iBAA0C,CAAA;AAE9C,SAAgB,IAAI,CAAC,UAAwB;IAC3C,IAAI,CAAC,6BAAe,EAAE;QACpB,IAAA,kBAAS,GAAE,CAAA;KACZ;IACD,IAAI,CAAC,iBAAiB,EAAE;QACtB,iBAAiB,GAAG,IAAI,iCAAuB,CAAC,UAAU,CAAC,CAAA;KAC5D;IACD,kDAAkD;IAClD,IAAI,CAAC,iBAAiB,EAAE;QACtB,iBAAiB,GAAG,6BAAe,CAAC,OAAO,CAAC,CAAM,GAAG,EAAC,EAAE;YACtD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/docUpdates/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAA0E;AAC1E,iHAG2D;AAE3D,IAAI,iBAAgC,CAAA;AACpC,IAAI,iBAA0C,CAAA;AAE9C,SAAgB,IAAI,CAAC,UAAwB;IAC3C,IAAI,CAAC,6BAAe,EAAE;QACpB,IAAA,kBAAS,GAAE,CAAA;KACZ;IACD,IAAI,CAAC,iBAAiB,EAAE;QACtB,iBAAiB,GAAG,IAAI,iCAAuB,CAAC,UAAU,CAAC,CAAA;KAC5D;IACD,kDAAkD;IAClD,IAAI,CAAC,iBAAiB,EAAE;QACtB,iBAAiB,GAAG,6BAAe,CAAC,OAAO,CAAC,CAAM,GAAG,EAAC,EAAE;YACtD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,CAAA;YAChD,MAAM,iBAAiB,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;QACnE,CAAC,CAAA,CAAC,CAAA;KACH;AACH,CAAC;AAdD,oBAcC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Event, Identity,
|
|
1
|
+
import { Event, Identity, AuditLogQueueEvent, AuditLogFn } from "@budibase/types";
|
|
2
2
|
import { EventProcessor } from "./types";
|
|
3
3
|
import BullQueue from "bull";
|
|
4
4
|
export default class AuditLogsProcessor implements EventProcessor {
|
|
@@ -6,7 +6,7 @@ export default class AuditLogsProcessor implements EventProcessor {
|
|
|
6
6
|
static auditLogQueue: BullQueue.Queue<AuditLogQueueEvent>;
|
|
7
7
|
static init(fn: AuditLogFn): Promise<void>;
|
|
8
8
|
processEvent(event: Event, identity: Identity, properties: any, timestamp?: string): Promise<void>;
|
|
9
|
-
identify(
|
|
10
|
-
identifyGroup(
|
|
9
|
+
identify(): Promise<void>;
|
|
10
|
+
identifyGroup(): Promise<void>;
|
|
11
11
|
shutdown(): void;
|
|
12
12
|
}
|
|
@@ -66,12 +66,12 @@ class AuditLogsProcessor {
|
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
|
-
identify(
|
|
69
|
+
identify() {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
71
|
// no-op
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
|
-
identifyGroup(
|
|
74
|
+
identifyGroup() {
|
|
75
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
76
|
// no-op
|
|
77
77
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuditLogsProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/AuditLogsProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AuditLogsProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/AuditLogsProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2CAOwB;AAExB,2CAAiE;AAEjE,uCAAmD;AACnD,uCAAuC;AACvC,oEAAmC;AAEnC,MAAqB,kBAAkB;IAIrC,kDAAkD;IAClD,MAAM,CAAC,IAAI,CAAC,EAAc;QACxB,kBAAkB,CAAC,gBAAgB,GAAG,IAAI,CAAA;QAC1C,MAAM,cAAc,GAAG,EAAE,CAAA;QACzB,kBAAkB,CAAC,aAAa,GAAG,IAAA,mBAAW,EAC5C,gBAAQ,CAAC,SAAS,CACnB,CAAA;QACD,OAAO,kBAAkB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAM,GAAG,EAAC,EAAE;YAC1D,OAAO,IAAA,oBAAU,EAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAS,EAAE;gBAC9C,IAAI,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,CAAA;gBACpC,IAAI,UAAU,CAAC,OAAO,EAAE;oBACtB,UAAU,mCACL,UAAU,GACV,UAAU,CAAC,OAAO,CACtB,CAAA;oBACD,OAAO,UAAU,CAAC,OAAO,CAAA;iBAC1B;gBAED,kEAAkE;gBAClE,iEAAiE;gBACjE,2BAA2B;gBAC3B,IAAI,QAAQ,GAAyB,EAAE,CAAA;gBACvC,IAAI,qBAAG,CAAC,wBAAwB,EAAE;oBAChC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAA;iBAClC;gBAED,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE;oBAC/C,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;oBAC5B,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;oBAClC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;oBAC1B,QAAQ;iBACT,CAAC,CAAA;YACJ,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC,CAAA,CAAC,CAAA;IACJ,CAAC;IAEK,YAAY,CAChB,KAAY,EACZ,QAAkB,EAClB,UAAe,EACf,SAAkB;;YAElB,IAAI,kBAAkB,CAAC,gBAAgB,IAAI,IAAA,iBAAS,EAAC,KAAK,CAAC,EAAE;gBAC3D,wDAAwD;gBACxD,MAAM,MAAM,GACV,QAAQ,CAAC,IAAI,KAAK,oBAAY,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;gBAC/D,+DAA+D;gBAC/D,MAAM,kBAAkB,CAAC,aAAa,CAAC,GAAG,CAAC;oBACzC,KAAK;oBACL,UAAU;oBACV,IAAI,EAAE;wBACJ,MAAM;wBACN,SAAS;wBACT,KAAK,EAAE,IAAA,kBAAQ,GAAE;wBACjB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;qBAC5B;oBACD,QAAQ,EAAE,IAAA,qBAAW,GAAE;iBACxB,CAAC,CAAA;aACH;QACH,CAAC;KAAA;IAEK,QAAQ;;YACZ,QAAQ;QACV,CAAC;KAAA;IAEK,aAAa;;YACjB,QAAQ;QACV,CAAC;KAAA;IAED,QAAQ;;QACN,MAAA,kBAAkB,CAAC,aAAa,0CAAE,KAAK,EAAE,CAAA;IAC3C,CAAC;;AA1EM,mCAAgB,GAAG,KAAK,CAAA;kBADZ,kBAAkB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Event, Identity, Group } from "@budibase/types";
|
|
2
2
|
import { EventProcessor } from "./types";
|
|
3
3
|
export default class LoggingProcessor implements EventProcessor {
|
|
4
|
-
processEvent(event: Event, identity: Identity, properties: any
|
|
5
|
-
identify(identity: Identity
|
|
6
|
-
identifyGroup(group: Group
|
|
4
|
+
processEvent(event: Event, identity: Identity, properties: any): Promise<void>;
|
|
5
|
+
identify(identity: Identity): Promise<void>;
|
|
6
|
+
identifyGroup(group: Group): Promise<void>;
|
|
7
7
|
shutdown(): void;
|
|
8
8
|
}
|
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
const environment_1 = __importDefault(require("../../environment"));
|
|
16
16
|
const skipLogging = environment_1.default.SELF_HOSTED && !environment_1.default.isDev();
|
|
17
17
|
class LoggingProcessor {
|
|
18
|
-
processEvent(event, identity, properties
|
|
18
|
+
processEvent(event, identity, properties) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
if (skipLogging) {
|
|
21
21
|
return;
|
|
@@ -23,7 +23,7 @@ class LoggingProcessor {
|
|
|
23
23
|
console.log(`[audit] [identityType=${identity.type}] ${event}`, properties);
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
|
-
identify(identity
|
|
26
|
+
identify(identity) {
|
|
27
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
28
|
if (skipLogging) {
|
|
29
29
|
return;
|
|
@@ -31,7 +31,7 @@ class LoggingProcessor {
|
|
|
31
31
|
console.log(`[audit] identified`, identity);
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
|
-
identifyGroup(group
|
|
34
|
+
identifyGroup(group) {
|
|
35
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
36
36
|
if (skipLogging) {
|
|
37
37
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggingProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/LoggingProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,oEAAmC;AAEnC,MAAM,WAAW,GAAG,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,KAAK,EAAE,CAAA;AAEnD,MAAqB,gBAAgB;IAC7B,YAAY,CAChB,KAAY,EACZ,QAAkB,EAClB,UAAe
|
|
1
|
+
{"version":3,"file":"LoggingProcessor.js","sourceRoot":"","sources":["../../../../src/events/processors/LoggingProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,oEAAmC;AAEnC,MAAM,WAAW,GAAG,qBAAG,CAAC,WAAW,IAAI,CAAC,qBAAG,CAAC,KAAK,EAAE,CAAA;AAEnD,MAAqB,gBAAgB;IAC7B,YAAY,CAChB,KAAY,EACZ,QAAkB,EAClB,UAAe;;YAEf,IAAI,WAAW,EAAE;gBACf,OAAM;aACP;YACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,QAAQ,CAAC,IAAI,KAAK,KAAK,EAAE,EAAE,UAAU,CAAC,CAAA;QAC7E,CAAC;KAAA;IAEK,QAAQ,CAAC,QAAkB;;YAC/B,IAAI,WAAW,EAAE;gBACf,OAAM;aACP;YACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;QAC7C,CAAC;KAAA;IAEK,aAAa,CAAC,KAAY;;YAC9B,IAAI,WAAW,EAAE;gBACf,OAAM;aACP;YACD,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAChD,CAAC;KAAA;IAED,QAAQ;QACN,QAAQ;IACV,CAAC;CACF;AA7BD,mCA6BC"}
|
|
@@ -8,6 +8,6 @@ export type ProcessorMap = {
|
|
|
8
8
|
export default class DocumentUpdateProcessor implements EventProcessor {
|
|
9
9
|
processors: ProcessorMap;
|
|
10
10
|
constructor(processors: ProcessorMap);
|
|
11
|
-
processEvent(event: Event, identity: Identity, properties: any
|
|
11
|
+
processEvent(event: Event, identity: Identity, properties: any): Promise<void>;
|
|
12
12
|
shutdown(): Promise<void>;
|
|
13
13
|
}
|
|
@@ -17,7 +17,7 @@ class DocumentUpdateProcessor {
|
|
|
17
17
|
this.processors = [];
|
|
18
18
|
this.processors = processors;
|
|
19
19
|
}
|
|
20
|
-
processEvent(event, identity, properties
|
|
20
|
+
processEvent(event, identity, properties) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
const tenantId = identity.realTenantId;
|
|
23
23
|
const docId = (0, documentId_1.getDocumentId)(event, properties);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DocumentUpdateProcessor.js","sourceRoot":"","sources":["../../../../../src/events/processors/async/DocumentUpdateProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,8CAA6C;AAC7C,iDAAgD;AAChD,mDAA4C;AAK5C,MAAqB,uBAAuB;IAG1C,YAAY,UAAwB;QAFpC,eAAU,GAAiB,EAAE,CAAA;QAG3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAEK,YAAY,
|
|
1
|
+
{"version":3,"file":"DocumentUpdateProcessor.js","sourceRoot":"","sources":["../../../../../src/events/processors/async/DocumentUpdateProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,8CAA6C;AAC7C,iDAAgD;AAChD,mDAA4C;AAK5C,MAAqB,uBAAuB;IAG1C,YAAY,UAAwB;QAFpC,eAAU,GAAiB,EAAE,CAAA;QAG3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;IAEK,YAAY,CAAC,KAAY,EAAE,QAAkB,EAAE,UAAe;;YAClE,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAA;YACtC,MAAM,KAAK,GAAG,IAAA,0BAAa,EAAC,KAAK,EAAE,UAAU,CAAC,CAAA;YAC9C,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE;gBACvB,OAAM;aACP;YACD,KAAK,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC1B,MAAM,IAAA,oBAAU,EAAC,QAAQ,EAAE,GAAS,EAAE;wBACpC,MAAM,SAAS,CAAC;4BACd,EAAE,EAAE,KAAK;4BACT,QAAQ;yBACT,CAAC,CAAA;oBACJ,CAAC,CAAA,CAAC,CAAA;iBACH;aACF;QACH,CAAC;KAAA;IAED,QAAQ;QACN,OAAO,IAAA,sBAAQ,GAAE,CAAA;IACnB,CAAC;CACF;AA5BD,0CA4BC"}
|
|
@@ -24,7 +24,7 @@ const buildMatcherRegex = (patterns) => {
|
|
|
24
24
|
};
|
|
25
25
|
exports.buildMatcherRegex = buildMatcherRegex;
|
|
26
26
|
const matches = (ctx, options) => {
|
|
27
|
-
return options.find(({ regex, method
|
|
27
|
+
return options.find(({ regex, method }) => {
|
|
28
28
|
const urlMatch = regex.test(ctx.request.url);
|
|
29
29
|
const methodMatch = method === "ALL"
|
|
30
30
|
? true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/middleware/matchers.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,mBAAmB,CAAA;AAEhC,MAAM,iBAAiB,GAAG,CAC/B,QAA2B,EACX,EAAE;IAClB,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,EAAE,CAAA;KACV;IACD,OAAO,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;QACzB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAE7B,mCAAmC;QACnC,yBAAyB;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACxC,IAAI,OAAO,EAAE;YACX,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE;gBACzB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC7C,MAAM,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;gBAC9B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aACtC;SACF;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;IACpD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAvBY,QAAA,iBAAiB,qBAuB7B;AAEM,MAAM,OAAO,GAAG,CAAC,GAAc,EAAE,OAAuB,EAAE,EAAE;IACjE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"matchers.js","sourceRoot":"","sources":["../../../src/middleware/matchers.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,mBAAmB,CAAA;AAEhC,MAAM,iBAAiB,GAAG,CAC/B,QAA2B,EACX,EAAE;IAClB,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,EAAE,CAAA;KACV;IACD,OAAO,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC5B,IAAI,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;QACzB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAE7B,mCAAmC;QACnC,yBAAyB;QACzB,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACxC,IAAI,OAAO,EAAE;YACX,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE;gBACzB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAA;gBAC7C,MAAM,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;gBAC9B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;aACtC;SACF;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAA;IACpD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAvBY,QAAA,iBAAiB,qBAuB7B;AAEM,MAAM,OAAO,GAAG,CAAC,GAAc,EAAE,OAAuB,EAAE,EAAE;IACjE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;QACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC5C,MAAM,WAAW,GACf,MAAM,KAAK,KAAK;YACd,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,WAAW,EAAE,CAAA;QAC/D,OAAO,QAAQ,IAAI,WAAW,CAAA;IAChC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AATY,QAAA,OAAO,WASnB"}
|
|
@@ -44,7 +44,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
|
44
44
|
// no-op function for user save
|
|
45
45
|
// - this allows datasource auth and access token refresh to work correctly
|
|
46
46
|
// - prefer no-op over an optional argument to ensure function is provided to login flows
|
|
47
|
-
const ssoSaveUserNoOp = (user
|
|
47
|
+
const ssoSaveUserNoOp = (user) => Promise.resolve(user);
|
|
48
48
|
exports.ssoSaveUserNoOp = ssoSaveUserNoOp;
|
|
49
49
|
/**
|
|
50
50
|
* Common authentication logic for third parties. e.g. OAuth, OIDC.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/sso/sso.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAkD;AAClD,oCAAoC;AACpC,sDAAuC;AACvC,0DAA2C;AAC3C,4DAA8B;
|
|
1
|
+
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../src/middleware/passport/sso/sso.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,10 +67,6 @@ const backPopulateMigrations = (opts) => __awaiter(void 0, void 0, void 0, funct
|
|
|
67
67
|
exports.backPopulateMigrations = backPopulateMigrations;
|
|
68
68
|
const runMigration = (migration, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
69
69
|
const migrationType = migration.type;
|
|
70
|
-
let tenantId;
|
|
71
|
-
if (migrationType !== types_1.MigrationType.INSTALLATION) {
|
|
72
|
-
tenantId = context.getTenantId();
|
|
73
|
-
}
|
|
74
70
|
const migrationName = migration.name;
|
|
75
71
|
const silent = migration.silent;
|
|
76
72
|
const log = (message) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/migrations/migrations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAgD;AAChD,8BAMc;AACd,iEAAwC;AACxC,sDAAuC;AACvC,oDAAqC;AACrC,wBAA+B;AAC/B,2CAMwB;AAEjB,MAAM,gBAAgB,GAAG,CAAO,EAAO,EAAE,EAAE;IAChD,yBAAyB;IACzB,IAAI;QACF,OAAO,MAAM,EAAE,CAAC,GAAG,CAAC,iBAAY,CAAC,UAAU,CAAC,CAAA;KAC7C;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;YACpC,OAAO,EAAE,GAAG,EAAE,iBAAY,CAAC,UAAU,EAAE,CAAA;SACxC;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,MAAM,GAAG,CAAA;SACV;KACF;AACH,CAAC,CAAA,CAAA;AAZY,QAAA,gBAAgB,oBAY5B;AAEM,MAAM,sBAAsB,GAAG,CAAO,IAA0B,EAAE,EAAE;IACzE,+DAA+D;IAC/D,MAAM,UAAU,GAAgB,cAAW,CAAC,MAAM,CAChD,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAC9B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iCAAM,CAAC,KAAE,EAAE,EAAE,GAAG,EAAE,GAAE,CAAC,IAAG,CAAC,CAAA;IACpC,MAAM,IAAA,qBAAa,EAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;AACjD,CAAC,CAAA,CAAA;AANY,QAAA,sBAAsB,0BAMlC;AAEM,MAAM,YAAY,GAAG,CAC1B,SAAoB,EACpB,UAA4B,EAAE,EAC9B,EAAE;IACF,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;IACpC,
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/migrations/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/// <reference types="
|
|
1
|
+
/// <reference types="node" />
|
|
2
2
|
import { Queue, QueueOptions, JobOptions } from "./queue";
|
|
3
3
|
interface JobMessage {
|
|
4
4
|
id: string;
|
|
@@ -17,7 +17,7 @@ declare class InMemoryQueue implements Partial<Queue> {
|
|
|
17
17
|
_opts?: QueueOptions;
|
|
18
18
|
_messages: JobMessage[];
|
|
19
19
|
_queuedJobIds: Set<string>;
|
|
20
|
-
_emitter: EventEmitter;
|
|
20
|
+
_emitter: NodeJS.EventEmitter;
|
|
21
21
|
_runCount: number;
|
|
22
22
|
_addCount: number;
|
|
23
23
|
/**
|
|
@@ -166,7 +166,7 @@ class InMemoryQueue {
|
|
|
166
166
|
return [];
|
|
167
167
|
});
|
|
168
168
|
}
|
|
169
|
-
// eslint-disable-next-line no-unused-vars
|
|
169
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
170
170
|
removeJobs(pattern) {
|
|
171
171
|
return __awaiter(this, void 0, void 0, function* () {
|
|
172
172
|
// no-op
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inMemoryQueue.js","sourceRoot":"","sources":["../../../src/queue/inMemoryQueue.ts"],"names":[],"mappings":"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"}
|
|
@@ -140,7 +140,7 @@ function logging(queue, jobQueue) {
|
|
|
140
140
|
// A Job is waiting to be processed as soon as a worker is idling.
|
|
141
141
|
console.info(...getLogParams(eventType, BullEvent.WAITING, { jobId }));
|
|
142
142
|
})
|
|
143
|
-
.on(BullEvent.ACTIVE, (job
|
|
143
|
+
.on(BullEvent.ACTIVE, (job) => __awaiter(this, void 0, void 0, function* () {
|
|
144
144
|
// A job has started. You can use `jobPromise.cancel()`` to abort it.
|
|
145
145
|
yield doInJobContext(job, () => {
|
|
146
146
|
console.info(...getLogParams(eventType, BullEvent.ACTIVE, { job }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"listeners.js","sourceRoot":"","sources":["../../../src/queue/listeners.ts"],"names":[],"mappings":"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"}
|
package/dist/src/redis/init.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,+CAAgC;AAEhC,IAAI,UAAkB,EACpB,aAAqB,EACrB,SAAiB,EACjB,WAAmB,EACnB,kBAA0B,EAC1B,UAAkB,EAClB,YAAoB,EACpB,YAAoB,EACpB,mBAA2B,EAC3B,qBAA6B,CAAA;AAE/B,SAAsB,IAAI;;QACxB,UAAU,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;QAChE,aAAa,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;QACjE,SAAS,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAA;QACjE,WAAW,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;QACpE,UAAU,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3D,kBAAkB,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3E,YAAY,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAA;QACnE,mBAAmB,GAAG,MAAM,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAA;QACxE,YAAY,GAAG,MAAM,IAAI,eAAM,CAC7B,KAAK,CAAC,SAAS,CAAC,SAAS,EACzB,KAAK,CAAC,kBAAkB,CAAC,SAAS,CACnC,CAAC,IAAI,EAAE,CAAA;QACR,qBAAqB,GAAG,MAAM,IAAI,eAAM,CACtC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAClC,CAAC,IAAI,EAAE,CAAA;IACV,CAAC;CAAA;AAhBD,oBAgBC;AAED,SAAsB,QAAQ;;QAC5B,IAAI,UAAU;YAAE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAA;QACzC,IAAI,aAAa;YAAE,MAAM,aAAa,CAAC,MAAM,EAAE,CAAA;QAC/C,IAAI,SAAS;YAAE,MAAM,SAAS,CAAC,MAAM,EAAE,CAAA;QACvC,IAAI,WAAW;YAAE,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA;QAC3C,IAAI,kBAAkB;YAAE,MAAM,kBAAkB,CAAC,MAAM,EAAE,CAAA;QACzD,IAAI,UAAU;YAAE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAA;QACzC,IAAI,YAAY;YAAE,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;QAC7C,IAAI,mBAAmB;YAAE,MAAM,mBAAmB,CAAC,MAAM,EAAE,CAAA;QAC3D,IAAI,YAAY;YAAE,MAAM,YAAY,CAAC,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/redis/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ export declare class Permission {
|
|
|
8
8
|
level: PermissionLevel;
|
|
9
9
|
constructor(type: PermissionType, level: PermissionLevel);
|
|
10
10
|
}
|
|
11
|
-
export declare function levelToNumber(perm: PermissionLevel): 1 | 0 |
|
|
11
|
+
export declare function levelToNumber(perm: PermissionLevel): 1 | 0 | 2 | -1 | 3;
|
|
12
12
|
/**
|
|
13
13
|
* Given the specified permission level for the user return the levels they are allowed to carry out.
|
|
14
14
|
* @param userPermLevel The permission level of the user.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.22.
|
|
3
|
+
"version": "2.22.7",
|
|
4
4
|
"description": "Budibase backend core libraries used in server and worker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/src/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.22.
|
|
27
|
-
"@budibase/types": "2.22.
|
|
26
|
+
"@budibase/shared-core": "2.22.7",
|
|
27
|
+
"@budibase/types": "2.22.7",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "a3c764383e3f2e3153d5fe6035c610b5f103c4e3"
|
|
101
101
|
}
|
package/src/auth/auth.ts
CHANGED
|
@@ -133,7 +133,7 @@ export async function refreshOAuthToken(
|
|
|
133
133
|
configId?: string
|
|
134
134
|
): Promise<RefreshResponse> {
|
|
135
135
|
switch (providerType) {
|
|
136
|
-
case SSOProviderType.OIDC:
|
|
136
|
+
case SSOProviderType.OIDC: {
|
|
137
137
|
if (!configId) {
|
|
138
138
|
return { err: { data: "OIDC config id not provided" } }
|
|
139
139
|
}
|
|
@@ -142,12 +142,14 @@ export async function refreshOAuthToken(
|
|
|
142
142
|
return { err: { data: "OIDC configuration not found" } }
|
|
143
143
|
}
|
|
144
144
|
return refreshOIDCAccessToken(oidcConfig, refreshToken)
|
|
145
|
-
|
|
145
|
+
}
|
|
146
|
+
case SSOProviderType.GOOGLE: {
|
|
146
147
|
let googleConfig = await configs.getGoogleConfig()
|
|
147
148
|
if (!googleConfig) {
|
|
148
149
|
return { err: { data: "Google configuration not found" } }
|
|
149
150
|
}
|
|
150
151
|
return refreshGoogleAccessToken(googleConfig, refreshToken)
|
|
152
|
+
}
|
|
151
153
|
}
|
|
152
154
|
}
|
|
153
155
|
|
package/src/cache/base/index.ts
CHANGED
package/src/cache/invite.ts
CHANGED
package/src/db/lucene.ts
CHANGED
|
@@ -34,12 +34,12 @@ export async function createUserIndex() {
|
|
|
34
34
|
}
|
|
35
35
|
let idxKey = prev != null ? `${prev}.${key}` : key
|
|
36
36
|
if (typeof input[key] === "string") {
|
|
37
|
+
// @ts-expect-error index is available in a CouchDB map function
|
|
37
38
|
// eslint-disable-next-line no-undef
|
|
38
|
-
// @ts-ignore
|
|
39
39
|
index(idxKey, input[key].toLowerCase(), { facet: true })
|
|
40
40
|
} else if (typeof input[key] !== "object") {
|
|
41
|
+
// @ts-expect-error index is available in a CouchDB map function
|
|
41
42
|
// eslint-disable-next-line no-undef
|
|
42
|
-
// @ts-ignore
|
|
43
43
|
index(idxKey, input[key], { facet: true })
|
|
44
44
|
} else {
|
|
45
45
|
idx(input[key], idxKey)
|
package/src/docUpdates/index.ts
CHANGED
|
@@ -17,13 +17,8 @@ export function init(processors: ProcessorMap) {
|
|
|
17
17
|
// if not processing in this instance, kick it off
|
|
18
18
|
if (!processingPromise) {
|
|
19
19
|
processingPromise = asyncEventQueue.process(async job => {
|
|
20
|
-
const { event, identity, properties
|
|
21
|
-
await documentProcessor.processEvent(
|
|
22
|
-
event,
|
|
23
|
-
identity,
|
|
24
|
-
properties,
|
|
25
|
-
timestamp
|
|
26
|
-
)
|
|
20
|
+
const { event, identity, properties } = job.data
|
|
21
|
+
await documentProcessor.processEvent(event, identity, properties)
|
|
27
22
|
})
|
|
28
23
|
}
|
|
29
24
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
Event,
|
|
3
3
|
Identity,
|
|
4
|
-
Group,
|
|
5
4
|
IdentityType,
|
|
6
5
|
AuditLogQueueEvent,
|
|
7
6
|
AuditLogFn,
|
|
@@ -79,11 +78,11 @@ export default class AuditLogsProcessor implements EventProcessor {
|
|
|
79
78
|
}
|
|
80
79
|
}
|
|
81
80
|
|
|
82
|
-
async identify(
|
|
81
|
+
async identify() {
|
|
83
82
|
// no-op
|
|
84
83
|
}
|
|
85
84
|
|
|
86
|
-
async identifyGroup(
|
|
85
|
+
async identifyGroup() {
|
|
87
86
|
// no-op
|
|
88
87
|
}
|
|
89
88
|
|
|
@@ -8,8 +8,7 @@ export default class LoggingProcessor implements EventProcessor {
|
|
|
8
8
|
async processEvent(
|
|
9
9
|
event: Event,
|
|
10
10
|
identity: Identity,
|
|
11
|
-
properties: any
|
|
12
|
-
timestamp?: string
|
|
11
|
+
properties: any
|
|
13
12
|
): Promise<void> {
|
|
14
13
|
if (skipLogging) {
|
|
15
14
|
return
|
|
@@ -17,14 +16,14 @@ export default class LoggingProcessor implements EventProcessor {
|
|
|
17
16
|
console.log(`[audit] [identityType=${identity.type}] ${event}`, properties)
|
|
18
17
|
}
|
|
19
18
|
|
|
20
|
-
async identify(identity: Identity
|
|
19
|
+
async identify(identity: Identity) {
|
|
21
20
|
if (skipLogging) {
|
|
22
21
|
return
|
|
23
22
|
}
|
|
24
23
|
console.log(`[audit] identified`, identity)
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
async identifyGroup(group: Group
|
|
26
|
+
async identifyGroup(group: Group) {
|
|
28
27
|
if (skipLogging) {
|
|
29
28
|
return
|
|
30
29
|
}
|
|
@@ -14,12 +14,7 @@ export default class DocumentUpdateProcessor implements EventProcessor {
|
|
|
14
14
|
this.processors = processors
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
async processEvent(
|
|
18
|
-
event: Event,
|
|
19
|
-
identity: Identity,
|
|
20
|
-
properties: any,
|
|
21
|
-
timestamp?: string | number
|
|
22
|
-
) {
|
|
17
|
+
async processEvent(event: Event, identity: Identity, properties: any) {
|
|
23
18
|
const tenantId = identity.realTenantId
|
|
24
19
|
const docId = getDocumentId(event, properties)
|
|
25
20
|
if (!tenantId || !docId) {
|
|
@@ -28,7 +28,7 @@ export const buildMatcherRegex = (
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
export const matches = (ctx: BBContext, options: RegexMatcher[]) => {
|
|
31
|
-
return options.find(({ regex, method
|
|
31
|
+
return options.find(({ regex, method }) => {
|
|
32
32
|
const urlMatch = regex.test(ctx.request.url)
|
|
33
33
|
const methodMatch =
|
|
34
34
|
method === "ALL"
|
|
@@ -3,7 +3,7 @@ import { Cookie } from "../../../constants"
|
|
|
3
3
|
import * as configs from "../../../configs"
|
|
4
4
|
import * as cache from "../../../cache"
|
|
5
5
|
import * as utils from "../../../utils"
|
|
6
|
-
import { UserCtx, SSOProfile
|
|
6
|
+
import { UserCtx, SSOProfile } from "@budibase/types"
|
|
7
7
|
import { ssoSaveUserNoOp } from "../sso/sso"
|
|
8
8
|
|
|
9
9
|
const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
|
|
@@ -5,7 +5,6 @@ import * as context from "../../../context"
|
|
|
5
5
|
import fetch from "node-fetch"
|
|
6
6
|
import {
|
|
7
7
|
SaveSSOUserFunction,
|
|
8
|
-
SaveUserOpts,
|
|
9
8
|
SSOAuthDetails,
|
|
10
9
|
SSOUser,
|
|
11
10
|
User,
|
|
@@ -14,10 +13,8 @@ import {
|
|
|
14
13
|
// no-op function for user save
|
|
15
14
|
// - this allows datasource auth and access token refresh to work correctly
|
|
16
15
|
// - prefer no-op over an optional argument to ensure function is provided to login flows
|
|
17
|
-
export const ssoSaveUserNoOp: SaveSSOUserFunction = (
|
|
18
|
-
user
|
|
19
|
-
opts: SaveUserOpts
|
|
20
|
-
) => Promise.resolve(user)
|
|
16
|
+
export const ssoSaveUserNoOp: SaveSSOUserFunction = (user: SSOUser) =>
|
|
17
|
+
Promise.resolve(user)
|
|
21
18
|
|
|
22
19
|
/**
|
|
23
20
|
* Common authentication logic for third parties. e.g. OAuth, OIDC.
|
|
@@ -45,10 +45,6 @@ export const runMigration = async (
|
|
|
45
45
|
options: MigrationOptions = {}
|
|
46
46
|
) => {
|
|
47
47
|
const migrationType = migration.type
|
|
48
|
-
let tenantId: string | undefined
|
|
49
|
-
if (migrationType !== MigrationType.INSTALLATION) {
|
|
50
|
-
tenantId = context.getTenantId()
|
|
51
|
-
}
|
|
52
48
|
const migrationName = migration.name
|
|
53
49
|
const silent = migration.silent
|
|
54
50
|
|
|
@@ -126,7 +126,7 @@ describe("app", () => {
|
|
|
126
126
|
|
|
127
127
|
it("gets url with embedded minio", async () => {
|
|
128
128
|
testEnv.withMinio()
|
|
129
|
-
await testEnv.withTenant(
|
|
129
|
+
await testEnv.withTenant(() => {
|
|
130
130
|
const url = getAppFileUrl()
|
|
131
131
|
expect(url).toBe(
|
|
132
132
|
"/files/signed/prod-budi-app-assets/app_123/attachments/image.jpeg"
|
|
@@ -136,7 +136,7 @@ describe("app", () => {
|
|
|
136
136
|
|
|
137
137
|
it("gets url with custom S3", async () => {
|
|
138
138
|
testEnv.withS3()
|
|
139
|
-
await testEnv.withTenant(
|
|
139
|
+
await testEnv.withTenant(() => {
|
|
140
140
|
const url = getAppFileUrl()
|
|
141
141
|
expect(url).toBe(
|
|
142
142
|
"http://s3.example.com/prod-budi-app-assets/app_123/attachments/image.jpeg"
|
|
@@ -146,7 +146,7 @@ describe("app", () => {
|
|
|
146
146
|
|
|
147
147
|
it("gets url with cloudfront + s3", async () => {
|
|
148
148
|
testEnv.withCloudfront()
|
|
149
|
-
await testEnv.withTenant(
|
|
149
|
+
await testEnv.withTenant(() => {
|
|
150
150
|
const url = getAppFileUrl()
|
|
151
151
|
// omit rest of signed params
|
|
152
152
|
expect(
|