@budibase/server 2.3.17-alpha.0 → 2.3.17-alpha.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.3.17-alpha.0",
+  "version": "2.3.17-alpha.2",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,11 +43,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.3.17-alpha.0",
-    "@budibase/client": "2.3.17-alpha.0",
-    "@budibase/pro": "2.3.16",
-    "@budibase/string-templates": "2.3.17-alpha.0",
-    "@budibase/types": "2.3.17-alpha.0",
+    "@budibase/backend-core": "2.3.17-alpha.2",
+    "@budibase/client": "2.3.17-alpha.2",
+    "@budibase/pro": "2.3.17-alpha.1",
+    "@budibase/string-templates": "2.3.17-alpha.2",
+    "@budibase/types": "2.3.17-alpha.2",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -172,5 +172,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "92d4358c4013f4941c374f9b82069206790b9ef4"
+  "gitHead": "805f74f92aaabf648d2701d86716c000afd7c682"
 }

package/tsconfig.build.json

@@ -20,6 +20,7 @@
     "dist",
     "src/tests",
     "src/api/routes/tests/utilities",
+    "src/api/routes/public/tests/utils.ts",
     "src/automations/tests/utilities",
     "**/*.spec.ts",
     "**/*.spec.js"

package/dist/api/routes/public/tests/utils.js

@@ -1,60 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateMakeRequest = void 0;
-const setup = __importStar(require("../../tests/utilities"));
-const utilities_1 = require("../../../../utilities");
-function generateMakeRequest(apiKey, isInternal = false) {
-    const request = setup.getRequest();
-    const config = setup.getConfig();
-    return (method, endpoint, body, intAppId = config.getAppId()) => __awaiter(this, void 0, void 0, function* () {
-        const extraHeaders = {
-            "x-budibase-api-key": apiKey,
-        };
-        if (intAppId) {
-            extraHeaders["x-budibase-app-id"] = intAppId;
-        }
-        const url = isInternal
-            ? endpoint
-            : (0, utilities_1.checkSlashesInUrl)(`/api/public/v1/${endpoint}`);
-        const req = request[method](url).set(config.defaultHeaders(extraHeaders));
-        if (body) {
-            req.send(body);
-        }
-        const res = yield req;
-        expect(res.body).toBeDefined();
-        return res;
-    });
-}
-exports.generateMakeRequest = generateMakeRequest;

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

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