@budibase/server 2.2.12-alpha.5 → 2.2.13

package/dist/api/controllers/view/viewBuilder.js

@@ -28,6 +28,11 @@ const GROUP_PROPERTY = {
         type: "string",
     },
 };
+const GROUP_PROPERTY_MULTI = {
+    group: {
+        type: "array",
+    },
+};
 const FIELD_PROPERTY = {
     field: {
         type: "string",
@@ -102,14 +107,15 @@ function parseFilterExpression(filters) {
 function parseEmitExpression(field, groupBy) {
     return `emit(doc["${groupBy || "_id"}"], doc["${field}"]);`;
 }
-module.exports = function ({ field, tableId, groupBy, filters = [], calculation, }) {
+module.exports = function ({ field, tableId, groupBy, filters = [], calculation }, groupByMulti) {
     // first filter can't have a conjunction
     if (filters && filters.length > 0 && filters[0].conjunction) {
         delete filters[0].conjunction;
     }
     let schema = null, statFilter = null;
+    let groupBySchema = groupByMulti ? GROUP_PROPERTY_MULTI : GROUP_PROPERTY;
     if (calculation) {
-        schema = Object.assign(Object.assign({}, (groupBy ? GROUP_PROPERTY : FIELD_PROPERTY)), SCHEMA_MAP[calculation]);
+        schema = Object.assign(Object.assign({}, (groupBy ? groupBySchema : FIELD_PROPERTY)), SCHEMA_MAP[calculation]);
         if (!filters.find(filter => filter.key === field && filter.condition === CONDITIONS.NOT_EMPTY)) {
             statFilter = parseFilterExpression([
                 { key: field, condition: CONDITIONS.NOT_EMPTY },

package/dist/api/routes/application.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const router_1 = __importDefault(require("@koa/router"));
 const controller = __importStar(require("../controllers/application"));
-const deploymentController = __importStar(require("../controllers/deploy"));
 const authorized_1 = __importDefault(require("../../middleware/authorized"));
 const backend_core_1 = require("@budibase/backend-core");
 const validators_1 = require("./utils/validators");
@@ -41,7 +40,5 @@ router
     .put("/api/applications/:appId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), (0, validators_1.applicationValidator)({ isCreate: false }), controller.update)
     .post("/api/applications/:appId/client/update", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.updateClient)
     .post("/api/applications/:appId/client/revert", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.revertClient)
-    .post("/api/applications/:appId/publish", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), deploymentController.publishApp)
-    .post("/api/applications/:appId/unpublish", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.unpublish)
     .delete("/api/applications/:appId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.destroy);
 module.exports = router;

package/dist/api/routes/deploy.js

@@ -32,5 +32,6 @@ const backend_core_1 = require("@budibase/backend-core");
 const router = new router_1.default();
 router
     .get("/api/deployments", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.fetchDeployments)
-    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress);
+    .get("/api/deploy/:deploymentId", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deploymentProgress)
+    .post("/api/deploy", (0, authorized_1.default)(backend_core_1.permissions.BUILDER), controller.deployApp);
 module.exports = router;

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

@@ -85,43 +85,6 @@ 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,9 +66,6 @@ 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/api/routes/tests/utilities/TestFunctions.js

@@ -0,0 +1,167 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runInProd = exports.testAutomation = exports.getDB = exports.checkPermissionsEndpoint = exports.checkBuilderEndpoint = exports.createRequest = exports.clearAllAutomations = exports.clearAllApps = exports.getAllTableRows = void 0;
+const rowController = __importStar(require("../../../controllers/row"));
+const appController = __importStar(require("../../../controllers/application"));
+const utils_1 = require("../../../../db/utils");
+const backend_core_1 = require("@budibase/backend-core");
+const structures_1 = require("../../../../tests/utilities/structures");
+const env = __importStar(require("../../../../environment"));
+class Request {
+    constructor(appId, params) {
+        this.appId = appId;
+        this.params = params;
+        this.request = {};
+    }
+}
+function runRequest(appId, controlFunc, request) {
+    return backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+        return controlFunc(request);
+    }));
+}
+const getAllTableRows = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const req = new Request(config.appId, { tableId: config.table._id });
+    yield runRequest(config.appId, rowController.fetch, req);
+    return req.body;
+});
+exports.getAllTableRows = getAllTableRows;
+const clearAllApps = (tenantId = structures_1.TENANT_ID) => __awaiter(void 0, void 0, void 0, function* () {
+    yield backend_core_1.tenancy.doInTenant(tenantId, () => __awaiter(void 0, void 0, void 0, function* () {
+        const req = { query: { status: utils_1.AppStatus.DEV }, user: { tenantId } };
+        yield appController.fetch(req);
+        const apps = req.body;
+        if (!apps || apps.length <= 0) {
+            return;
+        }
+        for (let app of apps) {
+            const { appId } = app;
+            const req = new Request(null, { appId });
+            yield runRequest(appId, appController.destroy, req);
+        }
+    }));
+});
+exports.clearAllApps = clearAllApps;
+const clearAllAutomations = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    const automations = yield config.getAllAutomations();
+    for (let auto of automations) {
+        yield backend_core_1.context.doInAppContext(config.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+            yield config.deleteAutomation(auto);
+        }));
+    }
+});
+exports.clearAllAutomations = clearAllAutomations;
+const createRequest = (request, method, url, body) => {
+    let req;
+    if (method === "POST")
+        req = request.post(url).send(body);
+    else if (method === "GET")
+        req = request.get(url);
+    else if (method === "DELETE")
+        req = request.delete(url);
+    else if (method === "PATCH")
+        req = request.patch(url).send(body);
+    else if (method === "PUT")
+        req = request.put(url).send(body);
+    return req;
+};
+exports.createRequest = createRequest;
+const checkBuilderEndpoint = ({ config, method, url, body, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const headers = yield config.login({
+        userId: "us_fail",
+        builder: false,
+        prodApp: true,
+    });
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(headers)
+        .expect(403);
+});
+exports.checkBuilderEndpoint = checkBuilderEndpoint;
+const checkPermissionsEndpoint = ({ config, method, url, body, passRole, failRole, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const passHeader = yield config.login({
+        roleId: passRole,
+        prodApp: true,
+    });
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(passHeader)
+        .expect(200);
+    let failHeader;
+    if (failRole === backend_core_1.roles.BUILTIN_ROLE_IDS.PUBLIC) {
+        failHeader = config.publicHeaders({ prodApp: true });
+    }
+    else {
+        failHeader = yield config.login({
+            roleId: failRole,
+            builder: false,
+            prodApp: true,
+        });
+    }
+    yield exports
+        .createRequest(config.request, method, url, body)
+        .set(failHeader)
+        .expect(403);
+});
+exports.checkPermissionsEndpoint = checkPermissionsEndpoint;
+const getDB = () => {
+    return backend_core_1.context.getAppDB();
+};
+exports.getDB = getDB;
+const testAutomation = (config, automation) => __awaiter(void 0, void 0, void 0, function* () {
+    return runRequest(automation.appId, () => __awaiter(void 0, void 0, void 0, function* () {
+        return yield config.request
+            .post(`/api/automations/${automation._id}/test`)
+            .send({
+            row: {
+                name: "Test",
+                description: "TEST",
+            },
+        })
+            .set(config.defaultHeaders())
+            .expect("Content-Type", /json/)
+            .expect(200);
+    }));
+});
+exports.testAutomation = testAutomation;
+const runInProd = (func) => __awaiter(void 0, void 0, void 0, function* () {
+    const nodeEnv = env.NODE_ENV;
+    const workerId = env.JEST_WORKER_ID;
+    env._set("NODE_ENV", "PRODUCTION");
+    env._set("JEST_WORKER_ID", null);
+    yield func();
+    env._set("NODE_ENV", nodeEnv);
+    env._set("JEST_WORKER_ID", workerId);
+});
+exports.runInProd = runInProd;

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

@@ -0,0 +1,131 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.switchToSelfHosted = exports.getConfig = exports.getRequest = exports.afterAll = exports.beforeAll = exports.delay = exports.structures = void 0;
+const TestConfiguration_1 = __importDefault(require("../../../../tests/utilities/TestConfiguration"));
+const environment_1 = __importDefault(require("../../../../environment"));
+exports.structures = __importStar(require("../../../../tests/utilities/structures"));
+function user() {
+    return {
+        _id: "user",
+        _rev: "rev",
+        createdAt: Date.now(),
+        email: "test@test.com",
+        roles: {},
+        tenantId: "default",
+        status: "active",
+    };
+}
+jest.mock("../../../../utilities/workerRequests", () => ({
+    getGlobalUsers: jest.fn(() => {
+        return {
+            _id: "us_uuid1",
+        };
+    }),
+    getGlobalSelf: jest.fn(() => {
+        return {
+            _id: "us_uuid1",
+        };
+    }),
+    allGlobalUsers: jest.fn(() => {
+        return [user()];
+    }),
+    readGlobalUser: jest.fn(() => {
+        return user();
+    }),
+    saveGlobalUser: jest.fn(() => {
+        return { _id: "user", _rev: "rev" };
+    }),
+    deleteGlobalUser: jest.fn(() => {
+        return { message: "deleted user" };
+    }),
+    removeAppFromUserRoles: jest.fn(),
+}));
+function delay(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+exports.delay = delay;
+let request, config;
+function beforeAll() {
+    config = new TestConfiguration_1.default();
+    request = config.getRequest();
+}
+exports.beforeAll = beforeAll;
+function afterAll() {
+    if (config) {
+        config.end();
+    }
+    // clear app files
+    request = null;
+    config = null;
+}
+exports.afterAll = afterAll;
+function getRequest() {
+    if (!request) {
+        exports.beforeAll();
+    }
+    return request;
+}
+exports.getRequest = getRequest;
+function getConfig() {
+    if (!config) {
+        exports.beforeAll();
+    }
+    return config;
+}
+exports.getConfig = getConfig;
+function switchToSelfHosted(func) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // self hosted stops any attempts to Dynamo
+        environment_1.default._set("NODE_ENV", "production");
+        environment_1.default._set("SELF_HOSTED", true);
+        let error;
+        try {
+            yield func();
+        }
+        catch (err) {
+            error = err;
+        }
+        environment_1.default._set("NODE_ENV", "jest");
+        environment_1.default._set("SELF_HOSTED", false);
+        // don't throw error until after reset
+        if (error) {
+            throw error;
+        }
+    });
+}
+exports.switchToSelfHosted = switchToSelfHosted;

package/dist/automations/automationUtils.js

@@ -12,10 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typecastForLooping = exports.stringSplit = exports.substituteLoopStep = exports.getError = exports.cleanUpRow = exports.cleanInputValues = void 0;
+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
@@ -133,27 +132,3 @@ 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/automations/tests/utilities/index.js

@@ -0,0 +1,81 @@
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.actions = exports.apiKey = exports.runStep = exports.runInProd = exports.afterAll = exports.getConfig = void 0;
+const TestConfiguration_1 = __importDefault(require("../../../tests/utilities/TestConfiguration"));
+const backend_core_1 = require("@budibase/backend-core");
+const actions_1 = require("../../actions");
+const index_1 = __importDefault(require("../../../events/index"));
+const environment_1 = __importDefault(require("../../../environment"));
+let config;
+function getConfig() {
+    if (!config) {
+        config = new TestConfiguration_1.default(false);
+    }
+    return config;
+}
+exports.getConfig = getConfig;
+function afterAll() {
+    config.end();
+}
+exports.afterAll = afterAll;
+function runInProd(fn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        environment_1.default._set("NODE_ENV", "production");
+        let error;
+        try {
+            yield fn();
+        }
+        catch (err) {
+            error = err;
+        }
+        environment_1.default._set("NODE_ENV", "jest");
+        if (error) {
+            throw error;
+        }
+    });
+}
+exports.runInProd = runInProd;
+function runStep(stepId, inputs) {
+    return __awaiter(this, void 0, void 0, function* () {
+        function run() {
+            return __awaiter(this, void 0, void 0, function* () {
+                let step = yield (0, actions_1.getAction)(stepId);
+                expect(step).toBeDefined();
+                if (!step) {
+                    throw new Error("No step found");
+                }
+                return step({
+                    context: {},
+                    inputs,
+                    appId: config ? config.getAppId() : null,
+                    // don't really need an API key, mocked out usage quota, not being tested here
+                    apiKey: exports.apiKey,
+                    emitter: index_1.default,
+                });
+            });
+        }
+        if (config === null || config === void 0 ? void 0 : config.appId) {
+            return backend_core_1.context.doInContext(config === null || config === void 0 ? void 0 : config.appId, () => __awaiter(this, void 0, void 0, function* () {
+                return run();
+            }));
+        }
+        else {
+            return run();
+        }
+    });
+}
+exports.runStep = runStep;
+exports.apiKey = "test";
+exports.actions = actions_1.ACTION_DEFINITIONS;

package/dist/environment.js

@@ -69,6 +69,7 @@ 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,
@@ -106,10 +107,5 @@ 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, headerValues: ["test"] });
+                return yield this.client.addSheet({ title: name });
             }
             catch (err) {
                 console.error("Error creating new table in google sheets", err);

package/dist/integrations/index.js

@@ -95,6 +95,7 @@ function getDefinitions() {
 }
 exports.getDefinitions = getDefinitions;
 function getIntegration(integration) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (INTEGRATIONS[integration]) {
             return INTEGRATIONS[integration];
@@ -104,7 +105,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);
+                    const retrieved = yield (0, fileSystem_1.getDatasourcePlugin)(plugin.name, plugin.jsUrl, (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash);
                     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(types_1.ConfigType.GOOGLE, timestamp);
+            yield backend_core_1.events.auth.SSOCreated("google", timestamp);
             if (config.config.activated) {
-                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.GOOGLE, timestamp);
+                yield backend_core_1.events.auth.SSOActivated("google", timestamp);
             }
         }
         if ((0, types_1.isOIDCConfig)(config)) {
-            yield backend_core_1.events.auth.SSOCreated(types_1.ConfigType.OIDC, timestamp);
+            yield backend_core_1.events.auth.SSOCreated("oidc", timestamp);
             if (config.config.configs[0].activated) {
-                yield backend_core_1.events.auth.SSOActivated(types_1.ConfigType.OIDC, timestamp);
+                yield backend_core_1.events.auth.SSOActivated("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.12-alpha.4",
+    "version": "2.2.12",
     "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.12-alpha.4",
-        "@budibase/client": "2.2.12-alpha.4",
-        "@budibase/pro": "2.2.12-alpha.4",
-        "@budibase/string-templates": "2.2.12-alpha.4",
-        "@budibase/types": "2.2.12-alpha.4",
+        "@budibase/backend-core": "^2.2.12",
+        "@budibase/client": "^2.2.12",
+        "@budibase/pro": "2.2.12",
+        "@budibase/string-templates": "^2.2.12",
+        "@budibase/types": "^2.2.12",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",
@@ -130,15 +130,13 @@
         "@types/ioredis": "4.28.10",
         "@types/jest": "27.5.1",
         "@types/koa": "2.13.4",
-        "@types/koa__router": "8.0.8",
+        "@types/koa__router": "8.0.11",
         "@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,13 +27,17 @@ 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.key.split("/");
+    const urlParts = attachment.url.split("/");
+    // drop the first empty element
+    urlParts.shift();
+    // get the prefix
+    const prefix = urlParts.shift();
     // 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: "" });
+    return Object.assign(Object.assign({}, attachment), { key, url: `/${prefix}/${key}` });
 }
 function updateAttachmentColumns(prodAppId, db) {
     return __awaiter(this, void 0, void 0, function* () {