@budibase/server 2.5.6-alpha.1 → 2.5.6-alpha.10

package/dist/utilities/fileSystem/plugin.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
+exports.getAutomationPlugin = exports.getDatasourcePlugin = exports.getPluginMetadata = void 0;
 const budibaseDir_1 = require("../budibaseDir");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const backend_core_1 = require("@budibase/backend-core");
 const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
+const AUTOMATION_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "automation");
 const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata = {};
     try {
@@ -37,30 +38,39 @@ const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function*
     return { metadata, directory: path };
 });
 exports.getPluginMetadata = getPluginMetadata;
-const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+function getPluginImpl(path, plugin) {
     var _a;
-    const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
-    if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
-        fs_1.default.mkdirSync(DATASOURCE_PATH);
-    }
-    const filename = (0, path_1.join)(DATASOURCE_PATH, plugin.name);
-    const metadataName = `${filename}.bbmetadata`;
-    if (fs_1.default.existsSync(filename)) {
-        const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
-        // if hash is the same return the file, otherwise remove it and re-download
-        if (currentHash === hash) {
-            return require(filename);
+    return __awaiter(this, void 0, void 0, function* () {
+        const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
+        if (!fs_1.default.existsSync(path)) {
+            fs_1.default.mkdirSync(path);
         }
-        else {
-            console.log(`Updating plugin: ${plugin.name}`);
-            delete require.cache[require.resolve(filename)];
-            fs_1.default.unlinkSync(filename);
+        const filename = (0, path_1.join)(path, plugin.name);
+        const metadataName = `${filename}.bbmetadata`;
+        if (fs_1.default.existsSync(filename)) {
+            const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
+            // if hash is the same return the file, otherwise remove it and re-download
+            if (currentHash === hash) {
+                return require(filename);
+            }
+            else {
+                console.log(`Updating plugin: ${plugin.name}`);
+                delete require.cache[require.resolve(filename)];
+                fs_1.default.unlinkSync(filename);
+            }
         }
-    }
-    const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
-    const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
-    fs_1.default.writeFileSync(filename, pluginJs);
-    fs_1.default.writeFileSync(metadataName, hash);
-    return require(filename);
+        const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
+        const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
+        fs_1.default.writeFileSync(filename, pluginJs);
+        fs_1.default.writeFileSync(metadataName, hash);
+        return require(filename);
+    });
+}
+const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(DATASOURCE_PATH, plugin);
 });
 exports.getDatasourcePlugin = getDatasourcePlugin;
+const getAutomationPlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
+    return getPluginImpl(AUTOMATION_PATH, plugin);
+});
+exports.getAutomationPlugin = getAutomationPlugin;

package/dist/utilities/global.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.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.updateAppRole = void 0;
+exports.getGlobalUsersFromMetadata = exports.getGlobalUsers = exports.getGlobalUser = exports.getRawGlobalUser = exports.getCachedSelf = exports.processUser = exports.updateAppRole = void 0;
 const utils_1 = require("../db/utils");
 const backend_core_1 = require("@budibase/backend-core");
 const environment_1 = __importDefault(require("../environment"));
@@ -20,7 +20,7 @@ const pro_1 = require("@budibase/pro");
 function updateAppRole(user, { appId } = {}) {
     var _a;
     appId = appId || backend_core_1.context.getAppId();
-    if (!user || !user.roles) {
+    if (!user || (!user.roles && !user.userGroups)) {
         return user;
     }
     // if in an multi-tenancy environment make sure roles are never updated
@@ -31,7 +31,7 @@ function updateAppRole(user, { appId } = {}) {
         return user;
     }
     // always use the deployed app
-    if (appId) {
+    if (appId && user.roles) {
         user.roleId = user.roles[backend_core_1.db.getProdAppID(appId)];
     }
     // if a role wasn't found then either set as admin (builder) or public (everyone else)
@@ -76,6 +76,7 @@ function processUser(user, opts = {}) {
         return user;
     });
 }
+exports.processUser = processUser;
 function getCachedSelf(ctx, appId) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -101,15 +102,13 @@ function getGlobalUser(userId) {
     });
 }
 exports.getGlobalUser = getGlobalUser;
-function getGlobalUsers(users) {
+function getGlobalUsers(userIds, opts) {
     return __awaiter(this, void 0, void 0, function* () {
         const appId = backend_core_1.context.getAppId();
         const db = backend_core_1.tenancy.getGlobalDB();
-        const allGroups = yield pro_1.groups.fetch();
         let globalUsers;
-        if (users) {
-            const globalIds = users.map(user => (0, utils_1.getGlobalIDFromUserMetadataID)(user._id));
-            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(globalIds))).rows.map(row => row.doc);
+        if (userIds) {
+            globalUsers = (yield db.allDocs((0, utils_1.getMultiIDParams)(userIds))).rows.map(row => row.doc);
         }
         else {
             globalUsers = (yield db.allDocs(backend_core_1.db.getGlobalUserParams(null, {
@@ -126,15 +125,21 @@ function getGlobalUsers(users) {
         if (!appId) {
             return globalUsers;
         }
-        // pass in the groups, meaning we don't actually need to retrieve them for
-        // each user individually
-        return Promise.all(globalUsers.map(user => processUser(user, { groups: allGroups })));
+        if (opts === null || opts === void 0 ? void 0 : opts.noProcessing) {
+            return globalUsers;
+        }
+        else {
+            // pass in the groups, meaning we don't actually need to retrieve them for
+            // each user individually
+            const allGroups = yield pro_1.groups.fetch();
+            return Promise.all(globalUsers.map(user => processUser(user, { groups: allGroups })));
+        }
     });
 }
 exports.getGlobalUsers = getGlobalUsers;
 function getGlobalUsersFromMetadata(users) {
     return __awaiter(this, void 0, void 0, function* () {
-        const globalUsers = yield getGlobalUsers(users);
+        const globalUsers = yield getGlobalUsers(users.map(user => user._id));
         return users.map(user => {
             const globalUser = globalUsers.find(globalUser => { var _a; return globalUser && ((_a = user._id) === null || _a === void 0 ? void 0 : _a.includes(globalUser._id)); });
             return Object.assign(Object.assign({}, globalUser), user);

package/dist/watch.js

@@ -18,7 +18,7 @@ const environment_1 = __importDefault(require("./environment"));
 const chokidar_1 = __importDefault(require("chokidar"));
 const fs_1 = __importDefault(require("fs"));
 const backend_core_1 = require("@budibase/backend-core");
-const plugin_1 = require("./api/controllers/plugin");
+const plugins_1 = __importDefault(require("./sdk/plugins"));
 function watch() {
     const watchPath = path_1.default.join(environment_1.default.PLUGINS_DIR, "./**/*.tar.gz");
     chokidar_1.default
@@ -41,7 +41,7 @@ function watch() {
                 const split = path.split("/");
                 const name = split[split.length - 1];
                 console.log("Importing plugin:", path);
-                yield (0, plugin_1.processUploadedPlugin)({ name, path });
+                yield plugins_1.default.processUploaded({ name, path });
             }
             catch (err) {
                 const message = (err === null || err === void 0 ? void 0 : err.message) ? err === null || err === void 0 ? void 0 : err.message : err;

package/dist/websockets/client.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const websocket_1 = __importDefault(require("./websocket"));
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const backend_core_1 = require("@budibase/backend-core");
+class ClientAppWebsocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/client", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+    }
+}
+exports.default = ClientAppWebsocket;

package/dist/websockets/grid.js

@@ -0,0 +1,60 @@
+"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 });
+const authorized_1 = __importDefault(require("../middleware/authorized"));
+const websocket_1 = __importDefault(require("./websocket"));
+const backend_core_1 = require("@budibase/backend-core");
+class GridSocket extends websocket_1.default {
+    constructor(app, server) {
+        super(app, server, "/socket/grid", [(0, authorized_1.default)(backend_core_1.permissions.BUILDER)]);
+        this.io.on("connection", socket => {
+            const user = socket.data.user;
+            console.log(`Spreadsheet user connected: ${user === null || user === void 0 ? void 0 : user.id}`);
+            // Socket state
+            let currentRoom;
+            // Initial identification of connected spreadsheet
+            socket.on("select-table", (tableId, callback) => __awaiter(this, void 0, void 0, function* () {
+                // Leave current room
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                    socket.leave(currentRoom);
+                }
+                // Join new room
+                currentRoom = tableId;
+                socket.join(currentRoom);
+                socket.to(currentRoom).emit("user-update", socket.data.user);
+                // Reply with all users in current room
+                const sockets = yield this.io.in(currentRoom).fetchSockets();
+                callback({
+                    users: sockets.map(socket => socket.data.user),
+                    id: user.id,
+                });
+            }));
+            // Handle users selecting a new cell
+            socket.on("select-cell", cellId => {
+                socket.data.user.selectedCellId = cellId;
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-update", socket.data.user);
+                }
+            });
+            // Disconnection cleanup
+            socket.on("disconnect", () => {
+                if (currentRoom) {
+                    socket.to(currentRoom).emit("user-disconnect", socket.data.user);
+                }
+            });
+        });
+    }
+}
+exports.default = GridSocket;

package/dist/websockets/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gridSocket = exports.clientAppSocket = exports.initialise = void 0;
+const grid_1 = __importDefault(require("./grid"));
+const client_1 = __importDefault(require("./client"));
+let clientAppSocket;
+exports.clientAppSocket = clientAppSocket;
+let gridSocket;
+exports.gridSocket = gridSocket;
+const initialise = (app, server) => {
+    exports.clientAppSocket = clientAppSocket = new client_1.default(app, server);
+    exports.gridSocket = gridSocket = new grid_1.default(app, server);
+};
+exports.initialise = initialise;

package/dist/websockets/websocket.js

@@ -0,0 +1,78 @@
+"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 });
+const socket_io_1 = require("socket.io");
+const http_1 = __importDefault(require("http"));
+const cookies_1 = __importDefault(require("cookies"));
+const koa_useragent_1 = require("koa-useragent");
+const backend_core_1 = require("@budibase/backend-core");
+const currentapp_1 = __importDefault(require("../middleware/currentapp"));
+class Socket {
+    constructor(app, server, path, additionalMiddlewares) {
+        this.io = new socket_io_1.Server(server, {
+            path,
+        });
+        // Attach default middlewares
+        const authenticate = backend_core_1.auth.buildAuthMiddleware([], {
+            publicAllowed: true,
+        });
+        const middlewares = [
+            koa_useragent_1.userAgent,
+            authenticate,
+            currentapp_1.default,
+            ...(additionalMiddlewares || []),
+        ];
+        // Apply middlewares
+        this.io.use((socket, next) => __awaiter(this, void 0, void 0, function* () {
+            // Build fake koa context
+            const res = new http_1.default.ServerResponse(socket.request);
+            const ctx = Object.assign(Object.assign({}, app.createContext(socket.request, res)), { 
+                // Additional overrides needed to make our middlewares work with this
+                // fake koa context
+                cookies: new cookies_1.default(socket.request, res), get: (field) => socket.request.headers[field], throw: (code, message) => {
+                    throw new Error(message);
+                }, 
+                // Needed for koa-useragent middleware
+                headers: socket.request.headers, header: socket.request.headers, 
+                // We don't really care about the path since it will never contain
+                // an app ID
+                path: "/socket" });
+            // Run all koa middlewares
+            try {
+                for (let [idx, middleware] of middlewares.entries()) {
+                    yield middleware(ctx, () => {
+                        if (idx === middlewares.length - 1) {
+                            // Middlewares are finished.
+                            // Extract some data from our enriched koa context to persist
+                            // as metadata for the socket
+                            socket.data.user = {
+                                id: ctx.user._id,
+                                email: ctx.user.email,
+                            };
+                            next();
+                        }
+                    });
+                }
+            }
+            catch (error) {
+                next(error);
+            }
+        }));
+    }
+    // Emit an event to all sockets
+    emit(event, payload) {
+        this.io.sockets.emit(event, payload);
+    }
+}
+exports.default = Socket;

package/jest.config.ts

@@ -20,9 +20,9 @@ const baseConfig: Config.InitialProjectOptions = {
 }
 
 // add pro sources if they exist
-if (fs.existsSync("../../../budibase-pro")) {
-  baseConfig.moduleNameMapper["@budibase/pro"] =
-    "<rootDir>/../../../budibase-pro/packages/pro/src"
+if (fs.existsSync("../pro/packages")) {
+  baseConfig.moduleNameMapper!["@budibase/pro"] =
+    "<rootDir>/../pro/packages/pro/src"
 }
 
 const config: Config.InitialOptions = {

package/nodemon.json

@@ -1,6 +1,10 @@
 {
-  "watch": ["src", "../backend-core", "../../../budibase-pro/packages/pro"],
+  "watch": ["src", "../backend-core", "../pro/packages/pro"],
   "ext": "js,ts,json",
-  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../backend-core/dist/**/*"],
+  "ignore": [
+    "src/**/*.spec.ts",
+    "src/**/*.spec.js",
+    "../backend-core/dist/**/*"
+  ],
   "exec": "ts-node src/index.ts"
-}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.1",
+  "version": "2.5.6-alpha.10",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.5.6-alpha.1",
-    "@budibase/client": "2.5.6-alpha.1",
-    "@budibase/pro": "2.5.5-alpha.4",
-    "@budibase/shared-core": "2.5.6-alpha.1",
-    "@budibase/string-templates": "2.5.6-alpha.1",
-    "@budibase/types": "2.5.6-alpha.1",
+    "@budibase/backend-core": "2.5.6-alpha.10",
+    "@budibase/client": "2.5.6-alpha.10",
+    "@budibase/pro": "2.5.6-alpha.6",
+    "@budibase/shared-core": "2.5.6-alpha.10",
+    "@budibase/string-templates": "2.5.6-alpha.10",
+    "@budibase/types": "2.5.6-alpha.10",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -65,6 +65,7 @@
     "bull": "4.10.1",
     "chmodr": "1.2.0",
     "chokidar": "3.5.3",
+    "cookies": "0.8.0",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
     "dd-trace": "3.13.2",
@@ -108,7 +109,7 @@
     "redis": "4",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
-    "socket.io": "^4.5.1",
+    "socket.io": "4.6.1",
     "svelte": "3.49.0",
     "swagger-parser": "10.0.3",
     "tar": "6.1.11",
@@ -175,5 +176,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "fdc38d656252b7b81508245e20ca65ef2739a363"
+  "gitHead": "5cd18e57d5c371d2dc375e20469f123e81aaec13"
 }

package/src/api/controllers/automation.ts

@@ -16,9 +16,15 @@ import { setTestFlag, clearTestFlag } from "../../utilities/redis"
 import { context, cache, events } from "@budibase/backend-core"
 import { automations } from "@budibase/pro"
 import { Automation, BBContext } from "@budibase/types"
+import { getActionDefinitions as actionDefs } from "../../automations/actions"
 
-const ACTION_DEFS = removeDeprecated(actions.ACTION_DEFINITIONS)
-const TRIGGER_DEFS = removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+async function getActionDefinitions() {
+  return removeDeprecated(await actionDefs())
+}
+
+function getTriggerDefinitions() {
+  return removeDeprecated(triggers.TRIGGER_DEFINITIONS)
+}
 
 /*************************
  *                       *
@@ -228,17 +234,17 @@ export async function clearLogError(ctx: BBContext) {
 }
 
 export async function getActionList(ctx: BBContext) {
-  ctx.body = ACTION_DEFS
+  ctx.body = await getActionDefinitions()
 }
 
 export async function getTriggerList(ctx: BBContext) {
-  ctx.body = TRIGGER_DEFS
+  ctx.body = getTriggerDefinitions()
 }
 
 export async function getDefinitionList(ctx: BBContext) {
   ctx.body = {
-    trigger: TRIGGER_DEFS,
-    action: ACTION_DEFS,
+    trigger: getTriggerDefinitions(),
+    action: await getActionDefinitions(),
   }
 }
 

package/src/api/controllers/plugin/index.ts

@@ -1,31 +1,11 @@
-import { npmUpload, urlUpload, githubUpload, fileUpload } from "./uploaders"
-import {
-  plugins as pluginCore,
-  db as dbCore,
-  tenancy,
-  objectStore,
-} from "@budibase/backend-core"
-import { PluginType, FileType, PluginSource, Plugin } from "@budibase/types"
+import { npmUpload, urlUpload, githubUpload } from "./uploaders"
+import { plugins as pluginCore } from "@budibase/backend-core"
+import { PluginType, FileType, PluginSource } from "@budibase/types"
 import env from "../../../environment"
-import { ClientAppSocket } from "../../../websocket"
+import { clientAppSocket } from "../../../websockets"
+import sdk from "../../../sdk"
 import { sdk as pro } from "@budibase/pro"
 
-export async function getPlugins(type?: PluginType) {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbCore.getPluginParams(null, {
-      include_docs: true,
-    })
-  )
-  let plugins = response.rows.map((row: any) => row.doc) as Plugin[]
-  plugins = objectStore.enrichPluginURLs(plugins)
-  if (type) {
-    return plugins.filter((plugin: Plugin) => plugin.schema?.type === type)
-  } else {
-    return plugins
-  }
-}
-
 export async function upload(ctx: any) {
   const plugins: FileType[] =
     ctx.request.files.file.length > 1
@@ -35,7 +15,7 @@ export async function upload(ctx: any) {
     let docs = []
     // can do single or multiple plugins
     for (let plugin of plugins) {
-      const doc = await processUploadedPlugin(plugin, PluginSource.FILE)
+      const doc = await sdk.plugins.processUploaded(plugin, PluginSource.FILE)
       docs.push(doc)
     }
     ctx.body = {
@@ -91,7 +71,7 @@ export async function create(ctx: any) {
 
     const doc = await pro.plugins.storePlugin(metadata, directory, source)
 
-    ClientAppSocket.emit("plugins-update", { name, hash: doc.hash })
+    clientAppSocket.emit("plugins-update", { name, hash: doc.hash })
     ctx.body = {
       message: "Plugin uploaded successfully",
       plugins: [doc],
@@ -105,7 +85,7 @@ export async function create(ctx: any) {
 }
 
 export async function fetch(ctx: any) {
-  ctx.body = await getPlugins()
+  ctx.body = await sdk.plugins.fetch()
 }
 
 export async function destroy(ctx: any) {
@@ -119,20 +99,3 @@ export async function destroy(ctx: any) {
     ctx.throw(400, err.message)
   }
 }
-
-export async function processUploadedPlugin(
-  plugin: FileType,
-  source?: PluginSource
-) {
-  const { metadata, directory } = await fileUpload(plugin)
-  pluginCore.validate(metadata?.schema)
-
-  // Only allow components in cloud
-  if (!env.SELF_HOSTED && metadata?.schema?.type !== PluginType.COMPONENT) {
-    throw new Error("Only component plugins are supported outside of self-host")
-  }
-
-  const doc = await pro.plugins.storePlugin(metadata, directory, source)
-  ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
-  return doc
-}

package/src/api/controllers/row/internal.ts

@@ -30,7 +30,6 @@ import { finaliseRow, updateRelatedFormula } from "./staticFormula"
 import { csv, json, jsonWithSchema, Format } from "../view/exporters"
 import { apiFileReturn } from "../../../utilities/fileSystem"
 import {
-  Ctx,
   UserCtx,
   Database,
   LinkDocumentValue,
@@ -72,7 +71,7 @@ async function getView(db: Database, viewName: string) {
   return viewInfo
 }
 
-async function getRawTableData(ctx: Ctx, db: Database, tableId: string) {
+async function getRawTableData(ctx: UserCtx, db: Database, tableId: string) {
   let rows
   if (tableId === InternalTables.USER_METADATA) {
     await userController.fetchMetadata(ctx)
@@ -188,7 +187,7 @@ export async function save(ctx: UserCtx) {
   })
 }
 
-export async function fetchView(ctx: Ctx) {
+export async function fetchView(ctx: UserCtx) {
   const viewName = decodeURIComponent(ctx.params.viewName)
 
   // if this is a table view being looked for just transfer to that
@@ -255,7 +254,7 @@ export async function fetchView(ctx: Ctx) {
   return rows
 }
 
-export async function fetch(ctx: Ctx) {
+export async function fetch(ctx: UserCtx) {
   const db = context.getAppDB()
 
   const tableId = ctx.params.tableId
@@ -264,7 +263,7 @@ export async function fetch(ctx: Ctx) {
   return outputProcessing(table, rows)
 }
 
-export async function find(ctx: Ctx) {
+export async function find(ctx: UserCtx) {
   const db = dbCore.getDB(ctx.appId)
   const table = await db.get(ctx.params.tableId)
   let row = await utils.findRow(ctx, ctx.params.tableId, ctx.params.rowId)
@@ -272,7 +271,7 @@ export async function find(ctx: Ctx) {
   return row
 }
 
-export async function destroy(ctx: Ctx) {
+export async function destroy(ctx: UserCtx) {
   const db = context.getAppDB()
   const { _id } = ctx.request.body
   let row = await db.get(_id)
@@ -308,7 +307,7 @@ export async function destroy(ctx: Ctx) {
   return { response, row }
 }
 
-export async function bulkDestroy(ctx: Ctx) {
+export async function bulkDestroy(ctx: UserCtx) {
   const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const table = await db.get(tableId)
@@ -347,7 +346,7 @@ export async function bulkDestroy(ctx: Ctx) {
   return { response: { ok: true }, rows: processedRows }
 }
 
-export async function search(ctx: Ctx) {
+export async function search(ctx: UserCtx) {
   // Fetch the whole table when running in cypress, as search doesn't work
   if (!env.COUCH_DB_URL && env.isCypress()) {
     return { rows: await fetch(ctx) }
@@ -387,7 +386,7 @@ export async function search(ctx: Ctx) {
   return response
 }
 
-export async function exportRows(ctx: Ctx) {
+export async function exportRows(ctx: UserCtx) {
   const db = context.getAppDB()
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
@@ -439,7 +438,7 @@ export async function exportRows(ctx: Ctx) {
   }
 }
 
-export async function fetchEnrichedRow(ctx: Ctx) {
+export async function fetchEnrichedRow(ctx: UserCtx) {
   const db = context.getAppDB()
   const tableId = ctx.params.tableId
   const rowId = ctx.params.rowId

package/src/api/controllers/row/utils.ts

@@ -5,7 +5,7 @@ import { context } from "@budibase/backend-core"
 import { makeExternalQuery } from "../../../integrations/base/query"
 import { Row, Table } from "@budibase/types"
 import { Format } from "../view/exporters"
-import { Ctx } from "@budibase/types"
+import { UserCtx } from "@budibase/types"
 import sdk from "../../../sdk"
 const validateJs = require("validate.js")
 const { cloneDeep } = require("lodash/fp")
@@ -26,7 +26,7 @@ export async function getDatasourceAndQuery(json: any) {
   return makeExternalQuery(datasource, json)
 }
 
-export async function findRow(ctx: Ctx, tableId: string, rowId: string) {
+export async function findRow(ctx: UserCtx, tableId: string, rowId: string) {
   const db = context.getAppDB()
   let row
   // TODO remove special user case in future