@budibase/server 1.0.95 → 1.0.98-alpha.0

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

@@ -91,7 +91,8 @@ exports.patch = (ctx) => __awaiter(void 0, void 0, void 0, function* () {
     const isUserTable = tableId === InternalTables.USER_METADATA;
     let oldRow;
     try {
-        oldRow = yield db.get(inputs._id);
+        let dbTable = yield db.get(tableId);
+        oldRow = yield outputProcessing(dbTable, yield findRow(ctx, tableId, inputs._id));
     }
     catch (err) {
         if (isUserTable) {

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

@@ -14,14 +14,13 @@ const { resolve, join } = require("../../../utilities/centralPath");
 const uuid = require("uuid");
 const { ObjectStoreBuckets } = require("../../../constants");
 const { processString } = require("@budibase/string-templates");
-const { getAllApps } = require("@budibase/backend-core/db");
 const { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, } = require("../../../utilities/fileSystem");
 const env = require("../../../environment");
 const { clientLibraryPath } = require("../../../utilities");
 const { upload } = require("../../../utilities/fileSystem");
 const { attachmentsRelativeURL } = require("../../../utilities");
 const { DocumentTypes } = require("../../../db/utils");
-const { getAppDB, updateAppId } = require("@budibase/backend-core/context");
+const { getAppDB, getAppId } = require("@budibase/backend-core/context");
 const AWS = require("aws-sdk");
 const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1";
 function prepareUpload({ s3Key, bucket, metadata, file }) {
@@ -43,18 +42,6 @@ function prepareUpload({ s3Key, bucket, metadata, file }) {
         };
     });
 }
-function getAppIdFromUrl(ctx) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // the "appId" component of the URL can be the id or the custom url
-        let possibleAppUrl = `/${encodeURI(ctx.params.appId).toLowerCase()}`;
-        // search prod apps for a url that matches, exclude dev where id is always used
-        const apps = yield getAllApps({ dev: false });
-        const app = apps.filter(a => a.url && a.url.toLowerCase() === possibleAppUrl)[0];
-        const appId = app && app.appId ? app.appId : ctx.params.appId;
-        updateAppId(appId);
-        return appId;
-    });
-}
 exports.serveBuilder = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let builderPath = resolve(TOP_LEVEL_PATH, "builder");
@@ -81,10 +68,10 @@ exports.uploadFile = function (ctx) {
 };
 exports.serveApp = function (ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let appId = yield getAppIdFromUrl(ctx);
         const App = require("./templates/BudibaseApp.svelte").default;
         const db = getAppDB({ skip_setup: true });
         const appInfo = yield db.get(DocumentTypes.APP_METADATA);
+        let appId = getAppId();
         const { head, html, css } = App.render({
             title: appInfo.name,
             production: env.isProd(),

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

@@ -97,8 +97,8 @@ function generateManyLinkSchema(datasource, column, table, relatedTable) {
         },
     };
     column.through = junctionTable._id;
-    column.throughFrom = primary;
-    column.throughTo = relatedPrimary;
+    column.throughFrom = relatedPrimary;
+    column.throughTo = primary;
     column.fieldName = relatedPrimary;
     return junctionTable;
 }
@@ -123,7 +123,7 @@ function generateRelatedSchema(linkColumn, table, relatedTable, columnName) {
     // is many to many
     else {
         // don't need to copy through, already got it
-        relatedSchema.fieldName = linkColumn.throughFrom;
+        relatedSchema.fieldName = linkColumn.throughTo;
         relatedSchema.throughTo = linkColumn.throughFrom;
         relatedSchema.throughFrom = linkColumn.throughTo;
     }

package/dist/api/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const Router = require("@koa/router");
-const { buildAuthMiddleware, auditLog, buildTenancyMiddleware, buildAppTenancyMiddleware, } = require("@budibase/backend-core/auth");
+const { buildAuthMiddleware, auditLog, buildTenancyMiddleware, } = require("@budibase/backend-core/auth");
 const currentApp = require("../middleware/currentapp");
 const compress = require("koa-compress");
 const zlib = require("zlib");
@@ -17,6 +17,8 @@ const { mainRoutes, staticRoutes, publicRoutes } = require("./routes");
 const pkg = require("../../package.json");
 const env = require("../environment");
 const router = new Router();
+router.get("/health", ctx => (ctx.status = 200));
+router.get("/version", ctx => (ctx.body = pkg.version));
 router
     .use(compress({
     threshold: 2048,
@@ -35,8 +37,6 @@ router
     };
     yield next();
 }))
-    .use("/health", ctx => (ctx.status = 200))
-    .use("/version", ctx => (ctx.body = pkg.version))
     // re-direct before any middlewares occur
     .redirect("/", "/builder")
     .use(buildAuthMiddleware(null, {
@@ -49,8 +49,6 @@ router
     noTenancyRequired: true,
 }))
     .use(currentApp)
-    // this middleware will try to use the app ID to determine the tenancy
-    .use(buildAppTenancyMiddleware())
     .use(auditLog);
 // error handling middleware
 router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
@@ -70,7 +68,6 @@ router.use((ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
 }));
-router.get("/health", ctx => (ctx.status = 200));
 // authenticated routes
 for (let route of mainRoutes) {
     router.use(route.routes());

package/dist/api/routes/analytics.js

@@ -3,6 +3,6 @@ const Router = require("@koa/router");
 const controller = require("../controllers/analytics");
 const router = Router();
 router
-    .get("/api/analytics", controller.isEnabled)
-    .post("/api/analytics/ping", controller.endUserPing);
+    .get("/api/bbtel", controller.isEnabled)
+    .post("/api/bbtel/ping", controller.endUserPing);
 module.exports = router;

package/dist/api/routes/static.js

@@ -42,7 +42,6 @@ router
     .get("/builder/:file*", controller.serveBuilder)
     .post("/api/attachments/process", authorized(BUILDER), controller.uploadFile)
     .post("/api/attachments/:tableId/upload", paramResource("tableId"), authorized(PermissionTypes.TABLE, PermissionLevels.WRITE), controller.uploadFile)
-    // TODO: this likely needs to be secured in some way
-    .get("/:appId/:path*", controller.serveApp)
+    .get("/app/:appUrl/:path*", controller.serveApp)
     .post("/api/attachments/:datasourceId/url", authorized(PermissionTypes.TABLE, PermissionLevels.READ), controller.getSignedUploadURL);
 module.exports = router;

package/dist/db/views/staticViews.js

@@ -36,6 +36,7 @@ exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
             if (doc.type === "link") {
                 let doc1 = doc.doc1;
                 let doc2 = doc.doc2;
+                // eslint-disable-next-line no-undef
                 emit([doc1.tableId, doc1.rowId], {
                     id: doc2.rowId,
                     thisId: doc1.rowId,
@@ -43,6 +44,7 @@ exports.createLinkView = () => __awaiter(void 0, void 0, void 0, function* () {
                 });
                 // if linking to same table can't emit twice
                 if (doc1.tableId !== doc2.tableId) {
+                    // eslint-disable-next-line no-undef
                     emit([doc2.tableId, doc2.rowId], {
                         id: doc1.rowId,
                         thisId: doc2.rowId,

package/dist/definitions/datasource.js

@@ -50,6 +50,7 @@ var SourceNames;
     SourceNames["REST"] = "REST";
     SourceNames["ORACLE"] = "ORACLE";
     SourceNames["GOOGLE_SHEETS"] = "GOOGLE_SHEETS";
+    SourceNames["FIREBASE"] = "FIREBASE";
 })(SourceNames = exports.SourceNames || (exports.SourceNames = {}));
 var IncludeRelationships;
 (function (IncludeRelationships) {

package/dist/integrations/base/sql.js

@@ -34,11 +34,8 @@ function parse(input) {
     if (typeof input !== "string") {
         return input;
     }
-    if (input === MAX_ISO_DATE) {
-        return new Date(8640000000000000);
-    }
-    if (input === MIN_ISO_DATE) {
-        return new Date(-8640000000000000);
+    if (input === MAX_ISO_DATE || input === MIN_ISO_DATE) {
+        return null;
     }
     if (utils_1.isIsoDateString(input)) {
         return new Date(input);
@@ -127,11 +124,21 @@ class InternalBuilder {
         }
         if (filters.range) {
             iterate(filters.range, (key, value) => {
-                if (!value.high || !value.low) {
-                    return;
+                if (value.low && value.high) {
+                    // Use a between operator if we have 2 valid range values
+                    const fnc = allOr ? "orWhereBetween" : "whereBetween";
+                    query = query[fnc](key, [value.low, value.high]);
+                }
+                else if (value.low) {
+                    // Use just a single greater than operator if we only have a low
+                    const fnc = allOr ? "orWhere" : "where";
+                    query = query[fnc](key, ">", value.low);
+                }
+                else if (value.high) {
+                    // Use just a single less than operator if we only have a high
+                    const fnc = allOr ? "orWhere" : "where";
+                    query = query[fnc](key, "<", value.high);
                 }
-                const fnc = allOr ? "orWhereBetween" : "whereBetween";
-                query = query[fnc](key, [value.low, value.high]);
             });
         }
         if (filters.equal) {

package/dist/integrations/dynamodb.js

@@ -124,7 +124,9 @@ var DynamoModule;
     class DynamoDBIntegration {
         constructor(config) {
             this.config = config;
-            this.connect();
+            if (!this.config.endpoint) {
+                this.connect();
+            }
             let options = {
                 correctClockSkew: true,
                 endpoint: config.endpoint ? config.endpoint : undefined,

package/dist/integrations/firebase.js

@@ -0,0 +1,192 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const datasource_1 = require("../definitions/datasource");
+const firestore_1 = require("@google-cloud/firestore");
+var Firebase;
+(function (Firebase) {
+    const SCHEMA = {
+        docs: "https://firebase.google.com/docs/firestore/quickstart",
+        friendlyName: "Firestore",
+        description: "Cloud Firestore is a flexible, scalable database for mobile, web, and server development from Firebase and Google Cloud.",
+        datasource: {
+            email: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            privateKey: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            projectId: {
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            serviceAccount: {
+                type: datasource_1.DatasourceFieldTypes.JSON,
+                required: false,
+            },
+        },
+        query: {
+            create: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            read: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            update: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+            delete: {
+                type: datasource_1.QueryTypes.JSON,
+            },
+        },
+        extra: {
+            collection: {
+                displayName: "Collection",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: true,
+            },
+            filterField: {
+                displayName: "Filter field",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: false,
+            },
+            filter: {
+                displayName: "Filter comparison",
+                type: datasource_1.DatasourceFieldTypes.LIST,
+                required: false,
+                data: {
+                    read: [
+                        "==",
+                        "<",
+                        "<=",
+                        "==",
+                        "!=",
+                        ">=",
+                        ">",
+                        "array-contains",
+                        "in",
+                        "not-in",
+                        "array-contains-any",
+                    ],
+                },
+            },
+            filterValue: {
+                displayName: "Filter value",
+                type: datasource_1.DatasourceFieldTypes.STRING,
+                required: false,
+            },
+        },
+    };
+    class FirebaseIntegration {
+        constructor(config) {
+            this.config = config;
+            if (config.serviceAccount) {
+                const serviceAccount = JSON.parse(config.serviceAccount);
+                this.db = new firestore_1.Firestore({
+                    projectId: serviceAccount.project_id,
+                    credentials: {
+                        client_email: serviceAccount.client_email,
+                        private_key: serviceAccount.private_key,
+                    },
+                });
+            }
+            else {
+                this.db = new firestore_1.Firestore({
+                    projectId: config.projectId,
+                    credentials: {
+                        client_email: config.email,
+                        private_key: config.privateKey,
+                    },
+                });
+            }
+        }
+        create(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const documentReference = this.db
+                        .collection(query.extra.collection)
+                        .doc();
+                    yield documentReference.set(Object.assign(Object.assign({}, query.json), { id: documentReference.id }));
+                    const snapshot = yield documentReference.get();
+                    return snapshot.data();
+                }
+                catch (err) {
+                    console.error("Error writing to Firestore", err);
+                    throw err;
+                }
+            });
+        }
+        read(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let snapshot;
+                    const collectionRef = this.db.collection(query.extra.collection);
+                    if (query.extra.filterField &&
+                        query.extra.filter &&
+                        query.extra.filterValue) {
+                        snapshot = yield collectionRef
+                            .where(query.extra.filterField, query.extra.filter, query.extra.filterValue)
+                            .get();
+                    }
+                    else {
+                        snapshot = yield collectionRef.get();
+                    }
+                    const result = [];
+                    snapshot.forEach(doc => result.push(doc.data()));
+                    return result;
+                }
+                catch (err) {
+                    console.error("Error querying Firestore", err);
+                    throw err;
+                }
+            });
+        }
+        update(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .update(query.json);
+                    return (yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .get()).data();
+                }
+                catch (err) {
+                    console.error("Error writing to firebase", err);
+                    throw err;
+                }
+            });
+        }
+        delete(query) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.db
+                        .collection(query.extra.collection)
+                        .doc(query.json.id)
+                        .delete();
+                    return true;
+                }
+                catch (err) {
+                    console.error("Error writing to mongodb", err);
+                    throw err;
+                }
+            });
+        }
+    }
+    module.exports = {
+        schema: SCHEMA,
+        integration: FirebaseIntegration,
+    };
+})(Firebase || (Firebase = {}));

package/dist/integrations/index.js

@@ -11,6 +11,7 @@ const mysql = require("./mysql");
 const arangodb = require("./arangodb");
 const rest = require("./rest");
 const googlesheets = require("./googlesheets");
+const firebase = require("./firebase");
 const { SourceNames } = require("../definitions/datasource");
 const environment = require("../environment");
 const DEFINITIONS = {
@@ -25,6 +26,7 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
+    [SourceNames.FIREBASE]: firebase.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -38,6 +40,7 @@ const INTEGRATIONS = {
     [SourceNames.MYSQL]: mysql.integration,
     [SourceNames.ARANGODB]: arangodb.integration,
     [SourceNames.REST]: rest.integration,
+    [SourceNames.FIREBASE]: firebase.integration,
 };
 // optionally add oracle integration if the oracle binary can be installed
 if (!(process.arch === "arm64" && process.platform === "darwin")) {

package/dist/integrations/rest.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const datasource_1 = require("../definitions/datasource");
+const lodash_1 = require("lodash");
 const BodyTypes = {
     NONE: "none",
     FORM_DATA: "form",
@@ -148,7 +149,7 @@ var RestModule;
                 // Check if a pagination cursor exists in the response
                 let nextCursor = null;
                 if (pagination === null || pagination === void 0 ? void 0 : pagination.responseParam) {
-                    nextCursor = data === null || data === void 0 ? void 0 : data[pagination.responseParam];
+                    nextCursor = lodash_1.get(data, pagination.responseParam);
                 }
                 return {
                     data,

package/dist/middleware/currentapp.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const { getAppId, setCookie, getCookie, clearCookie, } = require("@budibase/backend-core/utils");
+const { getAppIdFromCtx, setCookie, getCookie, clearCookie, } = require("@budibase/backend-core/utils");
 const { Cookies } = require("@budibase/backend-core/constants");
 const { getRole } = require("@budibase/backend-core/roles");
 const { BUILTIN_ROLE_IDS } = require("@budibase/backend-core/roles");
@@ -21,7 +21,7 @@ const { isWebhookEndpoint } = require("./utils");
 const { doInAppContext } = require("@budibase/backend-core/context");
 module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
     // try to get the appID from the request
-    let requestAppId = getAppId(ctx);
+    let requestAppId = yield getAppIdFromCtx(ctx);
     // get app cookie if it exists
     let appCookie = null;
     try {
@@ -70,19 +70,20 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         return next();
     }
     return doInAppContext(appId, () => __awaiter(void 0, void 0, void 0, function* () {
-        let noCookieSet = false;
+        let skipCookie = false;
         // if the user not in the right tenant then make sure they have no permissions
         // need to judge this only based on the request app ID,
         if (env.MULTI_TENANCY &&
             ctx.user &&
             requestAppId &&
-            !isUserInAppTenant(requestAppId)) {
+            !isUserInAppTenant(requestAppId, ctx.user)) {
             // don't error, simply remove the users rights (they are a public user)
             delete ctx.user.builder;
             delete ctx.user.admin;
             delete ctx.user.roles;
+            ctx.isAuthenticated = false;
             roleId = BUILTIN_ROLE_IDS.PUBLIC;
-            noCookieSet = true;
+            skipCookie = true;
         }
         ctx.appId = appId;
         if (roleId) {
@@ -96,7 +97,7 @@ module.exports = (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
         if ((requestAppId !== appId ||
             appCookie == null ||
             appCookie.appId !== requestAppId) &&
-            !noCookieSet) {
+            !skipCookie) {
             setCookie(ctx, { appId }, Cookies.CurrentApp);
         }
         return next();

package/dist/middleware/publicApi.js

@@ -9,10 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 const { Headers } = require("@budibase/backend-core/constants");
-const { getAppId } = require("@budibase/backend-core/utils");
+const { getAppIdFromCtx } = require("@budibase/backend-core/utils");
 module.exports = function ({ requiresAppId } = {}) {
     return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        const appId = getAppId(ctx);
+        const appId = yield getAppIdFromCtx(ctx);
         if (requiresAppId && !appId) {
             ctx.throw(400, `Invalid app ID provided, please check the ${Headers.APP_ID} header.`);
         }

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.94",
+    "version": "1.0.97",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -21,10 +21,7 @@
         "dev:stack:down": "node scripts/dev/manage.js down",
         "dev:stack:nuke": "node scripts/dev/manage.js nuke",
         "dev:builder": "yarn run dev:stack:up && nodemon",
-        "format": "prettier --config ../../.prettierrc.json 'src/**/*.ts' --write",
         "specs": "node specs/generate.js && openapi-typescript specs/openapi.yaml --output src/definitions/openapi.ts",
-        "lint": "eslint --fix src/",
-        "lint:fix": "yarn run format && yarn run lint",
         "initialise": "node scripts/initialise.js",
         "env:multi:enable": "node scripts/multiTenancy.js enable",
         "env:multi:disable": "node scripts/multiTenancy.js disable",
@@ -71,12 +68,13 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.94",
-        "@budibase/client": "^1.0.94",
-        "@budibase/string-templates": "^1.0.94",
+        "@budibase/backend-core": "^1.0.97",
+        "@budibase/client": "^1.0.97",
+        "@budibase/string-templates": "^1.0.97",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",
+        "@google-cloud/firestore": "^5.0.2",
         "@koa/router": "8.0.0",
         "@sendgrid/mail": "7.1.1",
         "@sentry/node": "^6.0.0",
@@ -148,15 +146,16 @@
         "@types/jest": "^26.0.23",
         "@types/koa": "^2.13.3",
         "@types/koa-router": "^7.4.2",
+        "@types/lodash": "4.14.180",
         "@types/node": "^15.12.4",
         "@types/oracledb": "^5.2.1",
         "@types/redis": "^4.0.11",
-        "@typescript-eslint/parser": "4.28.0",
         "apidoc": "^0.50.2",
         "babel-jest": "^27.0.2",
         "copyfiles": "^2.4.1",
         "docker-compose": "^0.23.6",
         "eslint": "^6.8.0",
+        "is-wsl": "^2.2.0",
         "jest": "^27.0.5",
         "jest-openapi": "^0.14.2",
         "nodemon": "^2.0.4",

package/dist/tests/utilities/TestConfiguration.js

@@ -75,7 +75,7 @@ class TestConfiguration {
                 });
             }
             // check if already in a context
-            if (context.getAppId() == null) {
+            if (context.getAppId() == null && this.appId !== null) {
                 return context.doInAppContext(this.appId, () => __awaiter(this, void 0, void 0, function* () {
                     return run();
                 }));