@budibase/server 1.0.32 → 1.0.39

package/dist/api/routes/query.js

@@ -2,46 +2,18 @@
 const Router = require("@koa/router");
 const queryController = require("../controllers/query");
 const authorized = require("../../middleware/authorized");
-const Joi = require("joi");
-const { PermissionLevels, PermissionTypes, BUILDER, } = require("@budibase/auth/permissions");
-const joiValidator = require("../../middleware/joi-validator");
+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();
-function generateQueryValidation() {
-    // prettier-ignore
-    return joiValidator.body(Joi.object({
-        _id: Joi.string(),
-        _rev: Joi.string(),
-        name: Joi.string().required(),
-        fields: Joi.object().required(),
-        datasourceId: Joi.string().required(),
-        readable: Joi.boolean(),
-        parameters: Joi.array().items(Joi.object({
-            name: Joi.string(),
-            default: Joi.string().allow(""),
-        })),
-        queryVerb: Joi.string().allow().required(),
-        extra: Joi.object().optional(),
-        schema: Joi.object({}).required().unknown(true),
-        transformer: Joi.string().optional(),
-    }));
-}
-function generateQueryPreviewValidation() {
-    // prettier-ignore
-    return joiValidator.body(Joi.object({
-        fields: Joi.object().required(),
-        queryVerb: Joi.string().allow().required(),
-        extra: Joi.object().optional(),
-        datasourceId: Joi.string().required(),
-        transformer: Joi.string().optional(),
-        parameters: Joi.object({}).required().unknown(true)
-    }));
-}
 router
     .get("/api/queries", authorized(BUILDER), queryController.fetch)
     .post("/api/queries", bodySubResource("datasourceId", "_id"), authorized(BUILDER), generateQueryValidation(), queryController.save)
+    .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)
@@ -10,5 +10,7 @@ router
     .put("/api/users/metadata", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.updateMetadata)
     .post("/api/users/metadata/self", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.updateSelfMetadata)
     .delete("/api/users/metadata/:id", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.destroyMetadata)
-    .post("/api/users/metadata/sync/:id", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.syncUser);
+    .post("/api/users/metadata/sync/:id", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.syncUser)
+    .post("/api/users/flags", authorized(PermissionTypes.USER, PermissionLevels.WRITE), controller.setFlag)
+    .get("/api/users/flags", authorized(PermissionTypes.USER, PermissionLevels.READ), controller.getFlags);
 module.exports = router;

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/steps/outgoingWebhook.js

@@ -20,11 +20,10 @@ const RequestType = {
 };
 const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH];
 /**
- * Note, there is some functionality in this that is not currently exposed as it
- * is complex and maybe better to be opinionated here.
- * GET/DELETE requests cannot handle body elements so they will not be sent if configured.
+ * NOTE: this functionality is deprecated - it no longer should be used.
  */
 exports.definition = {
+    deprecated: true,
     name: "Outgoing webhook",
     tagline: "Send a {{inputs.requestMethod}} request",
     icon: "Send",

package/dist/automations/utils.js

@@ -16,7 +16,8 @@ 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;
 const Runner = new Thread(ThreadType.AUTOMATION);
@@ -43,6 +44,15 @@ exports.updateTestHistory = (appId, automation, history) => __awaiter(void 0, vo
         return metadata;
     });
 });
+exports.removeDeprecated = definitions => {
+    const base = cloneDeep(definitions);
+    for (let key of Object.keys(base)) {
+        if (base[key].deprecated) {
+            delete base[key];
+        }
+    }
+    return base;
+};
 // end the repetition and the job itself
 exports.disableAllCrons = (appId) => __awaiter(void 0, void 0, void 0, function* () {
     const promises = [];

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",
@@ -28,6 +28,7 @@ const DocumentTypes = {
     DEPLOYMENTS: "deployments",
     METADATA: "metadata",
     MEM_VIEW: "view",
+    USER_FLAG: "flag",
 };
 const ViewNames = {
     LINK: "by_link",
@@ -271,6 +272,13 @@ exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
     }
     return getDocParams(DocumentTypes.QUERY, `${datasourceId}${SEPARATOR}`, otherProps);
 };
+/**
+ * Generates a new flag document ID.
+ * @returns {string} The ID of the flag document that was generated.
+ */
+exports.generateUserFlagID = userId => {
+    return `${DocumentTypes.USER_FLAG}${SEPARATOR}${userId}`;
+};
 exports.generateMetadataID = (type, entityId) => {
     return `${DocumentTypes.METADATA}${SEPARATOR}${type}${SEPARATOR}${entityId}`;
 };

package/dist/definitions/datasource.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilterTypes = exports.IncludeRelationships = exports.SourceNames = exports.DatasourceFieldTypes = exports.QueryTypes = exports.SortDirection = exports.Operation = void 0;
+exports.AuthType = exports.FilterTypes = exports.IncludeRelationships = exports.SourceNames = exports.DatasourceFieldTypes = exports.QueryTypes = exports.SortDirection = exports.Operation = void 0;
 var Operation;
 (function (Operation) {
     Operation["CREATE"] = "CREATE";
@@ -66,3 +66,8 @@ var FilterTypes;
     FilterTypes["NOT_EMPTY"] = "notEmpty";
     FilterTypes["ONE_OF"] = "oneOf";
 })(FilterTypes = exports.FilterTypes || (exports.FilterTypes = {}));
+var AuthType;
+(function (AuthType) {
+    AuthType["BASIC"] = "basic";
+    AuthType["BEARER"] = "bearer";
+})(AuthType = exports.AuthType || (exports.AuthType = {}));

package/dist/environment.js

@@ -57,6 +57,7 @@ module.exports = {
     DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
+    QUERY_THREAD_TIMEOUT: process.env.QUERY_THREAD_TIMEOUT,
     _set(key, value) {
         process.env[key] = value;
         module.exports[key] = value;

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/dynamodb.js

@@ -77,6 +77,17 @@ var DynamoModule;
                     },
                 },
             },
+            describe: {
+                type: datasource_1.QueryTypes.FIELDS,
+                customisable: true,
+                readable: true,
+                fields: {
+                    table: {
+                        type: datasource_1.DatasourceFieldTypes.STRING,
+                        required: true,
+                    },
+                },
+            },
             get: {
                 type: datasource_1.QueryTypes.FIELDS,
                 customisable: true,
@@ -161,6 +172,14 @@ var DynamoModule;
                 return response;
             });
         }
+        describe(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                const params = {
+                    TableName: query.table,
+                };
+                return new AWS.DynamoDB().describeTable(params).promise();
+            });
+        }
         get(query) {
             return __awaiter(this, void 0, void 0, function* () {
                 const params = Object.assign({ TableName: query.table }, query.json);