@budibase/server 1.0.167 → 1.0.170

package/dist/api/controllers/public/users.js

@@ -11,28 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.update = exports.read = exports.create = exports.search = void 0;
 const workerRequests_1 = require("../../../utilities/workerRequests");
+const users_1 = require("../../../utilities/users");
 const utils_1 = require("./utils");
-const { getProdAppID } = require("@budibase/backend-core/db");
-function fixUser(ctx) {
-    if (!ctx.request.body) {
-        return ctx;
-    }
-    if (!ctx.request.body._id && ctx.params.userId) {
-        ctx.request.body._id = ctx.params.userId;
-    }
-    if (!ctx.request.body.roles) {
-        ctx.request.body.roles = {};
-    }
-    else {
-        const newRoles = {};
-        for (let [appId, role] of Object.entries(ctx.request.body.roles)) {
-            // @ts-ignore
-            newRoles[getProdAppID(appId)] = role;
-        }
-        ctx.request.body.roles = newRoles;
-    }
-    return ctx;
-}
 function getUser(ctx, userId) {
     var _a;
     if (userId) {
@@ -54,7 +34,7 @@ function search(ctx, next) {
 exports.search = search;
 function create(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield (0, workerRequests_1.saveGlobalUser)(fixUser(ctx));
+        const response = yield (0, workerRequests_1.saveGlobalUser)((0, users_1.publicApiUserFix)(ctx));
         ctx.body = yield getUser(ctx, response._id);
         yield next();
     });
@@ -71,7 +51,7 @@ function update(ctx, next) {
     return __awaiter(this, void 0, void 0, function* () {
         const user = yield (0, workerRequests_1.readGlobalUser)(ctx);
         ctx.request.body = Object.assign(Object.assign({}, ctx.request.body), { _rev: user._rev });
-        const response = yield (0, workerRequests_1.saveGlobalUser)(fixUser(ctx));
+        const response = yield (0, workerRequests_1.saveGlobalUser)((0, users_1.publicApiUserFix)(ctx));
         ctx.body = yield getUser(ctx, response._id);
         yield next();
     });

package/dist/environment.js

@@ -1,4 +1,5 @@
 "use strict";
+const { join } = require("path");
 function isTest() {
     return (process.env.NODE_ENV === "jest" ||
         process.env.NODE_ENV === "cypress" ||
@@ -14,7 +15,9 @@ function isCypress() {
 }
 let LOADED = false;
 if (!LOADED && isDev() && !isTest()) {
-    require("dotenv").config();
+    require("dotenv").config({
+        path: join(__dirname, "..", ".env"),
+    });
     LOADED = true;
 }
 function parseIntSafe(number) {
@@ -48,6 +51,7 @@ module.exports = {
     JEST_WORKER_ID: process.env.JEST_WORKER_ID,
     BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
     DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
+    DISABLE_AUTO_PROD_APP_SYNC: process.env.DISABLE_AUTO_PROD_APP_SYNC,
     // minor
     SALT_ROUNDS: process.env.SALT_ROUNDS,
     LOGGER: process.env.LOGGER,

package/dist/integrations/postgres.js

@@ -107,7 +107,7 @@ var PostgresModule;
                     }
                     : undefined });
             this.client = new Client(newConfig);
-            this.setSchema();
+            this.open = false;
         }
         getBindingIdentifier() {
             return `$${this.index++}`;
@@ -115,8 +115,36 @@ var PostgresModule;
         getStringConcat(parts) {
             return parts.join(" || ");
         }
+        openConnection() {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield this.client.connect();
+                if (!this.config.schema) {
+                    this.config.schema = "public";
+                }
+                this.client.query(`SET search_path TO ${this.config.schema}`);
+                this.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
+                this.open = true;
+            });
+        }
+        closeConnection() {
+            const pg = this;
+            return new Promise((resolve, reject) => {
+                this.client.end((err) => {
+                    pg.open = false;
+                    if (err) {
+                        reject(err);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        }
         internalQuery(query, close = true) {
             return __awaiter(this, void 0, void 0, function* () {
+                if (!this.open) {
+                    yield this.openConnection();
+                }
                 const client = this.client;
                 this.index = 1;
                 // need to handle a specific issue with json data types in postgres,
@@ -134,24 +162,15 @@ var PostgresModule;
                     return yield client.query(query.sql, query.bindings || []);
                 }
                 catch (err) {
-                    yield this.client.end();
+                    yield this.closeConnection();
                     // @ts-ignore
                     throw new Error(err);
                 }
                 finally {
-                    if (close)
-                        yield this.client.end();
-                }
-            });
-        }
-        setSchema() {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield this.client.connect();
-                if (!this.config.schema) {
-                    this.config.schema = "public";
+                    if (close) {
+                        yield this.closeConnection();
+                    }
                 }
-                this.client.query(`SET search_path TO ${this.config.schema}`);
-                this.COLUMNS_SQL = `select * from information_schema.columns where table_schema = '${this.config.schema}'`;
             });
         }
         /**
@@ -162,6 +181,7 @@ var PostgresModule;
         buildSchema(datasourceId, entities) {
             return __awaiter(this, void 0, void 0, function* () {
                 let tableKeys = {};
+                yield this.openConnection();
                 try {
                     const primaryKeysResponse = yield this.client.query(this.PRIMARY_KEYS_SQL);
                     for (let table of primaryKeysResponse.rows) {
@@ -212,7 +232,7 @@ var PostgresModule;
                     throw new Error(err);
                 }
                 finally {
-                    yield this.client.end();
+                    yield this.closeConnection();
                 }
             });
         }
@@ -249,7 +269,7 @@ var PostgresModule;
                     for (let query of input) {
                         responses.push(yield this.internalQuery(query, false));
                     }
-                    yield this.client.end();
+                    yield this.closeConnection();
                     return responses;
                 }
                 else {

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.166",
+    "version": "1.0.169",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -69,10 +69,10 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.166",
-        "@budibase/client": "^1.0.166",
-        "@budibase/pro": "1.0.166",
-        "@budibase/string-templates": "^1.0.166",
+        "@budibase/backend-core": "^1.0.169",
+        "@budibase/client": "^1.0.169",
+        "@budibase/pro": "1.0.169",
+        "@budibase/string-templates": "^1.0.169",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",