@budibase/server 1.0.27-alpha.1 → 1.0.27-alpha.13

package/dist/api/routes/application.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/application");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const usage = require("../../middleware/usageQuota");
 const router = Router();
 router

package/dist/api/routes/automation.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/automation");
 const authorized = require("../../middleware/authorized");
 const joiValidator = require("../../middleware/joi-validator");
-const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const Joi = require("joi");
 const { bodyResource, paramResource } = require("../../middleware/resourceId");
 const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");

package/dist/api/routes/backup.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/backup");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router.get("/api/backups/export", authorized(BUILDER), controller.exportAppDump);
 module.exports = router;

package/dist/api/routes/cloud.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/cloud");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/cloud/export", authorized(BUILDER), controller.exportApps)

package/dist/api/routes/component.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/component");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router.get("/api/:appId/components/definitions", authorized(BUILDER), controller.fetchAppComponentDefinitions);
 module.exports = router;

package/dist/api/routes/datasource.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const datasourceController = require("../controllers/datasource");
 const authorized = require("../../middleware/authorized");
 const joiValidator = require("../../middleware/joi-validator");
-const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const Joi = require("joi");
 const { DataSourceOperation } = require("../../constants");
 const router = Router();

package/dist/api/routes/deploy.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/deploy");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/deployments", authorized(BUILDER), controller.fetchDeployments)

package/dist/api/routes/dev.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/dev");
 const env = require("../../environment");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 function redirectPath(path) {
     router

package/dist/api/routes/hosting.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/hosting");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/hosting/urls", authorized(BUILDER), controller.fetchUrls)

package/dist/api/routes/integration.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/integration");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/integrations", authorized(BUILDER), controller.fetch)

package/dist/api/routes/layout.js

@@ -1,7 +1,7 @@
 "use strict";
 const Router = require("@koa/router");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const controller = require("../controllers/layout");
 const router = Router();
 router

package/dist/api/routes/metadata.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/metadata");
 const { middleware: appInfoMiddleware, AppType, } = require("../../middleware/appInfo");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .post("/api/metadata/:type/:entityId", authorized(BUILDER), appInfoMiddleware({ appType: AppType.DEV }), controller.saveMetadata)

package/dist/api/routes/permission.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/permission");
 const authorized = require("../../middleware/authorized");
-const { BUILDER, PermissionLevels } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionLevels, } = require("@budibase/backend-core/permissions");
 const Joi = require("joi");
 const joiValidator = require("../../middleware/joi-validator");
 const router = Router();

package/dist/api/routes/query.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const queryController = require("../controllers/query");
 const authorized = require("../../middleware/authorized");
-const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/auth/permissions");
+const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/backend-core/permissions");
 const { bodyResource, bodySubResource, paramResource, } = require("../../middleware/resourceId");
 const { generateQueryPreviewValidation, generateQueryValidation, } = require("../controllers/query/validation");
 const router = Router();
@@ -12,6 +12,8 @@ router
     .post("/api/queries/import", authorized(BUILDER), queryController.import)
     .post("/api/queries/preview", bodyResource("datasourceId"), authorized(BUILDER), generateQueryPreviewValidation(), queryController.preview)
     .get("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.READ), queryController.find)
-    .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.execute)
+    // DEPRECATED - use new query endpoint for future work
+    .post("/api/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.executeV1)
+    .post("/api/v2/queries/:queryId", paramResource("queryId"), authorized(PermissionTypes.QUERY, PermissionLevels.WRITE), queryController.executeV2)
     .delete("/api/queries/:queryId/:revId", paramResource("queryId"), authorized(BUILDER), queryController.destroy);
 module.exports = router;

package/dist/api/routes/role.js

@@ -4,7 +4,7 @@ const controller = require("../controllers/role");
 const authorized = require("../../middleware/authorized");
 const Joi = require("joi");
 const joiValidator = require("../../middleware/joi-validator");
-const { BUILTIN_PERMISSION_IDS, BUILDER, PermissionLevels, } = require("@budibase/auth/permissions");
+const { BUILTIN_PERMISSION_IDS, BUILDER, PermissionLevels, } = require("@budibase/backend-core/permissions");
 const router = Router();
 function generateValidator() {
     const permLevelArray = Object.values(PermissionLevels);

package/dist/api/routes/routing.js

@@ -1,7 +1,7 @@
 "use strict";
 const Router = require("@koa/router");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const controller = require("../controllers/routing");
 const router = Router();
 router

package/dist/api/routes/row.js

@@ -4,7 +4,7 @@ const rowController = require("../controllers/row");
 const authorized = require("../../middleware/authorized");
 const usage = require("../../middleware/usageQuota");
 const { paramResource, paramSubResource, } = require("../../middleware/resourceId");
-const { PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions");
+const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     /**

package/dist/api/routes/screen.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/screen");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const joiValidator = require("../../middleware/joi-validator");
 const Joi = require("joi");
 const router = Router();

package/dist/api/routes/script.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/script");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router.post("/api/script", authorized(BUILDER), controller.save);
 module.exports = router;

package/dist/api/routes/static.js

@@ -12,7 +12,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/static");
 const { budibaseTempDir } = require("../../utilities/budibaseDir");
 const authorized = require("../../middleware/authorized");
-const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/backend-core/permissions");
 const env = require("../../environment");
 const { paramResource } = require("../../middleware/resourceId");
 const router = Router();

package/dist/api/routes/table.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const tableController = require("../controllers/table");
 const authorized = require("../../middleware/authorized");
 const { paramResource, bodyResource } = require("../../middleware/resourceId");
-const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const joiValidator = require("../../middleware/joi-validator");
 const Joi = require("joi");
 const router = Router();

package/dist/api/routes/templates.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/templates");
 const authorized = require("../../middleware/authorized");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/templates", authorized(BUILDER), controller.fetch)

package/dist/api/routes/tests/utilities/TestFunctions.js

@@ -12,7 +12,7 @@ const rowController = require("../../../controllers/row");
 const appController = require("../../../controllers/application");
 const CouchDB = require("../../../../db");
 const { AppStatus } = require("../../../../db/utils");
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { TENANT_ID } = require("../../../../tests/utilities/structures");
 function Request(appId, params) {
     this.appId = appId;

package/dist/api/routes/user.js

@@ -2,7 +2,7 @@
 const Router = require("@koa/router");
 const controller = require("../controllers/user");
 const authorized = require("../../middleware/authorized");
-const { PermissionLevels, PermissionTypes, } = require("@budibase/auth/permissions");
+const { PermissionLevels, PermissionTypes, } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/users/metadata", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.fetchMetadata)

package/dist/api/routes/view.js

@@ -4,7 +4,7 @@ const viewController = require("../controllers/view");
 const rowController = require("../controllers/row");
 const authorized = require("../../middleware/authorized");
 const { paramResource } = require("../../middleware/resourceId");
-const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/auth/permissions");
+const { BUILDER, PermissionTypes, PermissionLevels, } = require("@budibase/backend-core/permissions");
 const router = Router();
 router
     .get("/api/views/export", authorized(BUILDER), viewController.exportView)

package/dist/api/routes/webhook.js

@@ -3,7 +3,7 @@ const Router = require("@koa/router");
 const controller = require("../controllers/webhook");
 const authorized = require("../../middleware/authorized");
 const joiValidator = require("../../middleware/joi-validator");
-const { BUILDER } = require("@budibase/auth/permissions");
+const { BUILDER } = require("@budibase/backend-core/permissions");
 const Joi = require("joi");
 const router = Router();
 function generateSaveValidator() {

package/dist/app.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const env = require("./environment");
 const CouchDB = require("./db");
-require("@budibase/auth").init(CouchDB);
+require("@budibase/backend-core").init(CouchDB);
 const Koa = require("koa");
 const destroyable = require("server-destroy");
 const koaBody = require("koa-body");

package/dist/automations/bullboard.js

@@ -16,7 +16,7 @@ const Queue = env.isTest()
     ? require("../utilities/queue/inMemoryQueue")
     : require("bull");
 const { JobQueues } = require("../constants");
-const { utils } = require("@budibase/auth/redis");
+const { utils } = require("@budibase/backend-core/redis");
 const { opts, redisProtocolUrl } = utils.getRedisOptions();
 const CLEANUP_PERIOD_MS = 60 * 1000;
 const queueConfig = redisProtocolUrl || { redis: opts };

package/dist/automations/steps/executeQuery.js

@@ -55,6 +55,10 @@ exports.definition = {
                     type: "object",
                     description: "The response from the datasource execution",
                 },
+                info: {
+                    type: "object",
+                    description: "Some query types may return extra data, like headers from a REST query",
+                },
                 success: {
                     type: "boolean",
                     description: "Whether the action was successful",
@@ -84,15 +88,18 @@ exports.run = function ({ inputs, appId, emitter }) {
             },
         });
         try {
-            yield queryController.execute(ctx);
+            yield queryController.executeV1(ctx);
+            const _b = ctx.body, { data } = _b, rest = __rest(_b, ["data"]);
             return {
-                response: ctx.body,
+                response: data,
+                info: rest,
                 success: true,
             };
         }
         catch (err) {
             return {
                 success: false,
+                info: {},
                 response: automationUtils.getError(err),
             };
         }

package/dist/automations/utils.js

@@ -16,7 +16,7 @@ const { queue } = require("./bullboard");
 const newid = require("../db/newid");
 const { updateEntityMetadata } = require("../utilities");
 const { MetadataTypes } = require("../constants");
-const { getDeployedAppID } = require("@budibase/auth/db");
+const { getDeployedAppID } = require("@budibase/backend-core/db");
 const { cloneDeep } = require("lodash/fp");
 const WH_STEP_ID = definitions.WEBHOOK.stepId;
 const CRON_STEP_ID = definitions.CRON.stepId;

package/dist/constants/index.js

@@ -1,7 +1,7 @@
 "use strict";
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
-const { UserStatus } = require("@budibase/auth").constants;
-const { ObjectStoreBuckets } = require("@budibase/auth").objectStore;
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { UserStatus } = require("@budibase/backend-core/constants");
+const { ObjectStoreBuckets } = require("@budibase/backend-core/objectStore");
 exports.JobQueues = {
     AUTOMATIONS: "automationQueue",
 };

package/dist/constants/screens.js

@@ -1,5 +1,5 @@
 "use strict";
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { BASE_LAYOUT_PROP_IDS } = require("./layouts");
 exports.createHomeScreen = () => ({
     description: "",

package/dist/db/client.js

@@ -1,6 +1,6 @@
 "use strict";
 const PouchDB = require("pouchdb");
-const { getCouchUrl } = require("@budibase/auth/db");
+const { getCouchUrl } = require("@budibase/backend-core/db");
 const replicationStream = require("pouchdb-replication-stream");
 const allDbs = require("pouchdb-all-dbs");
 const find = require("pouchdb-find");

package/dist/db/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 const newid = require("./newid");
-const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, } = require("@budibase/auth/db");
+const { DocumentTypes: CoreDocTypes, getRoleParams, generateRoleID, APP_DEV_PREFIX, APP_PREFIX, SEPARATOR, StaticDatabases, isDevAppID, isProdAppID, } = require("@budibase/backend-core/db");
 const UNICODE_MAX = "\ufff0";
 const AppStatus = {
     DEV: "development",

package/dist/integrations/base/sqlTable.js

@@ -29,7 +29,7 @@ function generateSchema(schema, table, tables, oldTable = null) {
             case FieldTypes.STRING:
             case FieldTypes.OPTIONS:
             case FieldTypes.LONGFORM:
-                schema.string(key);
+                schema.text(key);
                 break;
             case FieldTypes.NUMBER:
                 // if meta is specified then this is a junction table entry

package/dist/integrations/rest.js

@@ -47,7 +47,7 @@ var RestModule;
     const { performance } = require("perf_hooks");
     const FormData = require("form-data");
     const { URLSearchParams } = require("url");
-    const { parseStringPromise: xmlParser, Builder: XmlBuilder } = require("xml2js");
+    const { parseStringPromise: xmlParser, Builder: XmlBuilder, } = require("xml2js");
     const SCHEMA = {
         docs: "https://github.com/node-fetch/node-fetch",
         description: "With the REST API datasource, you can connect, query and pull data from multiple REST APIs. You can then use the retrieved data to build apps.",
@@ -159,7 +159,7 @@ var RestModule;
         getUrl(path, queryString) {
             const main = `${path}?${queryString}`;
             let complete = main;
-            if (this.config.url && !main.startsWith(this.config.url)) {
+            if (this.config.url && !main.startsWith("http")) {
                 complete = !this.config.url ? main : `${this.config.url}/${main}`;
             }
             if (!complete.startsWith("http")) {
@@ -202,7 +202,7 @@ var RestModule;
                     break;
                 case BodyTypes.XML:
                     if (object != null) {
-                        string = (new XmlBuilder()).buildObject(object);
+                        string = new XmlBuilder().buildObject(object);
                     }
                     input.body = string;
                     input.headers["Content-Type"] = "application/xml";

package/dist/middleware/authorized.js

@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getUserRoleHierarchy, getRequiredResourceRole, BUILTIN_ROLE_IDS, } = require("@budibase/auth/roles");
-const { PermissionTypes, doesHaveBasePermission, } = require("@budibase/auth/permissions");
+const { getUserRoleHierarchy, getRequiredResourceRole, BUILTIN_ROLE_IDS, } = require("@budibase/backend-core/roles");
+const { PermissionTypes, doesHaveBasePermission, } = require("@budibase/backend-core/permissions");
 const builderMiddleware = require("./builder");
 const { isWebhookEndpoint } = require("./utils");
 function hasResource(ctx) {

package/dist/middleware/builder.js

@@ -12,8 +12,8 @@ const { APP_DEV_PREFIX } = require("../db/utils");
 const { doesUserHaveLock, updateLock, checkDebounce, setDebounce, } = require("../utilities/redis");
 const CouchDB = require("../db");
 const { DocumentTypes } = require("../db/utils");
-const { PermissionTypes } = require("@budibase/auth/permissions");
-const { app: appCache } = require("@budibase/auth/cache");
+const { PermissionTypes } = require("@budibase/backend-core/permissions");
+const { app: appCache } = require("@budibase/backend-core/cache");
 const DEBOUNCE_TIME_SEC = 30;
 /************************************************** *
  * This middleware has been broken out of the       *

package/dist/middleware/currentapp.js

@@ -8,13 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getAppId, setCookie, getCookie, clearCookie } = require("@budibase/auth").utils;
-const { Cookies } = require("@budibase/auth").constants;
-const { getRole } = require("@budibase/auth/roles");
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
+const { getAppId, setCookie, getCookie, clearCookie, } = require("@budibase/backend-core/utils");
+const { Cookies } = require("@budibase/backend-core/constants");
+const { getRole } = require("@budibase/backend-core/roles");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const { generateUserMetadataID, isDevAppID } = require("../db/utils");
-const { dbExists } = require("@budibase/auth/db");
-const { isUserInAppTenant } = require("@budibase/auth/tenancy");
+const { dbExists } = require("@budibase/backend-core/db");
+const { isUserInAppTenant } = require("@budibase/backend-core/tenancy");
 const { getCachedSelf } = require("../utilities/global");
 const CouchDB = require("../db");
 const env = require("../environment");

package/dist/middleware/usageQuota.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 const CouchDB = require("../db");
 const usageQuota = require("../utilities/usageQuota");
 const env = require("../environment");
-const { getTenantId } = require("@budibase/auth/tenancy");
+const { getTenantId } = require("@budibase/backend-core/tenancy");
 const { isExternalTable, isRowId: isExternalRowId, } = require("../integrations/utils");
 // tenants without limits
 const EXCLUDED_TENANTS = ["bb", "default", "bbtest", "bbstaging"];

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.27-alpha.0",
+    "version": "1.0.27-alpha.12",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/auth": "^1.0.27-alpha.0",
-        "@budibase/client": "^1.0.27-alpha.0",
-        "@budibase/string-templates": "^1.0.27-alpha.0",
+        "@budibase/backend-core": "^1.0.27-alpha.12",
+        "@budibase/client": "^1.0.27-alpha.12",
+        "@budibase/string-templates": "^1.0.27-alpha.12",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
@@ -122,6 +122,7 @@
         "pouchdb-replication-stream": "1.2.9",
         "server-destroy": "1.0.1",
         "svelte": "^3.38.2",
+        "swagger-parser": "^10.0.3",
         "to-json-schema": "0.2.5",
         "uuid": "3.3.2",
         "validate.js": "0.13.1",

package/dist/tests/utilities/TestConfiguration.js

@@ -8,20 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
 const env = require("../../environment");
 const { basicTable, basicRow, basicRole, basicAutomation, basicDatasource, basicQuery, basicScreen, basicLayout, basicWebhook, TENANT_ID, } = require("./structures");
 const controllers = require("./controllers");
 const supertest = require("supertest");
 const { cleanup } = require("../../utilities/fileSystem");
-const { Cookies, Headers } = require("@budibase/auth").constants;
-const { jwt } = require("@budibase/auth").auth;
-const auth = require("@budibase/auth");
-const { getGlobalDB } = require("@budibase/auth/tenancy");
-const { createASession } = require("@budibase/auth/sessions");
-const { user: userCache } = require("@budibase/auth/cache");
+const { Cookies, Headers } = require("@budibase/backend-core/constants");
+const { jwt } = require("@budibase/backend-core/auth");
+const core = require("@budibase/backend-core");
+const { getGlobalDB } = require("@budibase/backend-core/tenancy");
+const { createASession } = require("@budibase/backend-core/sessions");
+const { user: userCache } = require("@budibase/backend-core/cache");
 const CouchDB = require("../../db");
-auth.init(CouchDB);
+core.init(CouchDB);
 const GLOBAL_USER_ID = "us_uuid1";
 const EMAIL = "babs@babs.com";
 class TestConfiguration {
@@ -294,6 +294,53 @@ class TestConfiguration {
             return this.datasource;
         });
     }
+    updateDatasource(datasource) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this._req(datasource, { datasourceId: datasource._id }, controllers.datasource.update);
+            this.datasource = response.datasource;
+            return this.datasource;
+        });
+    }
+    restDatasource(cfg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.createDatasource({
+                datasource: Object.assign(Object.assign({}, basicDatasource().datasource), { source: "REST", config: cfg || {} }),
+            });
+        });
+    }
+    dynamicVariableDatasource() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let datasource = yield this.restDatasource();
+            const basedOnQuery = yield this.createQuery(Object.assign(Object.assign({}, basicQuery(datasource._id)), { fields: {
+                    path: "www.google.com",
+                } }));
+            datasource = yield this.updateDatasource(Object.assign(Object.assign({}, datasource), { config: {
+                    dynamicVariables: [
+                        {
+                            queryId: basedOnQuery._id,
+                            name: "variable3",
+                            value: "{{ data.0.[value] }}",
+                        },
+                    ],
+                } }));
+            return { datasource, query: basedOnQuery };
+        });
+    }
+    previewQuery(request, config, datasource, fields) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return request
+                .post(`/api/queries/preview`)
+                .send({
+                datasourceId: datasource._id,
+                parameters: {},
+                fields,
+                queryVerb: "read",
+            })
+                .set(config.defaultHeaders())
+                .expect("Content-Type", /json/)
+                .expect(200);
+        });
+    }
     createQuery(config = null) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.datasource && !config) {

package/dist/tests/utilities/structures.js

@@ -1,6 +1,6 @@
 "use strict";
-const { BUILTIN_ROLE_IDS } = require("@budibase/auth/roles");
-const { BUILTIN_PERMISSION_IDS } = require("@budibase/auth/permissions");
+const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
+const { BUILTIN_PERMISSION_IDS } = require("@budibase/backend-core/permissions");
 const { createHomeScreen } = require("../../constants/screens");
 const { EMPTY_LAYOUT } = require("../../constants/layouts");
 const { cloneDeep } = require("lodash/fp");

package/dist/threads/automation.js

@@ -14,10 +14,10 @@ const actions = require("../automations/actions");
 const automationUtils = require("../automations/automationUtils");
 const AutomationEmitter = require("../events/AutomationEmitter");
 const { processObject } = require("@budibase/string-templates");
-const { DEFAULT_TENANT_ID } = require("@budibase/auth").constants;
+const { DEFAULT_TENANT_ID } = require("@budibase/backend-core/constants");
 const CouchDB = require("../db");
 const { DocumentTypes, isDevAppID } = require("../db/utils");
-const { doInTenant } = require("@budibase/auth/tenancy");
+const { doInTenant } = require("@budibase/backend-core/tenancy");
 const usage = require("../utilities/usageQuota");
 const { definitions: triggerDefs } = require("../automations/triggerInfo");
 const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;