@budibase/server 2.2.11 → 2.2.12-alpha.1

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

@@ -85,6 +85,43 @@ write.push(new Endpoint_1.default("put", "/applications/:appId", applications_1.
  *                 $ref: '#/components/examples/application'
  */
 write.push(new Endpoint_1.default("delete", "/applications/:appId", applications_1.default.destroy));
+/**
+ * @openapi
+ * /applications/{appId}/unpublish:
+ *   post:
+ *     operationId: unpublish
+ *     summary: Unpublish an application
+ *     tags:
+ *       - applications
+ *     parameters:
+ *       - $ref: '#/components/parameters/appIdUrl'
+ *     responses:
+ *       204:
+ *         description: The app was published successfully.
+ */
+write.push(new Endpoint_1.default("post", "/applications/:appId/unpublish", applications_1.default.unpublish));
+/**
+ * @openapi
+ * /applications/{appId}/publish:
+ *   post:
+ *     operationId: publish
+ *     summary: Unpublish an application
+ *     tags:
+ *       - applications
+ *     parameters:
+ *       - $ref: '#/components/parameters/appIdUrl'
+ *     responses:
+ *       200:
+ *         description: Returns the deployment object.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/deploymentOutput'
+ *             examples:
+ *               deployment:
+ *                 $ref: '#/components/examples/deploymentOutput'
+ */
+write.push(new Endpoint_1.default("post", "/applications/:appId/publish", applications_1.default.publish));
 /**
  * @openapi
  * /applications/{appId}:

package/dist/api/routes/public/middleware/mapper.js

@@ -66,6 +66,9 @@ function processQueries(ctx) {
     }
 }
 exports.default = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!ctx.body) {
+        return yield next();
+    }
     let urlParts = ctx.url.split("/");
     urlParts = urlParts.slice(4, urlParts.length);
     let body = {};

package/dist/automations/automationUtils.js

@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
+exports.typecastForLooping = exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
 const string_templates_1 = require("@budibase/string-templates");
 const sdk_1 = __importDefault(require("../sdk"));
+const automations_1 = require("../definitions/automations");
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
  * This can generate some odd scenarios as the Schema of the automation requires a number but the builder might supply
@@ -132,3 +133,27 @@ function stringSplit(value) {
     return value;
 }
 exports.stringSplit = stringSplit;
+function typecastForLooping(loopStep, input) {
+    if (!input || !input.binding) {
+        return null;
+    }
+    try {
+        switch (loopStep.inputs.option) {
+            case automations_1.LoopStepType.ARRAY:
+                if (typeof input.binding === "string") {
+                    return JSON.parse(input.binding);
+                }
+                break;
+            case automations_1.LoopStepType.STRING:
+                if (Array.isArray(input.binding)) {
+                    return input.binding.join(",");
+                }
+                break;
+        }
+    }
+    catch (err) {
+        throw new Error("Unable to cast to correct type");
+    }
+    return input.binding;
+}
+exports.typecastForLooping = typecastForLooping;

package/dist/environment.js

@@ -69,7 +69,6 @@ const environment = {
     // flags
     ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
     DISABLE_THREADING: process.env.DISABLE_THREADING,
-    DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
     DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
     MULTI_TENANCY: process.env.MULTI_TENANCY,
     ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
@@ -107,5 +106,10 @@ for (let [key, value] of Object.entries(environment)) {
         // @ts-ignore
         environment[key] = 0;
     }
+    // handle the edge case of "false" to disable an environment variable
+    if (value === "false") {
+        // @ts-ignore
+        environment[key] = 0;
+    }
 }
 module.exports = environment;

package/dist/integrations/googlesheets.js

@@ -242,7 +242,7 @@ class GoogleSheetsIntegration {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.connect();
-                return yield this.client.addSheet({ title: name });
+                return yield this.client.addSheet({ title: name, headerValues: ["test"] });
             }
             catch (err) {
                 console.error("Error creating new table in google sheets", err);

package/dist/integrations/index.js

@@ -95,7 +95,6 @@ function getDefinitions() {
 }
 exports.getDefinitions = getDefinitions;
 function getIntegration(integration) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
@@ -105,7 +104,7 @@ function getIntegration(integration) {
             for (let plugin of plugins) {
                 if (plugin.name === integration) {
                     // need to use commonJS require due to its dynamic runtime nature
-                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin.name, plugin.jsUrl, (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash);
+                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin);
                     if (retrieved.integration) {
                         return retrieved.integration;
                     }

package/dist/migrations/functions/backfill/global/configs.js

@@ -29,15 +29,15 @@ const backfill = (globalDb, timestamp) => __awaiter(void 0, void 0, void 0, func
             yield backend_core_1.events.email.SMTPCreated(timestamp);
         }
         if ((0, types_1.isGoogleConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated("google", timestamp);
+            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.GOOGLE, timestamp);
             if (config.config.activated) {
-                yield backend_core_1.events.auth.SSOActivated("google", timestamp);
+                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.GOOGLE, timestamp);
             }
         }
         if ((0, types_1.isOIDCConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated("oidc", timestamp);
+            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.OIDC, timestamp);
             if (config.config.configs[0].activated) {
-                yield backend_core_1.events.auth.SSOActivated("oidc", timestamp);
+                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.OIDC, timestamp);
             }
         }
         if ((0, types_1.isSettingsConfig)(config)) {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.10",
+    "version": "2.2.12-alpha.0",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -43,11 +43,11 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "10.0.3",
-        "@budibase/backend-core": "^2.2.10",
-        "@budibase/client": "^2.2.10",
-        "@budibase/pro": "2.2.10",
-        "@budibase/string-templates": "^2.2.10",
-        "@budibase/types": "^2.2.10",
+        "@budibase/backend-core": "2.2.12-alpha.0",
+        "@budibase/client": "2.2.12-alpha.0",
+        "@budibase/pro": "2.2.11",
+        "@budibase/string-templates": "2.2.12-alpha.0",
+        "@budibase/types": "2.2.12-alpha.0",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -130,13 +130,15 @@
         "@types/ioredis": "4.28.10",
         "@types/jest": "27.5.1",
         "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.11",
+        "@types/koa__router": "8.0.8",
         "@types/lodash": "4.14.180",
         "@types/node": "14.18.20",
         "@types/node-fetch": "2.6.1",
         "@types/oracledb": "5.2.2",
         "@types/pouchdb": "6.4.0",
         "@types/redis": "4.0.11",
+        "@types/server-destroy": "1.0.1",
+        "@types/tar": "6.1.3",
         "@typescript-eslint/parser": "5.45.0",
         "apidoc": "0.50.4",
         "babel-jest": "27.5.1",

package/dist/sdk/app/backups/imports.js

@@ -27,17 +27,13 @@ const uuid = require("uuid/v4");
 const tar = require("tar");
 function rewriteAttachmentUrl(appId, attachment) {
     // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
-    const urlParts = attachment.url.split("/");
-    // drop the first empty element
-    urlParts.shift();
-    // get the prefix
-    const prefix = urlParts.shift();
+    const urlParts = attachment.key.split("/");
     // remove the app ID
     urlParts.shift();
     // add new app ID
     urlParts.unshift(appId);
     const key = urlParts.join("/");
-    return Object.assign(Object.assign({}, attachment), { key, url: `/${prefix}/${key}` });
+    return Object.assign(Object.assign({}, attachment), { key, url: "" });
 }
 function updateAttachmentColumns(prodAppId, db) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/threads/automation.js

@@ -47,7 +47,6 @@ const triggerInfo_1 = require("../automations/triggerInfo");
 const constants_1 = require("../constants");
 const logging_1 = require("../automations/logging");
 const types_1 = require("@budibase/types");
-const automations_1 = require("../definitions/automations");
 const backend_core_1 = require("@budibase/backend-core");
 const string_templates_1 = require("@budibase/string-templates");
 const fp_1 = require("lodash/fp");
@@ -56,31 +55,8 @@ const FILTER_STEP_ID = actions.ACTION_DEFINITIONS.FILTER.stepId;
 const LOOP_STEP_ID = actions.ACTION_DEFINITIONS.LOOP.stepId;
 const CRON_STEP_ID = triggerInfo_1.definitions.CRON.stepId;
 const STOPPED_STATUS = { success: true, status: types_1.AutomationStatus.STOPPED };
-function typecastForLooping(loopStep, input) {
-    if (!input || !input.binding) {
-        return null;
-    }
-    try {
-        switch (loopStep.inputs.option) {
-            case automations_1.LoopStepType.ARRAY:
-                if (typeof input.binding === "string") {
-                    return JSON.parse(input.binding);
-                }
-                break;
-            case automations_1.LoopStepType.STRING:
-                if (Array.isArray(input.binding)) {
-                    return input.binding.join(",");
-                }
-                break;
-        }
-    }
-    catch (err) {
-        throw new Error("Unable to cast to correct type");
-    }
-    return input.binding;
-}
 function getLoopIterations(loopStep, input) {
-    const binding = typecastForLooping(loopStep, input);
+    const binding = automationUtils.typecastForLooping(loopStep, input);
     if (!loopStep || !binding) {
         return 1;
     }
@@ -269,7 +245,7 @@ class Orchestrator {
                         let newInput = yield (0, string_templates_1.processObject)(loopStep.inputs, (0, fp_1.cloneDeep)(this._context));
                         let tempOutput = { items: loopSteps, iterations: iterationCount };
                         try {
-                            newInput.binding = typecastForLooping(loopStep, newInput);
+                            newInput.binding = automationUtils.typecastForLooping(loopStep, newInput);
                         }
                         catch (err) {
                             this.updateContextAndOutput(loopStepNumber, step, tempOutput, {
@@ -391,7 +367,7 @@ class Orchestrator {
                 }
                 // Delete the step after the loop step as it's irrelevant, since information is included
                 // in the loop step
-                if (wasLoopStep) {
+                if (wasLoopStep && !loopStep) {
                     this._context.steps.splice(loopStepNumber + 1, 1);
                     wasLoopStep = false;
                 }
@@ -408,8 +384,8 @@ class Orchestrator {
                         inputs: step.inputs,
                     });
                     this._context.steps[loopStepNumber] = tempOutput;
-                    loopSteps = undefined;
                     wasLoopStep = true;
+                    loopSteps = [];
                 }
             }
             // store the logs for the automation run