@budibase/server 2.2.25 → 2.2.27-alpha.0

package/dist/api/controllers/application.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAppPackage = exports.sync = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = void 0;
+exports.updateAppPackage = exports.sync = exports.unpublish = exports.destroy = exports.revertClient = exports.updateClient = exports.update = exports.create = exports.fetchAppPackage = exports.fetchAppDefinition = exports.fetch = void 0;
 const environment_1 = __importDefault(require("../../environment"));
 const package_json_1 = __importDefault(require("../../../package.json"));
 const staticViews_1 = require("../../db/views/staticViews");
@@ -24,14 +24,13 @@ const datasource_bb_default_1 = require("../../db/defaultData/datasource_bb_defa
 const workerRequests_1 = require("../../utilities/workerRequests");
 const utilities_1 = require("../../utilities");
 const redis_1 = require("../../utilities/redis");
-const clientLibrary_1 = require("../../utilities/fileSystem/clientLibrary");
+const fileSystem_2 = require("../../utilities/fileSystem");
 const utils_2 = require("../../automations/utils");
 const logging_1 = require("../../automations/logging");
 const rows_1 = require("../../utilities/usageQuota/rows");
 const pro_1 = require("@budibase/pro");
 const types_1 = require("@budibase/types");
 const layouts_1 = require("../../constants/layouts");
-const plugins_1 = require("../../utilities/plugins");
 const sdk_1 = __importDefault(require("../../sdk"));
 // utility function, need to do away with this
 function getLayouts() {
@@ -76,12 +75,8 @@ function checkAppName(ctx, apps, name, currentAppId) {
         ctx.throw(400, "App name is already in use.");
     }
 }
-function createInstance(template, includeSampleData) {
+function createInstance(appId, template, includeSampleData) {
     return __awaiter(this, void 0, void 0, function* () {
-        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
-        const baseAppId = (0, utils_1.generateAppID)(tenantId);
-        const appId = (0, utils_1.generateDevAppID)(baseAppId);
-        yield backend_core_1.context.updateAppId(appId);
         const db = backend_core_1.context.getAppDB();
         yield db.put({
             _id: "_design/database",
@@ -164,25 +159,25 @@ function fetchAppDefinition(ctx) {
 }
 exports.fetchAppDefinition = fetchAppDefinition;
 function fetchAppPackage(ctx) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         let application = yield db.get(utils_1.DocumentType.APP_METADATA);
         const layouts = yield getLayouts();
         let screens = yield getScreens();
         // Enrich plugin URLs
-        application.usedPlugins = (0, plugins_1.enrichPluginURLs)(application.usedPlugins);
+        application.usedPlugins = backend_core_1.objectStore.enrichPluginURLs(application.usedPlugins);
         // Only filter screens if the user is not a builder
-        if (!(((_a = ctx.user) === null || _a === void 0 ? void 0 : _a.builder) && ctx.user.builder.global)) {
+        if (!(ctx.user.builder && ctx.user.builder.global)) {
             const userRoleId = getUserRoleId(ctx);
             const accessController = new backend_core_1.roles.AccessController();
             screens = yield accessController.checkScreensAccess(screens, userRoleId);
         }
+        const clientLibPath = backend_core_1.objectStore.clientLibraryUrl(ctx.params.appId, application.version);
         ctx.body = {
             application,
             screens,
             layouts,
-            clientLibPath: (0, utilities_1.clientLibraryPath)(ctx.params.appId, application.version),
+            clientLibPath,
         };
     });
 }
@@ -204,77 +199,80 @@ function performAppCreate(ctx) {
             instanceConfig.file = ctx.request.files.templateFile;
         }
         const includeSampleData = (0, utilities_1.isQsTrue)(ctx.request.body.sampleData);
-        const instance = yield createInstance(instanceConfig, includeSampleData);
-        const appId = instance._id;
-        const db = backend_core_1.context.getAppDB();
-        let newApplication = {
-            _id: utils_1.DocumentType.APP_METADATA,
-            _rev: undefined,
-            appId,
-            type: "app",
-            version: package_json_1.default.version,
-            componentLibraries: ["@budibase/standard-components"],
-            name: name,
-            url: url,
-            template: templateKey,
-            instance,
-            tenantId: backend_core_1.tenancy.getTenantId(),
-            updatedAt: new Date().toISOString(),
-            createdAt: new Date().toISOString(),
-            status: utils_1.AppStatus.DEV,
-            navigation: {
-                navigation: "Top",
-                title: name,
-                navWidth: "Large",
-                navBackground: "var(--spectrum-global-color-gray-100)",
-                links: [
-                    {
-                        url: "/home",
-                        text: "Home",
-                    },
-                ],
-            },
-            theme: "spectrum--light",
-            customTheme: {
-                buttonBorderRadius: "16px",
-            },
-        };
-        // If we used a template or imported an app there will be an existing doc.
-        // Fetch and migrate some metadata from the existing app.
-        try {
-            const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
-            const keys = [
-                "_rev",
-                "navigation",
-                "theme",
-                "customTheme",
-                "icon",
-            ];
-            keys.forEach(key => {
-                if (existing[key]) {
-                    // @ts-ignore
-                    newApplication[key] = existing[key];
-                }
-            });
-            // Migrate navigation settings and screens if required
-            if (existing) {
-                const navigation = yield migrateAppNavigation();
-                if (navigation) {
-                    newApplication.navigation = navigation;
+        const tenantId = backend_core_1.tenancy.isMultiTenant() ? backend_core_1.tenancy.getTenantId() : null;
+        const appId = (0, utils_1.generateDevAppID)((0, utils_1.generateAppID)(tenantId));
+        return yield backend_core_1.context.doInAppContext(appId, () => __awaiter(this, void 0, void 0, function* () {
+            const instance = yield createInstance(appId, instanceConfig, includeSampleData);
+            const db = backend_core_1.context.getAppDB();
+            let newApplication = {
+                _id: utils_1.DocumentType.APP_METADATA,
+                _rev: undefined,
+                appId,
+                type: "app",
+                version: package_json_1.default.version,
+                componentLibraries: ["@budibase/standard-components"],
+                name: name,
+                url: url,
+                template: templateKey,
+                instance,
+                tenantId: backend_core_1.tenancy.getTenantId(),
+                updatedAt: new Date().toISOString(),
+                createdAt: new Date().toISOString(),
+                status: utils_1.AppStatus.DEV,
+                navigation: {
+                    navigation: "Top",
+                    title: name,
+                    navWidth: "Large",
+                    navBackground: "var(--spectrum-global-color-gray-100)",
+                    links: [
+                        {
+                            url: "/home",
+                            text: "Home",
+                        },
+                    ],
+                },
+                theme: "spectrum--light",
+                customTheme: {
+                    buttonBorderRadius: "16px",
+                },
+            };
+            // If we used a template or imported an app there will be an existing doc.
+            // Fetch and migrate some metadata from the existing app.
+            try {
+                const existing = yield db.get(utils_1.DocumentType.APP_METADATA);
+                const keys = [
+                    "_rev",
+                    "navigation",
+                    "theme",
+                    "customTheme",
+                    "icon",
+                ];
+                keys.forEach(key => {
+                    if (existing[key]) {
+                        // @ts-ignore
+                        newApplication[key] = existing[key];
+                    }
+                });
+                // Migrate navigation settings and screens if required
+                if (existing) {
+                    const navigation = yield migrateAppNavigation();
+                    if (navigation) {
+                        newApplication.navigation = navigation;
+                    }
                 }
             }
-        }
-        catch (err) {
-            // Nothing to do
-        }
-        const response = yield db.put(newApplication, { force: true });
-        newApplication._rev = response.rev;
-        /* istanbul ignore next */
-        if (!environment_1.default.isTest()) {
-            yield (0, fileSystem_1.createApp)(appId);
-        }
-        yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
-        return newApplication;
+            catch (err) {
+                // Nothing to do
+            }
+            const response = yield db.put(newApplication, { force: true });
+            newApplication._rev = response.rev;
+            /* istanbul ignore next */
+            if (!environment_1.default.isTest()) {
+                yield (0, fileSystem_1.createApp)(appId);
+            }
+            yield backend_core_1.cache.app.invalidateAppMetadata(appId, newApplication);
+            return newApplication;
+        }));
     });
 }
 function creationEvents(request, app) {
@@ -325,7 +323,7 @@ function appPostCreate(ctx, app) {
                     if (err.code && err.code === backend_core_1.errors.codes.USAGE_LIMIT_EXCEEDED) {
                         // this import resulted in row usage exceeding the quota
                         // delete the app
-                        // skip pre- and post-steps as no rows have been added to quotas yet
+                        // skip pre and post-steps as no rows have been added to quotas yet
                         ctx.params.appId = app.appId;
                         yield destroyApp(ctx);
                     }
@@ -375,8 +373,8 @@ function updateClient(ctx) {
         const currentVersion = application.version;
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, clientLibrary_1.backupClientLibrary)(ctx.params.appId);
-            yield (0, clientLibrary_1.updateClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.backupClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.updateClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const updatedToVersion = package_json_1.default.version;
@@ -401,7 +399,7 @@ function revertClient(ctx) {
         }
         // Update client library and manifest
         if (!environment_1.default.isTest()) {
-            yield (0, clientLibrary_1.revertClientLibrary)(ctx.params.appId);
+            yield (0, fileSystem_2.revertClientLibrary)(ctx.params.appId);
         }
         // Update versions in app package
         const currentVersion = application.version;
@@ -417,39 +415,39 @@ function revertClient(ctx) {
     });
 }
 exports.revertClient = revertClient;
+const unpublishApp = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    let appId = ctx.params.appId;
+    appId = backend_core_1.db.getProdAppID(appId);
+    const db = backend_core_1.context.getProdAppDB();
+    const result = yield db.destroy();
+    yield backend_core_1.events.app.unpublished({ appId });
+    // automations only in production
+    yield (0, utils_2.cleanupAutomations)(appId);
+    yield backend_core_1.cache.app.invalidateAppMetadata(appId);
+    return result;
+});
 function destroyApp(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let appId = ctx.params.appId;
-        let isUnpublish = ctx.query && ctx.query.unpublish;
-        if (isUnpublish) {
-            appId = backend_core_1.db.getProdAppID(appId);
-            const devAppId = backend_core_1.db.getDevAppID(appId);
-            // sync before removing the published app
+        appId = backend_core_1.db.getProdAppID(appId);
+        const devAppId = backend_core_1.db.getDevAppID(appId);
+        // check if we need to unpublish first
+        if (yield backend_core_1.db.dbExists(appId)) {
+            // app is deployed, run through unpublish flow
             yield sdk_1.default.applications.syncApp(devAppId);
+            yield unpublishApp(ctx);
         }
-        const db = isUnpublish ? backend_core_1.context.getProdAppDB() : backend_core_1.context.getAppDB();
+        const db = backend_core_1.db.getDB(devAppId);
+        // standard app deletion flow
         const app = yield db.get(utils_1.DocumentType.APP_METADATA);
         const result = yield db.destroy();
-        if (isUnpublish) {
-            yield backend_core_1.events.app.unpublished(app);
-        }
-        else {
-            yield pro_1.quotas.removeApp();
-            yield backend_core_1.events.app.deleted(app);
-        }
-        /* istanbul ignore next */
-        if (!environment_1.default.isTest() && !isUnpublish) {
+        yield pro_1.quotas.removeApp();
+        yield backend_core_1.events.app.deleted(app);
+        if (!environment_1.default.isTest()) {
             yield (0, fileSystem_1.deleteApp)(appId);
         }
-        // automations only in production
-        if (isUnpublish) {
-            yield (0, utils_2.cleanupAutomations)(appId);
-        }
-        // remove app role when the dev app is deleted (no trace of app anymore)
-        else {
-            yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
-        }
-        yield backend_core_1.cache.app.invalidateAppMetadata(appId);
+        yield (0, workerRequests_1.removeAppFromUserRoles)(ctx, appId);
+        yield backend_core_1.cache.app.invalidateAppMetadata(devAppId);
         return result;
     });
 }
@@ -478,6 +476,19 @@ function destroy(ctx) {
     });
 }
 exports.destroy = destroy;
+const unpublish = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
+    const prodAppId = backend_core_1.db.getProdAppID(ctx.params.appId);
+    const dbExists = yield backend_core_1.db.dbExists(prodAppId);
+    // check app has been published
+    if (!dbExists) {
+        return ctx.throw(400, "App has not been published.");
+    }
+    yield preDestroyApp(ctx);
+    yield unpublishApp(ctx);
+    yield postDestroyApp(ctx);
+    ctx.status = 204;
+});
+exports.unpublish = unpublish;
 function sync(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = ctx.params.appId;

package/dist/api/controllers/cloud.js

@@ -95,11 +95,15 @@ function importApps(ctx) {
         if (beenImported || !ctx.request.files || !ctx.request.files.importFile) {
             ctx.throw(400, "Import file is required and environment must be fresh to import apps.");
         }
-        if (ctx.request.files.importFile.type !== "application/gzip") {
+        const file = ctx.request.files.importFile;
+        if (Array.isArray(file)) {
+            ctx.throw(400, "Single file is required");
+        }
+        if (file.type !== "application/gzip" && file.type !== "application/x-gzip") {
             ctx.throw(400, "Import file must be a gzipped tarball.");
         }
         // initially get all the app databases out of the tarball
-        const tmpPath = sdk_1.default.backups.untarFile(ctx.request.files.importFile);
+        const tmpPath = sdk_1.default.backups.untarFile(file);
         const globalDbImport = sdk_1.default.backups.getGlobalDBFile(tmpPath);
         const appNames = sdk_1.default.backups.getListOfAppsInMulti(tmpPath);
         const globalDb = backend_core_1.tenancy.getGlobalDB();

package/dist/api/controllers/datasource.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.query = exports.find = exports.destroy = exports.save = exports.update = exports.buildSchemaFromDb = exports.fetch = void 0;
 const utils_1 = require("../../db/utils");
@@ -17,6 +20,7 @@ const integrations_1 = require("../../integrations");
 const utils_2 = require("./row/utils");
 const utils_3 = require("../../threads/utils");
 const backend_core_1 = require("@budibase/backend-core");
+const sdk_1 = __importDefault(require("../../sdk"));
 function fetch(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         // Get internal tables
@@ -35,12 +39,11 @@ function fetch(ctx) {
         const datasources = (yield db.allDocs((0, utils_1.getDatasourceParams)(null, {
             include_docs: true,
         }))).rows.map(row => row.doc);
-        const allDatasources = [bbInternalDb, ...datasources];
+        const allDatasources = yield sdk_1.default.datasources.removeSecrets([
+            bbInternalDb,
+            ...datasources,
+        ]);
         for (let datasource of allDatasources) {
-            if (datasource.config && datasource.config.auth) {
-                // strip secrets from response so they don't show in the network request
-                delete datasource.config.auth;
-            }
             if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
                 datasource.entities = internal[datasource._id];
             }
@@ -52,7 +55,7 @@ exports.fetch = fetch;
 function buildSchemaFromDb(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
-        const datasource = yield db.get(ctx.params.datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(ctx.params.datasourceId);
         const tablesFilter = ctx.request.body.tablesFilter;
         let { tables, error } = yield buildSchemaHelper(datasource);
         if (tablesFilter) {
@@ -125,18 +128,18 @@ function invalidateVariables(existingDatasource, updatedDatasource) {
     });
 }
 function update(ctx) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
-        let datasource = yield db.get(datasourceId);
-        const auth = datasource.config.auth;
+        let datasource = yield sdk_1.default.datasources.get(datasourceId);
+        const auth = (_a = datasource.config) === null || _a === void 0 ? void 0 : _a.auth;
         yield invalidateVariables(datasource, ctx.request.body);
         const isBudibaseSource = datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE;
         const dataSourceBody = isBudibaseSource
-            ? { name: (_a = ctx.request.body) === null || _a === void 0 ? void 0 : _a.name }
+            ? { name: (_b = ctx.request.body) === null || _b === void 0 ? void 0 : _b.name }
             : ctx.request.body;
-        datasource = Object.assign(Object.assign({}, datasource), dataSourceBody);
+        datasource = Object.assign(Object.assign({}, datasource), sdk_1.default.datasources.mergeConfigs(dataSourceBody, datasource));
         if (auth && !ctx.request.body.auth) {
             // don't strip auth config from DB
             datasource.config.auth = auth;
@@ -153,7 +156,9 @@ function update(ctx) {
         }
         ctx.status = 200;
         ctx.message = "Datasource saved successfully.";
-        ctx.body = { datasource };
+        ctx.body = {
+            datasource: yield sdk_1.default.datasources.removeSecretSingle(datasource),
+        };
     });
 }
 exports.update = update;
@@ -180,7 +185,9 @@ function save(ctx) {
                 yield source.pool.end();
             }
         }
-        const response = { datasource };
+        const response = {
+            datasource: yield sdk_1.default.datasources.removeSecretSingle(datasource),
+        };
         if (schemaError) {
             response.error = schemaError;
         }
@@ -216,7 +223,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.context.getAppDB();
         const datasourceId = ctx.params.datasourceId;
-        const datasource = yield db.get(datasourceId);
+        const datasource = yield sdk_1.default.datasources.get(datasourceId);
         // Delete all queries for the datasource
         if (datasource.type === backend_core_1.db.BUDIBASE_DATASOURCE_TYPE) {
             yield destroyInternalTablesBySourceId(datasourceId);
@@ -240,7 +247,8 @@ exports.destroy = destroy;
 function find(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const database = backend_core_1.context.getAppDB();
-        ctx.body = yield database.get(ctx.params.datasourceId);
+        const datasource = yield database.get(ctx.params.datasourceId);
+        ctx.body = yield sdk_1.default.datasources.removeSecretSingle(datasource);
     });
 }
 exports.find = find;
@@ -275,6 +283,7 @@ function updateError(error, newError, tables) {
 function buildSchemaHelper(datasource) {
     return __awaiter(this, void 0, void 0, function* () {
         const Connector = yield (0, integrations_1.getIntegration)(datasource.source);
+        datasource = yield sdk_1.default.datasources.enrich(datasource);
         // Connect to the DB and build the schema
         const connector = new Connector(datasource.config);
         yield connector.buildSchema(datasource._id, datasource.entities);

package/dist/api/controllers/deploy/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
+exports.publishApp = exports.deploymentProgress = exports.fetchDeployments = void 0;
 const Deployment_1 = __importDefault(require("./Deployment"));
 const backend_core_1 = require("@budibase/backend-core");
 const utils_1 = require("../../../db/utils");
@@ -92,8 +92,46 @@ function initDeployedApp(prodAppId) {
         });
     });
 }
-function deployApp(deployment, userId) {
+function fetchDeployments(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const db = backend_core_1.context.getAppDB();
+            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
+            const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
+            if (updated) {
+                yield db.put(deployments);
+            }
+            ctx.body = Object.values(deployments.history).reverse();
+        }
+        catch (err) {
+            ctx.body = [];
+        }
+    });
+}
+exports.fetchDeployments = fetchDeployments;
+function deploymentProgress(ctx) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const db = backend_core_1.context.getAppDB();
+            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
+            ctx.body = deploymentDoc[ctx.params.deploymentId];
+        }
+        catch (err) {
+            ctx.throw(500, `Error fetching data for deployment ${ctx.params.deploymentId}`);
+        }
+    });
+}
+exports.deploymentProgress = deploymentProgress;
+const publishApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
+        let deployment = new Deployment_1.default();
+        console.log("Deployment object created");
+        deployment.setStatus(DeploymentStatus.PENDING);
+        console.log("Deployment object set to pending");
+        deployment = yield storeDeploymentHistory(deployment);
+        console.log("Stored deployment history");
+        console.log("Deploying app...");
+        let app;
         let replication;
         try {
             const appId = backend_core_1.context.getAppId();
@@ -103,7 +141,7 @@ function deployApp(deployment, userId) {
             if (yield pro_1.backups.isEnabled()) {
                 // trigger backup initially
                 yield pro_1.backups.triggerAppBackup(productionAppId, types_1.AppBackupTrigger.PUBLISH, {
-                    createdBy: userId,
+                    createdBy: ctx.user._id,
                 });
             }
             const config = {
@@ -141,7 +179,7 @@ function deployApp(deployment, userId) {
             console.log("Deployed app initialised, setting deployment to successful");
             deployment.setStatus(DeploymentStatus.SUCCESS);
             yield storeDeploymentHistory(deployment);
-            return appDoc;
+            app = appDoc;
         }
         catch (err) {
             deployment.setStatus(DeploymentStatus.FAILURE, err.message);
@@ -153,63 +191,8 @@ function deployApp(deployment, userId) {
                 yield replication.close();
             }
         }
-    });
-}
-function fetchDeployments(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const db = backend_core_1.context.getAppDB();
-            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
-            const { updated, deployments } = yield checkAllDeployments(deploymentDoc);
-            if (updated) {
-                yield db.put(deployments);
-            }
-            ctx.body = Object.values(deployments.history).reverse();
-        }
-        catch (err) {
-            ctx.body = [];
-        }
-    });
-}
-exports.fetchDeployments = fetchDeployments;
-function deploymentProgress(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            const db = backend_core_1.context.getAppDB();
-            const deploymentDoc = yield db.get(utils_1.DocumentType.DEPLOYMENTS);
-            ctx.body = deploymentDoc[ctx.params.deploymentId];
-        }
-        catch (err) {
-            ctx.throw(500, `Error fetching data for deployment ${ctx.params.deploymentId}`);
-        }
-    });
-}
-exports.deploymentProgress = deploymentProgress;
-const isFirstDeploy = () => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const db = backend_core_1.context.getProdAppDB();
-        yield db.get(utils_1.DocumentType.APP_METADATA);
-    }
-    catch (e) {
-        if (e.status === 404) {
-            return true;
-        }
-        throw e;
-    }
-    return false;
-});
-const _deployApp = function (ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let deployment = new Deployment_1.default();
-        console.log("Deployment object created");
-        deployment.setStatus(DeploymentStatus.PENDING);
-        console.log("Deployment object set to pending");
-        deployment = yield storeDeploymentHistory(deployment);
-        console.log("Stored deployment history");
-        console.log("Deploying app...");
-        let app = yield deployApp(deployment, ctx.user._id);
         yield backend_core_1.events.app.published(app);
         ctx.body = deployment;
     });
 };
-exports.deployApp = _deployApp;
+exports.publishApp = publishApp;

package/dist/api/controllers/plugin/index.js

@@ -18,15 +18,15 @@ const backend_core_1 = require("@budibase/backend-core");
 const types_1 = require("@budibase/types");
 const environment_1 = __importDefault(require("../../../environment"));
 const websocket_1 = require("../../../websocket");
-const backend_core_2 = require("@budibase/backend-core");
 const pro_1 = require("@budibase/pro");
 function getPlugins(type) {
     return __awaiter(this, void 0, void 0, function* () {
         const db = backend_core_1.tenancy.getGlobalDB();
-        const response = yield db.allDocs(backend_core_2.db.getPluginParams(null, {
+        const response = yield db.allDocs(backend_core_1.db.getPluginParams(null, {
             include_docs: true,
         }));
-        const plugins = response.rows.map((row) => row.doc);
+        let plugins = response.rows.map((row) => row.doc);
+        plugins = backend_core_1.objectStore.enrichPluginURLs(plugins);
         if (type) {
             return plugins.filter((plugin) => { var _a; return ((_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.type) === type; });
         }
@@ -92,7 +92,7 @@ function create(ctx) {
             if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
                 throw new Error("Only component plugins are supported outside of self-host");
             }
-            const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+            const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
             websocket_1.ClientAppSocket.emit("plugins-update", { name, hash: doc.hash });
             ctx.body = {
                 message: "Plugin uploaded successfully",
@@ -117,7 +117,7 @@ function destroy(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         const { pluginId } = ctx.params;
         try {
-            yield pro_1.plugins.deletePlugin(pluginId);
+            yield pro_1.sdk.plugins.deletePlugin(pluginId);
             ctx.body = { message: `Plugin ${ctx.params.pluginId} deleted.` };
         }
         catch (err) {
@@ -135,7 +135,7 @@ function processUploadedPlugin(plugin, source) {
         if (!environment_1.default.SELF_HOSTED && ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.schema) === null || _a === void 0 ? void 0 : _a.type) !== types_1.PluginType.COMPONENT) {
             throw new Error("Only component plugins are supported outside of self-host");
         }
-        const doc = yield pro_1.plugins.storePlugin(metadata, directory, source);
+        const doc = yield pro_1.sdk.plugins.storePlugin(metadata, directory, source);
         websocket_1.ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash });
         return doc;
     });