@budibase/backend-core 2.29.3 → 2.29.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 +79 -26
- package/dist/index.js.map +3 -3
- package/dist/index.js.meta.json +1 -1
- package/dist/package.json +6 -6
- package/dist/plugins.js.meta.json +1 -1
- package/dist/src/accounts/accounts.js.map +1 -1
- package/dist/src/accounts/api.js.map +1 -1
- package/dist/src/auth/auth.js +5 -5
- package/dist/src/auth/auth.js.map +1 -1
- package/dist/src/blacklist/blacklist.js +2 -3
- package/dist/src/blacklist/blacklist.js.map +1 -1
- package/dist/src/cache/appMetadata.js +3 -3
- package/dist/src/cache/appMetadata.js.map +1 -1
- package/dist/src/cache/base/index.d.ts +1 -1
- package/dist/src/cache/base/index.js +20 -20
- package/dist/src/cache/base/index.js.map +1 -1
- package/dist/src/cache/docWritethrough.js +6 -6
- package/dist/src/cache/docWritethrough.js.map +1 -1
- package/dist/src/cache/generic.d.ts +1 -1
- package/dist/src/cache/invite.js +6 -7
- package/dist/src/cache/invite.js.map +1 -1
- package/dist/src/cache/passwordReset.js +3 -4
- package/dist/src/cache/passwordReset.js.map +1 -1
- package/dist/src/cache/user.js +3 -4
- package/dist/src/cache/user.js.map +1 -1
- package/dist/src/cache/writethrough.js +4 -4
- package/dist/src/cache/writethrough.js.map +1 -1
- package/dist/src/configs/configs.js +23 -23
- package/dist/src/configs/configs.js.map +1 -1
- package/dist/src/context/Context.d.ts +0 -1
- package/dist/src/context/identity.js +5 -6
- package/dist/src/context/identity.js.map +1 -1
- package/dist/src/context/mainContext.js +33 -33
- package/dist/src/context/mainContext.js.map +1 -1
- package/dist/src/db/Replication.d.ts +0 -4
- package/dist/src/db/Replication.js.map +1 -1
- package/dist/src/db/constants.d.ts +1 -3
- package/dist/src/db/constants.js +4 -13
- package/dist/src/db/constants.js.map +1 -1
- package/dist/src/db/couch/DatabaseImpl.d.ts +0 -2
- package/dist/src/db/couch/DatabaseImpl.js +3 -3
- package/dist/src/db/couch/DatabaseImpl.js.map +1 -1
- package/dist/src/db/couch/connections.js.map +1 -1
- package/dist/src/db/couch/pouchDB.d.ts +1 -5
- package/dist/src/db/couch/pouchDB.js +5 -5
- package/dist/src/db/couch/pouchDB.js.map +1 -1
- package/dist/src/db/couch/utils.js +9 -10
- package/dist/src/db/couch/utils.js.map +1 -1
- package/dist/src/db/db.js +4 -5
- package/dist/src/db/db.js.map +1 -1
- package/dist/src/db/errors.js +2 -3
- package/dist/src/db/errors.js.map +1 -1
- package/dist/src/db/instrumentation.d.ts +0 -1
- package/dist/src/db/instrumentation.js.map +1 -1
- package/dist/src/db/lucene.js +3 -3
- package/dist/src/db/lucene.js.map +1 -1
- package/dist/src/db/searchIndexes/searchIndexes.js +1 -2
- package/dist/src/db/searchIndexes/searchIndexes.js.map +1 -1
- package/dist/src/db/utils.js +12 -13
- package/dist/src/db/utils.js.map +1 -1
- package/dist/src/db/views.d.ts +3 -3
- package/dist/src/db/views.js +5 -5
- package/dist/src/db/views.js.map +1 -1
- package/dist/src/docIds/conversions.js +7 -7
- package/dist/src/docIds/conversions.js.map +1 -1
- package/dist/src/docIds/ids.js +12 -12
- package/dist/src/docIds/ids.js.map +1 -1
- package/dist/src/docIds/newid.js +1 -2
- package/dist/src/docIds/newid.js.map +1 -1
- package/dist/src/docIds/params.js +11 -11
- package/dist/src/docIds/params.js.map +1 -1
- package/dist/src/docUpdates/index.js +1 -2
- package/dist/src/docUpdates/index.js.map +1 -1
- package/dist/src/environment.js.map +1 -1
- package/dist/src/errors/errors.js.map +1 -1
- package/dist/src/events/asyncEvents/publisher.js +1 -2
- package/dist/src/events/asyncEvents/publisher.js.map +1 -1
- package/dist/src/events/asyncEvents/queue.js +3 -3
- package/dist/src/events/asyncEvents/queue.js.map +1 -1
- package/dist/src/events/backfill.js.map +1 -1
- package/dist/src/events/documentId.js +1 -2
- package/dist/src/events/documentId.js.map +1 -1
- package/dist/src/events/events.js.map +1 -1
- package/dist/src/events/identification.d.ts +5 -5
- package/dist/src/events/identification.js.map +1 -1
- package/dist/src/events/index.js +2 -2
- package/dist/src/events/index.js.map +1 -1
- package/dist/src/events/processors/AnalyticsProcessor.js.map +1 -1
- package/dist/src/events/processors/AuditLogsProcessor.js.map +1 -1
- package/dist/src/events/processors/LoggingProcessor.js.map +1 -1
- package/dist/src/events/processors/Processors.js.map +1 -1
- package/dist/src/events/processors/async/DocumentUpdateProcessor.js.map +1 -1
- package/dist/src/events/processors/index.js +2 -2
- package/dist/src/events/processors/index.js.map +1 -1
- package/dist/src/events/processors/posthog/PosthogProcessor.js.map +1 -1
- package/dist/src/events/processors/posthog/rateLimiting.js.map +1 -1
- package/dist/src/events/publishers/app.d.ts +1 -1
- package/dist/src/events/publishers/automation.d.ts +1 -1
- package/dist/src/events/publishers/automation.js +6 -6
- package/dist/src/events/publishers/automation.js.map +1 -1
- package/dist/src/events/publishers/backfill.js.map +1 -1
- package/dist/src/events/publishers/query.d.ts +2 -2
- package/dist/src/events/publishers/rows.d.ts +1 -1
- package/dist/src/events/publishers/screen.js +2 -2
- package/dist/src/events/publishers/screen.js.map +1 -1
- package/dist/src/events/publishers/user.js +1 -2
- package/dist/src/events/publishers/user.js.map +1 -1
- package/dist/src/features/index.js +4 -4
- package/dist/src/features/index.js.map +1 -1
- package/dist/src/features/installation.js +1 -2
- package/dist/src/features/installation.js.map +1 -1
- package/dist/src/helpers.js +1 -2
- package/dist/src/helpers.js.map +1 -1
- package/dist/src/index.d.ts +8 -8
- package/dist/src/installation.js.map +1 -1
- package/dist/src/logging/alerts.js +3 -4
- package/dist/src/logging/alerts.js.map +1 -1
- package/dist/src/logging/correlation/correlation.js +2 -2
- package/dist/src/logging/correlation/correlation.js.map +1 -1
- package/dist/src/logging/correlation/middleware.js.map +1 -1
- package/dist/src/logging/pino/logger.js.map +1 -1
- package/dist/src/logging/pino/middleware.js +1 -2
- package/dist/src/logging/pino/middleware.js.map +1 -1
- package/dist/src/logging/system.d.ts +0 -2
- package/dist/src/logging/system.js +3 -4
- package/dist/src/logging/system.js.map +1 -1
- package/dist/src/middleware/adminOnly.js.map +1 -1
- package/dist/src/middleware/authenticated.js +1 -1
- package/dist/src/middleware/authenticated.js.map +1 -1
- package/dist/src/middleware/builderOnly.js.map +1 -1
- package/dist/src/middleware/builderOrAdmin.js.map +1 -1
- package/dist/src/middleware/csrf.js +1 -1
- package/dist/src/middleware/csrf.js.map +1 -1
- package/dist/src/middleware/errorHandling.js +1 -2
- package/dist/src/middleware/errorHandling.js.map +1 -1
- package/dist/src/middleware/internalApi.js.map +1 -1
- package/dist/src/middleware/joi-validator.d.ts +2 -2
- package/dist/src/middleware/joi-validator.js +2 -3
- package/dist/src/middleware/joi-validator.js.map +1 -1
- package/dist/src/middleware/matchers.js.map +1 -1
- package/dist/src/middleware/passport/datasource/google.js +2 -3
- package/dist/src/middleware/passport/datasource/google.js.map +1 -1
- package/dist/src/middleware/passport/local.js +2 -2
- package/dist/src/middleware/passport/local.js.map +1 -1
- package/dist/src/middleware/passport/sso/google.js +3 -4
- package/dist/src/middleware/passport/sso/google.js.map +1 -1
- package/dist/src/middleware/passport/sso/oidc.js +4 -5
- package/dist/src/middleware/passport/sso/oidc.js.map +1 -1
- package/dist/src/middleware/passport/sso/sso.js +5 -5
- package/dist/src/middleware/passport/sso/sso.js.map +1 -1
- package/dist/src/middleware/passport/utils.js +2 -3
- package/dist/src/middleware/passport/utils.js.map +1 -1
- package/dist/src/middleware/querystringToBody.js +1 -1
- package/dist/src/middleware/querystringToBody.js.map +1 -1
- package/dist/src/middleware/tenancy.js +1 -1
- package/dist/src/middleware/tenancy.js.map +1 -1
- package/dist/src/migrations/migrations.js +2 -2
- package/dist/src/migrations/migrations.js.map +1 -1
- package/dist/src/objectStore/buckets/app.js +4 -5
- package/dist/src/objectStore/buckets/app.js.map +1 -1
- package/dist/src/objectStore/buckets/global.js.map +1 -1
- package/dist/src/objectStore/buckets/plugins.js +4 -5
- package/dist/src/objectStore/buckets/plugins.js.map +1 -1
- package/dist/src/objectStore/cloudfront.js.map +1 -1
- package/dist/src/objectStore/objectStore.d.ts +0 -6
- package/dist/src/objectStore/objectStore.js +28 -28
- package/dist/src/objectStore/objectStore.js.map +1 -1
- package/dist/src/objectStore/utils.js +5 -5
- package/dist/src/objectStore/utils.js.map +1 -1
- package/dist/src/platform/platformDb.js +1 -2
- package/dist/src/platform/platformDb.js.map +1 -1
- package/dist/src/platform/tenants.js +6 -6
- package/dist/src/platform/tenants.js.map +1 -1
- package/dist/src/platform/users.js +5 -6
- package/dist/src/platform/users.js.map +1 -1
- package/dist/src/plugin/utils.js +1 -2
- package/dist/src/plugin/utils.js.map +1 -1
- package/dist/src/queue/inMemoryQueue.d.ts +0 -1
- package/dist/src/queue/inMemoryQueue.js +1 -1
- package/dist/src/queue/inMemoryQueue.js.map +1 -1
- package/dist/src/queue/listeners.js +1 -2
- package/dist/src/queue/listeners.js.map +1 -1
- package/dist/src/queue/queue.js +2 -3
- package/dist/src/queue/queue.js.map +1 -1
- package/dist/src/redis/init.js +12 -13
- package/dist/src/redis/init.js.map +1 -1
- package/dist/src/redis/redis.js +6 -6
- package/dist/src/redis/redis.js.map +1 -1
- package/dist/src/redis/redlockImpl.js +7 -7
- package/dist/src/redis/redlockImpl.js.map +1 -1
- package/dist/src/redis/utils.js +5 -5
- package/dist/src/redis/utils.js.map +1 -1
- package/dist/src/security/auth.js +2 -2
- package/dist/src/security/auth.js.map +1 -1
- package/dist/src/security/encryption.js +8 -8
- package/dist/src/security/encryption.js.map +1 -1
- package/dist/src/security/permissions.js +7 -7
- package/dist/src/security/permissions.js.map +1 -1
- package/dist/src/security/roles.js +15 -15
- package/dist/src/security/roles.js.map +1 -1
- package/dist/src/security/sessions.js +8 -9
- package/dist/src/security/sessions.js.map +1 -1
- package/dist/src/sql/designDoc.js +1 -2
- package/dist/src/sql/designDoc.js.map +1 -1
- package/dist/src/sql/sql.js +13 -6
- package/dist/src/sql/sql.js.map +1 -1
- package/dist/src/sql/sqlStatements.d.ts +3 -1
- package/dist/src/sql/sqlStatements.js +8 -2
- package/dist/src/sql/sqlStatements.js.map +1 -1
- package/dist/src/sql/sqlTable.js.map +1 -1
- package/dist/src/sql/utils.js +12 -13
- package/dist/src/sql/utils.js.map +1 -1
- package/dist/src/tenancy/db.js +3 -4
- package/dist/src/tenancy/db.js.map +1 -1
- package/dist/src/tenancy/tenancy.js +2 -2
- package/dist/src/tenancy/tenancy.js.map +1 -1
- package/dist/src/timers/timers.d.ts +0 -1
- package/dist/src/timers/timers.js +3 -4
- package/dist/src/timers/timers.js.map +1 -1
- package/dist/src/users/db.js +7 -7
- package/dist/src/users/db.js.map +1 -1
- package/dist/src/users/events.js.map +1 -1
- package/dist/src/users/lookup.js +5 -6
- package/dist/src/users/lookup.js.map +1 -1
- package/dist/src/users/users.js +25 -26
- package/dist/src/users/users.js.map +1 -1
- package/dist/src/users/utils.js +4 -4
- package/dist/src/users/utils.js.map +1 -1
- package/dist/src/utils/hashing.js +2 -3
- package/dist/src/utils/hashing.js.map +1 -1
- package/dist/src/utils/stringUtils.js +1 -2
- package/dist/src/utils/stringUtils.js.map +1 -1
- package/dist/src/utils/utils.js +15 -16
- package/dist/src/utils/utils.js.map +1 -1
- package/dist/tests/core/logging.js.map +1 -1
- package/dist/tests/core/utilities/jestUtils.js +2 -2
- package/dist/tests/core/utilities/jestUtils.js.map +1 -1
- package/dist/tests/core/utilities/mocks/alerts.d.ts +0 -1
- package/dist/tests/core/utilities/mocks/fetch.d.ts +1 -2
- package/dist/tests/core/utilities/mocks/fetch.js.map +1 -1
- package/dist/tests/core/utilities/mocks/index.d.ts +0 -1
- package/dist/tests/core/utilities/mocks/licenses.js +3 -3
- package/dist/tests/core/utilities/mocks/licenses.js.map +1 -1
- package/dist/tests/core/utilities/structures/Chance.js.map +1 -1
- package/dist/tests/core/utilities/structures/accounts.js +4 -4
- package/dist/tests/core/utilities/structures/accounts.js.map +1 -1
- package/dist/tests/core/utilities/structures/apps.js +1 -2
- package/dist/tests/core/utilities/structures/apps.js.map +1 -1
- package/dist/tests/core/utilities/structures/db.js +2 -3
- package/dist/tests/core/utilities/structures/db.js.map +1 -1
- package/dist/tests/core/utilities/structures/documents/platform/installation.js +1 -2
- package/dist/tests/core/utilities/structures/documents/platform/installation.js.map +1 -1
- package/dist/tests/core/utilities/structures/licenses.js +8 -8
- package/dist/tests/core/utilities/structures/licenses.js.map +1 -1
- package/dist/tests/core/utilities/structures/plugins.js +1 -2
- package/dist/tests/core/utilities/structures/plugins.js.map +1 -1
- package/dist/tests/core/utilities/structures/scim.js +2 -3
- package/dist/tests/core/utilities/structures/scim.js.map +1 -1
- package/dist/tests/core/utilities/structures/sso.js +9 -10
- package/dist/tests/core/utilities/structures/sso.js.map +1 -1
- package/dist/tests/core/utilities/structures/tenants.js +1 -2
- package/dist/tests/core/utilities/structures/tenants.js.map +1 -1
- package/dist/tests/core/utilities/structures/userGroups.js +1 -2
- package/dist/tests/core/utilities/structures/userGroups.js.map +1 -1
- package/dist/tests/core/utilities/structures/users.js +2 -2
- package/dist/tests/core/utilities/structures/users.js.map +1 -1
- package/dist/tests/core/utilities/testContainerUtils.js +5 -6
- package/dist/tests/core/utilities/testContainerUtils.js.map +1 -1
- package/dist/tests/core/utilities/utils/time.js +1 -2
- package/dist/tests/core/utilities/utils/time.js.map +1 -1
- package/dist/tests/extra/DBTestConfiguration.js.map +1 -1
- package/dist/tests/extra/testEnv.js +10 -11
- package/dist/tests/extra/testEnv.js.map +1 -1
- package/dist/tests/jestSetup.js.map +1 -1
- package/package.json +6 -6
- package/src/db/constants.ts +5 -14
- package/src/sql/sql.ts +15 -4
- package/src/sql/sqlStatements.ts +10 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.plugin =
|
|
3
|
+
exports.plugin = plugin;
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
const types_1 = require("@budibase/types");
|
|
6
6
|
function plugin() {
|
|
@@ -19,5 +19,4 @@ function plugin() {
|
|
|
19
19
|
iconFileName: "icon.svg",
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
exports.plugin = plugin;
|
|
23
22
|
//# sourceMappingURL=plugins.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/plugins.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/plugins.ts"],"names":[],"mappings":";;AAGA,wBAeC;AAlBD,wBAA6B;AAC7B,2CAAkE;AAElE,SAAgB,MAAM;IACpB,OAAO;QACL,WAAW,EAAE,YAAS,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,YAAS,CAAC,IAAI,EAAE;QACtB,OAAO,EAAE,OAAO;QAChB,MAAM,EAAE,oBAAY,CAAC,IAAI;QACzB,OAAO,EAAE;YACP,IAAI,EAAE,YAAS,CAAC,IAAI;SACrB;QACD,IAAI,EAAE,YAAS,CAAC,IAAI,EAAE;QACtB,MAAM,EAAE;YACN,IAAI,EAAE,kBAAU,CAAC,UAAU;SAC5B;QACD,YAAY,EAAE,UAAU;KACzB,CAAA;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.createUserRequest = createUserRequest;
|
|
4
|
+
exports.createGroupRequest = createGroupRequest;
|
|
4
5
|
const common_1 = require("./common");
|
|
5
6
|
const generator_1 = require("./generator");
|
|
6
7
|
function createUserRequest(userData) {
|
|
@@ -41,7 +42,6 @@ function createUserRequest(userData) {
|
|
|
41
42
|
}
|
|
42
43
|
return user;
|
|
43
44
|
}
|
|
44
|
-
exports.createUserRequest = createUserRequest;
|
|
45
45
|
function createGroupRequest(groupData) {
|
|
46
46
|
const { externalId = (0, common_1.uuid)(), displayName = generator_1.generator.word() } = groupData || {};
|
|
47
47
|
const group = {
|
|
@@ -59,5 +59,4 @@ function createGroupRequest(groupData) {
|
|
|
59
59
|
};
|
|
60
60
|
return group;
|
|
61
61
|
}
|
|
62
|
-
exports.createGroupRequest = createGroupRequest;
|
|
63
62
|
//# sourceMappingURL=scim.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scim.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/scim.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scim.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/scim.ts"],"names":[],"mappings":";;AAYA,8CA4CC;AAED,gDAqBC;AA9ED,qCAA+B;AAC/B,2CAAuC;AAUvC,SAAgB,iBAAiB,CAAC,QAA2C;IAC3E,MAAM,aAAa,GAAG;QACpB,UAAU,EAAE,IAAA,aAAI,GAAE;QAClB,KAAK,EAAE,GAAG,IAAA,aAAI,GAAE,cAAc;QAC9B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE;QAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE;QAC1B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE;KAC3B,CAAA;IAED,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,mCACrD,aAAa,GACb,QAAQ,CACZ,CAAA;IAED,IAAI,IAAI,GAA0B;QAChC,OAAO,EAAE;YACP,4CAA4C;YAC5C,4DAA4D;SAC7D;QACD,UAAU;QACV,QAAQ,EAAE,QAAQ;QAClB,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE;YACN;gBACE,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,KAAK;aACb;SACF;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,MAAM;SACrB;QACD,KAAK,EAAE,EAAE;KACV,CAAA;IAED,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG;YACV,SAAS,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YACzD,UAAU,EAAE,QAAQ;YACpB,SAAS,EAAE,SAAS;SACrB,CAAA;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAgB,kBAAkB,CAAC,SAGlC;IACC,MAAM,EAAE,UAAU,GAAG,IAAA,aAAI,GAAE,EAAE,WAAW,GAAG,qBAAS,CAAC,IAAI,EAAE,EAAE,GAC3D,SAAS,IAAI,EAAE,CAAA;IAEjB,MAAM,KAAK,GAA2B;QACpC,OAAO,EAAE;YACP,6CAA6C;YAC7C,0EAA0E;SAC3E;QACD,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,WAAW;QACxB,IAAI,EAAE;YACJ,YAAY,EAAE,OAAO;YACrB,OAAO,EAAE,IAAI,IAAI,EAAE;YACnB,YAAY,EAAE,IAAI,IAAI,EAAE;SACzB;KACF,CAAA;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}
|
|
@@ -26,7 +26,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.
|
|
29
|
+
exports.OAuth = OAuth;
|
|
30
|
+
exports.authDetails = authDetails;
|
|
31
|
+
exports.providerType = providerType;
|
|
32
|
+
exports.ssoProfile = ssoProfile;
|
|
33
|
+
exports.oidcConfig = oidcConfig;
|
|
34
|
+
exports.oidcWellKnownConfig = oidcWellKnownConfig;
|
|
35
|
+
exports.jwtClaims = jwtClaims;
|
|
36
|
+
exports.googleConfig = googleConfig;
|
|
37
|
+
exports.googleConfigDoc = googleConfigDoc;
|
|
30
38
|
const types_1 = require("@budibase/types");
|
|
31
39
|
const generator_1 = require("./generator");
|
|
32
40
|
const common_1 = require("./common");
|
|
@@ -38,7 +46,6 @@ function OAuth() {
|
|
|
38
46
|
accessToken: generator_1.generator.string(),
|
|
39
47
|
};
|
|
40
48
|
}
|
|
41
|
-
exports.OAuth = OAuth;
|
|
42
49
|
function authDetails(userDoc) {
|
|
43
50
|
if (!userDoc) {
|
|
44
51
|
userDoc = users.user();
|
|
@@ -57,11 +64,9 @@ function authDetails(userDoc) {
|
|
|
57
64
|
userId,
|
|
58
65
|
};
|
|
59
66
|
}
|
|
60
|
-
exports.authDetails = authDetails;
|
|
61
67
|
function providerType() {
|
|
62
68
|
return (0, sample_1.default)(Object.values(types_1.SSOProviderType));
|
|
63
69
|
}
|
|
64
|
-
exports.providerType = providerType;
|
|
65
70
|
function ssoProfile(user) {
|
|
66
71
|
if (!user) {
|
|
67
72
|
user = users.user();
|
|
@@ -79,7 +84,6 @@ function ssoProfile(user) {
|
|
|
79
84
|
provider: generator_1.generator.string(),
|
|
80
85
|
};
|
|
81
86
|
}
|
|
82
|
-
exports.ssoProfile = ssoProfile;
|
|
83
87
|
// OIDC
|
|
84
88
|
function oidcConfig() {
|
|
85
89
|
return {
|
|
@@ -93,7 +97,6 @@ function oidcConfig() {
|
|
|
93
97
|
scopes: [],
|
|
94
98
|
};
|
|
95
99
|
}
|
|
96
|
-
exports.oidcConfig = oidcConfig;
|
|
97
100
|
// response from .well-known/openid-configuration
|
|
98
101
|
function oidcWellKnownConfig() {
|
|
99
102
|
return {
|
|
@@ -103,14 +106,12 @@ function oidcWellKnownConfig() {
|
|
|
103
106
|
userinfo_endpoint: generator_1.generator.url(),
|
|
104
107
|
};
|
|
105
108
|
}
|
|
106
|
-
exports.oidcWellKnownConfig = oidcWellKnownConfig;
|
|
107
109
|
function jwtClaims() {
|
|
108
110
|
return {
|
|
109
111
|
email: (0, common_1.email)(),
|
|
110
112
|
preferred_username: (0, common_1.email)(),
|
|
111
113
|
};
|
|
112
114
|
}
|
|
113
|
-
exports.jwtClaims = jwtClaims;
|
|
114
115
|
// GOOGLE
|
|
115
116
|
function googleConfig() {
|
|
116
117
|
return {
|
|
@@ -119,7 +120,6 @@ function googleConfig() {
|
|
|
119
120
|
clientSecret: generator_1.generator.string(),
|
|
120
121
|
};
|
|
121
122
|
}
|
|
122
|
-
exports.googleConfig = googleConfig;
|
|
123
123
|
function googleConfigDoc() {
|
|
124
124
|
return {
|
|
125
125
|
_id: "config_google",
|
|
@@ -127,5 +127,4 @@ function googleConfigDoc() {
|
|
|
127
127
|
config: googleConfig(),
|
|
128
128
|
};
|
|
129
129
|
}
|
|
130
|
-
exports.googleConfigDoc = googleConfigDoc;
|
|
131
130
|
//# sourceMappingURL=sso.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/sso.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sso.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/sso.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.id =
|
|
3
|
+
exports.id = id;
|
|
4
4
|
const newid_1 = require("../../../../src/docIds/newid");
|
|
5
5
|
function id() {
|
|
6
6
|
return `tenant-${(0, newid_1.newid)()}`;
|
|
7
7
|
}
|
|
8
|
-
exports.id = id;
|
|
9
8
|
//# sourceMappingURL=tenants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/tenants.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tenants.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/tenants.ts"],"names":[],"mappings":";;AAEA,gBAEC;AAJD,wDAAoD;AAEpD,SAAgB,EAAE;IAChB,OAAO,UAAU,IAAA,aAAK,GAAE,EAAE,CAAA;AAC5B,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.userGroup =
|
|
3
|
+
exports.userGroup = userGroup;
|
|
4
4
|
const generator_1 = require("./generator");
|
|
5
5
|
function userGroup() {
|
|
6
6
|
return {
|
|
@@ -9,5 +9,4 @@ function userGroup() {
|
|
|
9
9
|
color: generator_1.generator.word(),
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
exports.userGroup = userGroup;
|
|
13
12
|
//# sourceMappingURL=userGroups.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userGroups.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/userGroups.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"userGroups.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/userGroups.ts"],"names":[],"mappings":";;AAGA,8BAMC;AARD,2CAAuC;AAEvC,SAAgB,SAAS;IACvB,OAAO;QACL,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;QACtB,IAAI,EAAE,qBAAS,CAAC,IAAI,EAAE;QACtB,KAAK,EAAE,qBAAS,CAAC,IAAI,EAAE;KACxB,CAAA;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.appBuilderUser = exports.builderUser = exports.adminOnlyUser = exports.adminUser = exports.user = exports.newEmail = void 0;
|
|
4
|
+
exports.ssoUser = ssoUser;
|
|
4
5
|
const sso_1 = require("./sso");
|
|
5
6
|
const common_1 = require("./common");
|
|
6
7
|
const generator_1 = require("./generator");
|
|
@@ -52,5 +53,4 @@ function ssoUser(opts = {}) {
|
|
|
52
53
|
picture: base.pictureUrl,
|
|
53
54
|
} });
|
|
54
55
|
}
|
|
55
|
-
exports.ssoUser = ssoUser;
|
|
56
56
|
//# sourceMappingURL=users.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/structures/users.ts"],"names":[],"mappings":";;;AAwEA,0BAqBC;AArFD,+BAAmC;AACnC,qCAA+B;AAC/B,2CAAuC;AACvC,wBAA0B;AAEnB,MAAM,QAAQ,GAAG,GAAG,EAAE;IAC3B,OAAO,GAAG,IAAA,aAAI,GAAE,cAAc,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,QAAQ,YAEpB;AAEM,MAAM,IAAI,GAAG,CAAC,SAAyC,EAAQ,EAAE;IACtE,MAAM,MAAM,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG,CAAA;IAC7B,uBACE,GAAG,EAAE,MAAM,EACX,MAAM,EACN,KAAK,EAAE,IAAA,gBAAQ,GAAE,EACjB,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAC5B,SAAS,EAAE,qBAAS,CAAC,KAAK,EAAE,EAC5B,QAAQ,EAAE,qBAAS,CAAC,IAAI,EAAE,EAC1B,UAAU,EAAE,oBAAoB,EAChC,QAAQ,EAAE,SAAM,CAAC,EAAE,EAAE,IAClB,SAAS,EACb;AACH,CAAC,CAAA;AAdY,QAAA,IAAI,QAchB;AAEM,MAAM,SAAS,GAAG,CAAC,SAAe,EAAa,EAAE;IACtD,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,EACD,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAVY,QAAA,SAAS,aAUrB;AAEM,MAAM,aAAa,GAAG,CAAC,SAAe,EAAiB,EAAE;IAC9D,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,KAAK,EAAE;YACL,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB;AAEM,MAAM,WAAW,GAAG,CAAC,SAAyB,EAAe,EAAE;IACpE,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,MAAM,EAAE,IAAI;SACb,IACF;AACH,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,cAAc,GAAG,CAAC,KAAa,EAAE,SAAe,EAAe,EAAE;IAC5E,uCACK,IAAA,YAAI,EAAC,SAAS,CAAC,KAClB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,KAAK,CAAC;SACd,IACF;AACH,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAED,SAAgB,OAAO,CACrB,OAAiD,EAAE;;IAEnD,MAAM,IAAI,GAAG,IAAA,YAAI,EAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5B,OAAO,IAAI,CAAC,QAAQ,CAAA;IAEpB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,IAAA,iBAAW,EAAC,IAAI,CAAC,CAAA;IAClC,CAAC;IAED,uCACK,IAAI,KACP,kBAAkB,EAAE,KAAK,EACzB,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,MAAM,EAC5B,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAS,EACjC,YAAY,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,YAAa,EACzC,iBAAiB,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,UAAU;SACzB,IACF;AACH,CAAC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getContainerByImage = getContainerByImage;
|
|
4
|
+
exports.getContainerById = getContainerById;
|
|
5
|
+
exports.getExposedV4Ports = getExposedV4Ports;
|
|
6
|
+
exports.getExposedV4Port = getExposedV4Port;
|
|
7
|
+
exports.setupEnv = setupEnv;
|
|
4
8
|
const child_process_1 = require("child_process");
|
|
5
9
|
const IPV4_PORT_REGEX = new RegExp(`0\\.0\\.0\\.0:(\\d+)->(\\d+)/tcp`, "g");
|
|
6
10
|
function getTestcontainers() {
|
|
@@ -26,11 +30,9 @@ function getContainerByImage(image) {
|
|
|
26
30
|
}
|
|
27
31
|
return containers[0];
|
|
28
32
|
}
|
|
29
|
-
exports.getContainerByImage = getContainerByImage;
|
|
30
33
|
function getContainerById(id) {
|
|
31
34
|
return getTestcontainers().find(x => x.ID === id);
|
|
32
35
|
}
|
|
33
|
-
exports.getContainerById = getContainerById;
|
|
34
36
|
function getExposedV4Ports(container) {
|
|
35
37
|
let ports = [];
|
|
36
38
|
for (const match of container.Ports.matchAll(IPV4_PORT_REGEX)) {
|
|
@@ -38,12 +40,10 @@ function getExposedV4Ports(container) {
|
|
|
38
40
|
}
|
|
39
41
|
return ports;
|
|
40
42
|
}
|
|
41
|
-
exports.getExposedV4Ports = getExposedV4Ports;
|
|
42
43
|
function getExposedV4Port(container, port) {
|
|
43
44
|
var _a;
|
|
44
45
|
return (_a = getExposedV4Ports(container).find(x => x.container === port)) === null || _a === void 0 ? void 0 : _a.host;
|
|
45
46
|
}
|
|
46
|
-
exports.getExposedV4Port = getExposedV4Port;
|
|
47
47
|
function setupEnv(...envs) {
|
|
48
48
|
// We start couchdb in globalSetup.ts, in the root of the monorepo, so it
|
|
49
49
|
// should be relatively safe to look for it by its image name.
|
|
@@ -76,5 +76,4 @@ function setupEnv(...envs) {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
-
exports.setupEnv = setupEnv;
|
|
80
79
|
//# sourceMappingURL=testContainerUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testContainerUtils.js","sourceRoot":"","sources":["../../../../tests/core/utilities/testContainerUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addDaysToDate =
|
|
3
|
+
exports.addDaysToDate = addDaysToDate;
|
|
4
4
|
function addDaysToDate(date, days) {
|
|
5
5
|
return new Date(date.getTime() + days * 24 * 60 * 60 * 1000);
|
|
6
6
|
}
|
|
7
|
-
exports.addDaysToDate = addDaysToDate;
|
|
8
7
|
//# sourceMappingURL=time.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/utils/time.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../../../tests/core/utilities/utils/time.ts"],"names":[],"mappings":";;AAAA,sCAEC;AAFD,SAAgB,aAAa,CAAC,IAAU,EAAE,IAAY;IACpD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;AAC9D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBTestConfiguration.js","sourceRoot":"","sources":["../../../tests/extra/DBTestConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgC;AAChC,yEAA0D;AAC1D,mDAAoC;AACpC,2DAA4C;AAE5C,MAAM,mBAAmB;IAGvB;QACE,wDAAwD;QACxD,OAAO,CAAC,WAAW,EAAE,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,UAAU;IAEV,UAAU,CAAI,IAAsB;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC5C,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,WAAW;QACT,IAAI;
|
|
1
|
+
{"version":3,"file":"DBTestConfiguration.js","sourceRoot":"","sources":["../../../tests/extra/DBTestConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAgC;AAChC,yEAA0D;AAC1D,mDAAoC;AACpC,2DAA4C;AAE5C,MAAM,mBAAmB;IAGvB;QACE,wDAAwD;QACxD,OAAO,CAAC,WAAW,EAAE,CAAA;QACrB,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;IACxC,CAAC;IAED,UAAU;IAEV,UAAU,CAAI,IAAsB;QAClC,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;YAC5C,OAAO,IAAI,EAAE,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,WAAW;QACT,IAAI,CAAC;YACH,OAAO,OAAO,CAAC,WAAW,EAAE,CAAA;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,IAAI,CAAC,QAAS,CAAA;QACvB,CAAC;IACH,CAAC;CACF;AAED,kBAAe,mBAAmB,CAAA"}
|
|
@@ -35,7 +35,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
35
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
-
exports.
|
|
38
|
+
exports.withTenant = withTenant;
|
|
39
|
+
exports.singleTenant = singleTenant;
|
|
40
|
+
exports.multiTenant = multiTenant;
|
|
41
|
+
exports.selfHosted = selfHosted;
|
|
42
|
+
exports.cloudHosted = cloudHosted;
|
|
43
|
+
exports.nodeDev = nodeDev;
|
|
44
|
+
exports.nodeJest = nodeJest;
|
|
45
|
+
exports.withS3 = withS3;
|
|
46
|
+
exports.withCloudfront = withCloudfront;
|
|
47
|
+
exports.withMinio = withMinio;
|
|
39
48
|
const environment_1 = __importDefault(require("../../src/environment"));
|
|
40
49
|
const context = __importStar(require("../../src/context"));
|
|
41
50
|
const structures = __importStar(require("../core/utilities/structures"));
|
|
@@ -48,32 +57,25 @@ function withTenant(task) {
|
|
|
48
57
|
}));
|
|
49
58
|
});
|
|
50
59
|
}
|
|
51
|
-
exports.withTenant = withTenant;
|
|
52
60
|
function singleTenant() {
|
|
53
61
|
environment_1.default._set("MULTI_TENANCY", 0);
|
|
54
62
|
}
|
|
55
|
-
exports.singleTenant = singleTenant;
|
|
56
63
|
function multiTenant() {
|
|
57
64
|
environment_1.default._set("MULTI_TENANCY", 1);
|
|
58
65
|
}
|
|
59
|
-
exports.multiTenant = multiTenant;
|
|
60
66
|
function selfHosted() {
|
|
61
67
|
environment_1.default._set("SELF_HOSTED", 1);
|
|
62
68
|
}
|
|
63
|
-
exports.selfHosted = selfHosted;
|
|
64
69
|
function cloudHosted() {
|
|
65
70
|
environment_1.default._set("SELF_HOSTED", 0);
|
|
66
71
|
}
|
|
67
|
-
exports.cloudHosted = cloudHosted;
|
|
68
72
|
// NODE
|
|
69
73
|
function nodeDev() {
|
|
70
74
|
environment_1.default._set("NODE_ENV", "dev");
|
|
71
75
|
}
|
|
72
|
-
exports.nodeDev = nodeDev;
|
|
73
76
|
function nodeJest() {
|
|
74
77
|
environment_1.default._set("NODE_ENV", "jest");
|
|
75
78
|
}
|
|
76
|
-
exports.nodeJest = nodeJest;
|
|
77
79
|
// FILES
|
|
78
80
|
function withS3() {
|
|
79
81
|
environment_1.default._set("NODE_ENV", "production");
|
|
@@ -81,7 +83,6 @@ function withS3() {
|
|
|
81
83
|
environment_1.default._set("MINIO_URL", "http://s3.example.com");
|
|
82
84
|
environment_1.default._set("CLOUDFRONT_CDN", undefined);
|
|
83
85
|
}
|
|
84
|
-
exports.withS3 = withS3;
|
|
85
86
|
const CLOUDFRONT_TEST_KEY = "-----BEGIN RSA PRIVATE KEY-----\n" +
|
|
86
87
|
"MIIEpAIBAAKCAQEAqXRsir/0Qba1xEnybUs7d7QEAE02GRc+4H7HD5l5VnAxkV1m\n" +
|
|
87
88
|
"tNTXTmoYkaIhLdebV1EwQs3T9knxoyd4cVcrDkDfDLZErfYWJsuE3/QYNknnZs4/\n" +
|
|
@@ -116,12 +117,10 @@ function withCloudfront() {
|
|
|
116
117
|
environment_1.default._set("CLOUDFRONT_PUBLIC_KEY_ID", "keypair_123");
|
|
117
118
|
environment_1.default._set("CLOUDFRONT_PRIVATE_KEY_64", CLOUDFRONT_TEST_KEY_64);
|
|
118
119
|
}
|
|
119
|
-
exports.withCloudfront = withCloudfront;
|
|
120
120
|
function withMinio() {
|
|
121
121
|
environment_1.default._set("NODE_ENV", "production");
|
|
122
122
|
environment_1.default._set("MINIO_ENABLED", 1);
|
|
123
123
|
environment_1.default._set("MINIO_URL", "http://minio.example.com");
|
|
124
124
|
environment_1.default._set("CLOUDFRONT_CDN", undefined);
|
|
125
125
|
}
|
|
126
|
-
exports.withMinio = withMinio;
|
|
127
126
|
//# sourceMappingURL=testEnv.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testEnv.js","sourceRoot":"","sources":["../../../tests/extra/testEnv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testEnv.js","sourceRoot":"","sources":["../../../tests/extra/testEnv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jestSetup.js","sourceRoot":"","sources":["../../tests/jestSetup.ts"],"names":[],"mappings":";;;;;AAAA,0BAAuB;AACvB,qEAAoC;AACpC,0CAAuC;AACvC,gDAA4D;AAE5D,oCAAoC;AACpC,iBAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;AAEpB,6CAA6C;AAC7C,uDAAuD;AACvD,4DAA2B;AAE3B,oBAAE,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAE/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"jestSetup.js","sourceRoot":"","sources":["../../tests/jestSetup.ts"],"names":[],"mappings":";;;;;AAAA,0BAAuB;AACvB,qEAAoC;AACpC,0CAAuC;AACvC,gDAA4D;AAE5D,oCAAoC;AACpC,iBAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAA;AAEpB,6CAA6C;AAC7C,uDAAuD;AACvD,4DAA2B;AAE3B,oBAAE,CAAC,MAAM,CAAC,iBAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAE/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACvB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA,CAAC,mCAAmC;AAC7D,CAAC;AAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;IACpB,4CAA4C;IAC5C,cAAc;IACd,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;AACzB,CAAC;AAED,8BAAkB,CAAC,QAAQ,CAAC,qBAAG,CAAC,CAAA;AAEhC,QAAQ,CAAC,GAAG,EAAE;IACZ,IAAA,gBAAO,GAAE,CAAA;AACX,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@budibase/backend-core",
|
|
3
|
-
"version": "2.29.
|
|
3
|
+
"version": "2.29.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",
|
|
@@ -16,15 +16,15 @@
|
|
|
16
16
|
"prepack": "cp package.json dist",
|
|
17
17
|
"build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js",
|
|
18
18
|
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
|
|
19
|
-
"check:types": "tsc -p tsconfig.json --noEmit --paths null",
|
|
19
|
+
"check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
|
|
20
20
|
"test": "bash scripts/test.sh",
|
|
21
21
|
"test:watch": "jest --watchAll"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@budibase/nano": "10.1.5",
|
|
25
25
|
"@budibase/pouchdb-replication-stream": "1.2.10",
|
|
26
|
-
"@budibase/shared-core": "2.29.
|
|
27
|
-
"@budibase/types": "2.29.
|
|
26
|
+
"@budibase/shared-core": "2.29.7",
|
|
27
|
+
"@budibase/types": "2.29.7",
|
|
28
28
|
"@govtechsg/passport-openidconnect": "^1.0.2",
|
|
29
29
|
"aws-cloudfront-sign": "3.0.2",
|
|
30
30
|
"aws-sdk": "2.1030.0",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"pouchdb-adapter-memory": "7.2.2",
|
|
80
80
|
"testcontainers": "^10.7.2",
|
|
81
81
|
"timekeeper": "2.2.0",
|
|
82
|
-
"typescript": "5.
|
|
82
|
+
"typescript": "5.5.2"
|
|
83
83
|
},
|
|
84
84
|
"nx": {
|
|
85
85
|
"targets": {
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
}
|
|
97
97
|
}
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "29579f5ba2e95a7ba4d222409c94a976df1c9539"
|
|
100
100
|
}
|
package/src/db/constants.ts
CHANGED
|
@@ -1,14 +1,5 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
"updatedAt",
|
|
7
|
-
"tableId",
|
|
8
|
-
] as const
|
|
9
|
-
|
|
10
|
-
export const CONSTANT_EXTERNAL_ROW_COLS = ["_id", "_rev", "tableId"] as const
|
|
11
|
-
|
|
12
|
-
export function isInternalColumnName(name: string): boolean {
|
|
13
|
-
return (CONSTANT_INTERNAL_ROW_COLS as readonly string[]).includes(name)
|
|
14
|
-
}
|
|
1
|
+
export {
|
|
2
|
+
CONSTANT_INTERNAL_ROW_COLS,
|
|
3
|
+
CONSTANT_EXTERNAL_ROW_COLS,
|
|
4
|
+
isInternalColumnName,
|
|
5
|
+
} from "@budibase/shared-core"
|
package/src/sql/sql.ts
CHANGED
|
@@ -184,7 +184,11 @@ class InternalBuilder {
|
|
|
184
184
|
query: Knex.QueryBuilder,
|
|
185
185
|
filters: SearchFilters | undefined,
|
|
186
186
|
table: Table,
|
|
187
|
-
opts: {
|
|
187
|
+
opts: {
|
|
188
|
+
aliases?: Record<string, string>
|
|
189
|
+
relationship?: boolean
|
|
190
|
+
columnPrefix?: string
|
|
191
|
+
}
|
|
188
192
|
): Knex.QueryBuilder {
|
|
189
193
|
if (!filters) {
|
|
190
194
|
return query
|
|
@@ -192,7 +196,10 @@ class InternalBuilder {
|
|
|
192
196
|
filters = parseFilters(filters)
|
|
193
197
|
// if all or specified in filters, then everything is an or
|
|
194
198
|
const allOr = filters.allOr
|
|
195
|
-
const sqlStatements = new SqlStatements(this.client, table, {
|
|
199
|
+
const sqlStatements = new SqlStatements(this.client, table, {
|
|
200
|
+
allOr,
|
|
201
|
+
columnPrefix: opts.columnPrefix,
|
|
202
|
+
})
|
|
196
203
|
const tableName =
|
|
197
204
|
this.client === SqlClient.SQL_LITE ? table._id! : table.name
|
|
198
205
|
|
|
@@ -397,9 +404,9 @@ class InternalBuilder {
|
|
|
397
404
|
contains(filters.containsAny, true)
|
|
398
405
|
}
|
|
399
406
|
|
|
407
|
+
const tableRef = opts?.aliases?.[table._id!] || table._id
|
|
400
408
|
// when searching internal tables make sure long looking for rows
|
|
401
|
-
if (filters.documentType && !isExternalTable(table)) {
|
|
402
|
-
const tableRef = opts?.aliases?.[table._id!] || table._id
|
|
409
|
+
if (filters.documentType && !isExternalTable(table) && tableRef) {
|
|
403
410
|
// has to be its own option, must always be AND onto the search
|
|
404
411
|
query.andWhereLike(
|
|
405
412
|
`${tableRef}._id`,
|
|
@@ -663,6 +670,7 @@ class InternalBuilder {
|
|
|
663
670
|
}
|
|
664
671
|
// add filters to the query (where)
|
|
665
672
|
query = this.addFilters(query, filters, json.meta.table, {
|
|
673
|
+
columnPrefix: json.meta.columnPrefix,
|
|
666
674
|
aliases: tableAliases,
|
|
667
675
|
})
|
|
668
676
|
|
|
@@ -698,6 +706,7 @@ class InternalBuilder {
|
|
|
698
706
|
}
|
|
699
707
|
|
|
700
708
|
return this.addFilters(query, filters, json.meta.table, {
|
|
709
|
+
columnPrefix: json.meta.columnPrefix,
|
|
701
710
|
relationship: true,
|
|
702
711
|
aliases: tableAliases,
|
|
703
712
|
})
|
|
@@ -708,6 +717,7 @@ class InternalBuilder {
|
|
|
708
717
|
let query = this.knexWithAlias(knex, endpoint, tableAliases)
|
|
709
718
|
const parsedBody = parseBody(body)
|
|
710
719
|
query = this.addFilters(query, filters, json.meta.table, {
|
|
720
|
+
columnPrefix: json.meta.columnPrefix,
|
|
711
721
|
aliases: tableAliases,
|
|
712
722
|
})
|
|
713
723
|
// mysql can't use returning
|
|
@@ -722,6 +732,7 @@ class InternalBuilder {
|
|
|
722
732
|
const { endpoint, filters, tableAliases } = json
|
|
723
733
|
let query = this.knexWithAlias(knex, endpoint, tableAliases)
|
|
724
734
|
query = this.addFilters(query, filters, json.meta.table, {
|
|
735
|
+
columnPrefix: json.meta.columnPrefix,
|
|
725
736
|
aliases: tableAliases,
|
|
726
737
|
})
|
|
727
738
|
// mysql can't use returning
|
package/src/sql/sqlStatements.ts
CHANGED
|
@@ -5,19 +5,27 @@ export class SqlStatements {
|
|
|
5
5
|
client: string
|
|
6
6
|
table: Table
|
|
7
7
|
allOr: boolean | undefined
|
|
8
|
+
columnPrefix: string | undefined
|
|
9
|
+
|
|
8
10
|
constructor(
|
|
9
11
|
client: string,
|
|
10
12
|
table: Table,
|
|
11
|
-
{ allOr }: { allOr?: boolean } = {}
|
|
13
|
+
{ allOr, columnPrefix }: { allOr?: boolean; columnPrefix?: string } = {}
|
|
12
14
|
) {
|
|
13
15
|
this.client = client
|
|
14
16
|
this.table = table
|
|
15
17
|
this.allOr = allOr
|
|
18
|
+
this.columnPrefix = columnPrefix
|
|
16
19
|
}
|
|
17
20
|
|
|
18
21
|
getField(key: string): FieldSchema | undefined {
|
|
19
22
|
const fieldName = key.split(".")[1]
|
|
20
|
-
|
|
23
|
+
let found = this.table.schema[fieldName]
|
|
24
|
+
if (!found && this.columnPrefix) {
|
|
25
|
+
const prefixRemovedFieldName = fieldName.replace(this.columnPrefix, "")
|
|
26
|
+
found = this.table.schema[prefixRemovedFieldName]
|
|
27
|
+
}
|
|
28
|
+
return found
|
|
21
29
|
}
|
|
22
30
|
|
|
23
31
|
between(
|