@budibase/server 1.0.27-alpha.2 → 1.0.27-alpha.23

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/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);

package/dist/integrations/rest.js

@@ -39,6 +39,9 @@ const coreFields = {
         type: datasource_1.DatasourceFieldTypes.STRING,
         enum: Object.values(BodyTypes),
     },
+    pagination: {
+        type: datasource_1.DatasourceFieldTypes.OBJECT,
+    },
 };
 var RestModule;
 (function (RestModule) {
@@ -47,7 +50,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.",
@@ -103,7 +106,7 @@ var RestModule;
             this.startTimeMs = performance.now();
             this.config = config;
         }
-        parseResponse(response) {
+        parseResponse(response, pagination) {
             return __awaiter(this, void 0, void 0, function* () {
                 let data, raw, headers;
                 const contentType = response.headers.get("content-type") || "";
@@ -142,6 +145,11 @@ var RestModule;
                 for (let [key, value] of Object.entries(headers)) {
                     headers[key] = Array.isArray(value) ? value[0] : value;
                 }
+                // Check if a pagination cursor exists in the response
+                let nextCursor = null;
+                if (pagination === null || pagination === void 0 ? void 0 : pagination.responseParam) {
+                    nextCursor = data === null || data === void 0 ? void 0 : data[pagination.responseParam];
+                }
                 return {
                     data,
                     info: {
@@ -153,13 +161,34 @@ var RestModule;
                         raw,
                         headers,
                     },
+                    pagination: {
+                        cursor: nextCursor,
+                    },
                 };
             });
         }
-        getUrl(path, queryString) {
+        getUrl(path, queryString, pagination, paginationValues) {
+            // Add pagination params to query string if required
+            if ((pagination === null || pagination === void 0 ? void 0 : pagination.location) === "query" && paginationValues) {
+                const { pageParam, sizeParam } = pagination;
+                const params = new URLSearchParams();
+                // Append page number or cursor param if configured
+                if (pageParam && paginationValues.page != null) {
+                    params.append(pageParam, paginationValues.page);
+                }
+                // Append page size param if configured
+                if (sizeParam && paginationValues.limit != null) {
+                    params.append(sizeParam, paginationValues.limit);
+                }
+                // Prepend query string with pagination params
+                let paginationString = params.toString();
+                if (paginationString) {
+                    queryString = `${paginationString}&${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")) {
@@ -167,21 +196,35 @@ var RestModule;
             }
             return complete;
         }
-        addBody(bodyType, body, input) {
-            let error, object, string;
+        addBody(bodyType, body, input, pagination, paginationValues) {
+            if (!input.headers) {
+                input.headers = {};
+            }
+            if (bodyType === BodyTypes.NONE) {
+                return input;
+            }
+            let error, object = {}, string = "";
             try {
-                string = typeof body !== "string" ? JSON.stringify(body) : body;
-                object = typeof body === "object" ? body : JSON.parse(body);
+                if (body) {
+                    string = typeof body !== "string" ? JSON.stringify(body) : body;
+                    object = typeof body === "object" ? body : JSON.parse(body);
+                }
             }
             catch (err) {
                 error = err;
             }
-            if (!input.headers) {
-                input.headers = {};
-            }
+            // Util to add pagination values to a certain body type
+            const addPaginationToBody = (insertFn) => {
+                if ((pagination === null || pagination === void 0 ? void 0 : pagination.location) === "body") {
+                    if ((pagination === null || pagination === void 0 ? void 0 : pagination.pageParam) && (paginationValues === null || paginationValues === void 0 ? void 0 : paginationValues.page) != null) {
+                        insertFn(pagination.pageParam, paginationValues.page);
+                    }
+                    if ((pagination === null || pagination === void 0 ? void 0 : pagination.sizeParam) && (paginationValues === null || paginationValues === void 0 ? void 0 : paginationValues.limit) != null) {
+                        insertFn(pagination.sizeParam, paginationValues.limit);
+                    }
+                }
+            };
             switch (bodyType) {
-                case BodyTypes.NONE:
-                    break;
                 case BodyTypes.TEXT:
                     // content type defaults to plaintext
                     input.body = string;
@@ -191,6 +234,9 @@ var RestModule;
                     for (let [key, value] of Object.entries(object)) {
                         params.append(key, value);
                     }
+                    addPaginationToBody((key, value) => {
+                        params.append(key, value);
+                    });
                     input.body = params;
                     break;
                 case BodyTypes.FORM_DATA:
@@ -198,22 +244,27 @@ var RestModule;
                     for (let [key, value] of Object.entries(object)) {
                         form.append(key, value);
                     }
+                    addPaginationToBody((key, value) => {
+                        form.append(key, value);
+                    });
                     input.body = form;
                     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";
                     break;
-                default:
                 case BodyTypes.JSON:
                     // if JSON error, throw it
                     if (error) {
                         throw "Invalid JSON for request body";
                     }
-                    input.body = string;
+                    addPaginationToBody((key, value) => {
+                        object[key] = value;
+                    });
+                    input.body = JSON.stringify(object);
                     input.headers["Content-Type"] = "application/json";
                     break;
             }
@@ -243,7 +294,7 @@ var RestModule;
         }
         _req(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, } = query;
+                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId, pagination, paginationValues, } = query;
                 const authHeaders = this.getAuthHeaders(authConfigId);
                 this.headers = Object.assign(Object.assign(Object.assign({}, this.config.defaultHeaders), headers), authHeaders);
                 if (disabledHeaders) {
@@ -254,13 +305,11 @@ var RestModule;
                     }
                 }
                 let input = { method, headers: this.headers };
-                if (requestBody) {
-                    input = this.addBody(bodyType, requestBody, input);
-                }
+                input = this.addBody(bodyType, requestBody, input, pagination, paginationValues);
                 this.startTimeMs = performance.now();
-                const url = this.getUrl(path, queryString);
+                const url = this.getUrl(path, queryString, pagination, paginationValues);
                 const response = yield fetch(url, input);
-                return yield this.parseResponse(response);
+                return yield this.parseResponse(response, pagination);
             });
         }
         create(opts) {

package/dist/integrations/s3.js

@@ -20,7 +20,7 @@ var S3Module;
         datasource: {
             region: {
                 type: "string",
-                required: true,
+                required: false,
                 default: "us-east-1",
             },
             accessKeyId: {
@@ -31,6 +31,15 @@ var S3Module;
                 type: "password",
                 required: true,
             },
+            endpoint: {
+                type: "string",
+                required: false,
+            },
+            signatureVersion: {
+                type: "string",
+                required: false,
+                default: "v4",
+            },
         },
         query: {
             read: {
@@ -47,13 +56,13 @@ var S3Module;
     class S3Integration {
         constructor(config) {
             this.config = config;
-            this.connectionPromise = this.connect();
-            this.client = new AWS.S3();
-        }
-        connect() {
-            return __awaiter(this, void 0, void 0, function* () {
-                AWS.config.update(this.config);
-            });
+            if (this.config.endpoint) {
+                this.config.s3ForcePathStyle = true;
+            }
+            else {
+                delete this.config.endpoint;
+            }
+            this.client = new AWS.S3(this.config);
         }
         read(query) {
             return __awaiter(this, void 0, void 0, function* () {