@budibase/server 1.0.89 → 1.0.90

package/dist/api/controllers/row/external.js

@@ -23,6 +23,8 @@ const { DataSourceOperation, SortDirection, FieldTypes, NoEmptyFilterStrings, }
 const { breakExternalTableId, breakRowIdField, } = require("../../../integrations/utils");
 const ExternalRequest = require("./ExternalRequest");
 const { getAppDB } = require("@budibase/backend-core/context");
+const exporters = require("../view/exporters");
+const { apiFileReturn } = require("../../../utilities/fileSystem");
 function handleRequest(operation, tableId, opts = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
@@ -155,6 +157,7 @@ exports.validate = () => __awaiter(void 0, void 0, void 0, function* () {
 exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId);
     const db = getAppDB();
+    let format = ctx.query.format;
     const datasource = yield db.get(datasourceId);
     if (!datasource || !datasource.entities) {
         ctx.throw(400, "Datasource has not been configured for plus API.");
@@ -164,11 +167,17 @@ exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     ctx.request.body = {
         query: {
             oneOf: {
-                [table.primaryDisplay]: ctx.request.body.map(id => breakRowIdField(id)[0]),
+                [table.primaryDisplay]: ctx.request.body.rows.map(id => breakRowIdField(id)[0]),
             },
         },
     };
-    return exports.search(ctx);
+    let result = yield exports.search(ctx);
+    let headers = Object.keys(result.rows[0]);
+    const exporter = exporters[format];
+    const filename = `export.${format}`;
+    // send down the file
+    ctx.attachment(filename);
+    return apiFileReturn(exporter(headers, result.rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const id = ctx.params.rowId;

package/dist/api/controllers/row/internal.js

@@ -33,6 +33,8 @@ const { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMem
 const { cloneDeep } = require("lodash/fp");
 const { getAppDB } = require("@budibase/backend-core/context");
 const { finaliseRow, updateRelatedFormula } = require("./staticFormula");
+const exporters = require("../view/exporters");
+const { apiFileReturn } = require("../../../utilities/fileSystem");
 const CALCULATION_TYPES = {
     SUM: "sum",
     COUNT: "count",
@@ -340,12 +342,18 @@ exports.exportRows = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();
     const table = yield db.get(ctx.params.tableId);
     const rowIds = ctx.request.body.rows;
+    let format = ctx.query.format;
     let response = (yield db.allDocs({
         include_docs: true,
         keys: rowIds,
     })).rows.map(row => row.doc);
     let rows = yield outputProcessing(table, response);
-    return rows;
+    let headers = Object.keys(rows[0]);
+    const exporter = exporters[format];
+    const filename = `export.${format}`;
+    // send down the file
+    ctx.attachment(filename);
+    return apiFileReturn(exporter(headers, rows));
 });
 exports.fetchEnrichedRow = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const db = getAppDB();

package/dist/api/routes/public/index.js

@@ -10,6 +10,7 @@ const rows_1 = __importDefault(require("./rows"));
 const users_1 = __importDefault(require("./users"));
 const usageQuota_1 = __importDefault(require("../../../middleware/usageQuota"));
 const authorized_1 = __importDefault(require("../../../middleware/authorized"));
+const publicApi_1 = __importDefault(require("../../../middleware/publicApi"));
 const resourceId_1 = require("../../../middleware/resourceId");
 const mapper_1 = __importDefault(require("./middleware/mapper"));
 const environment_1 = __importDefault(require("../../../environment"));
@@ -87,6 +88,11 @@ function applyRoutes(endpoints, permType, resource, subResource) {
     const paramMiddleware = subResource
         ? resourceId_1.paramSubResource(resource, subResource)
         : resourceId_1.paramResource(resource);
+    const publicApiMiddleware = publicApi_1.default({
+        requiresAppId: permType !== PermissionTypes.APP && permType !== PermissionTypes.USER,
+    });
+    addMiddleware(endpoints.read, publicApiMiddleware);
+    addMiddleware(endpoints.write, publicApiMiddleware);
     // add the parameter capture middleware
     addMiddleware(endpoints.read, paramMiddleware);
     addMiddleware(endpoints.write, paramMiddleware);

package/dist/middleware/publicApi.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+const { Headers } = require("@budibase/backend-core/constants");
+const { getAppId } = require("@budibase/backend-core/utils");
+module.exports = function ({ requiresAppId } = {}) {
+    return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
+        const appId = getAppId(ctx);
+        if (requiresAppId && !appId) {
+            ctx.throw(400, `Invalid app ID provided, please check the ${Headers.APP_ID} header.`);
+        }
+        if (!ctx.headers[Headers.API_KEY]) {
+            ctx.throw(400, `Invalid API key provided, please check the ${Headers.API_KEY} header.`);
+        }
+        return next();
+    });
+};

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.88",
+    "version": "1.0.89",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,9 +71,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.88",
-        "@budibase/client": "^1.0.88",
-        "@budibase/string-templates": "^1.0.88",
+        "@budibase/backend-core": "^1.0.89",
+        "@budibase/client": "^1.0.89",
+        "@budibase/string-templates": "^1.0.89",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",