@budibase/server 1.0.91-alpha.3 → 1.0.91

package/coverage/lcov-report/utilities/usageQuota/usageQuoteReset.js.html

@@ -118,7 +118,7 @@ function <span class="fstat-no" title="function not covered" >resetQuotasIfRequi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 18 2022 10:13:31 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 16:04:41 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/users.js.html

@@ -136,7 +136,7 @@ exports.getFullUser = async (ctx, userId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 18 2022 10:13:31 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 16:04:41 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/workerRequests.js.html

@@ -481,7 +481,7 @@ exports.readGlobalUser = <span class="fstat-no" title="function not covered" >as
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Fri Mar 18 2022 10:13:31 GMT+0000 (Coordinated Universal Time)
+                at Fri Mar 18 2022 16:04:41 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -2193,14 +2193,14 @@ FN:28,(anonymous_1)
 FN:33,(anonymous_2)
 FNF:3
 FNH:3
-FNDA:33,(anonymous_0)
+FNDA:29,(anonymous_0)
 FNDA:24,(anonymous_1)
 FNDA:24,(anonymous_2)
 DA:1,41
 DA:2,41
 DA:4,41
 DA:6,41
-DA:7,33
+DA:7,29
 DA:28,41
 DA:30,24
 DA:33,41
@@ -6583,10 +6583,10 @@ SF:src/db/newid.js
 FN:3,(anonymous_0)
 FNF:1
 FNH:1
-FNDA:996,(anonymous_0)
+FNDA:946,(anonymous_0)
 DA:1,55
 DA:3,55
-DA:4,996
+DA:4,946
 LF:3
 LH:3
 BRF:0
@@ -6652,7 +6652,7 @@ FNDA:10,(anonymous_20)
 FNDA:2,(anonymous_21)
 FNDA:39,(anonymous_22)
 FNDA:4,(anonymous_23)
-FNDA:131,(anonymous_24)
+FNDA:81,(anonymous_24)
 FNDA:4,(anonymous_25)
 FNDA:0,(anonymous_26)
 FNDA:10,(anonymous_27)
@@ -6753,7 +6753,7 @@ DA:318,39
 DA:326,55
 DA:327,4
 DA:334,55
-DA:335,131
+DA:335,81
 DA:343,55
 DA:344,4
 DA:345,3

package/dist/api/controllers/query/import/index.js

@@ -13,7 +13,6 @@ exports.RestImporter = void 0;
 const validation_1 = require("../validation");
 const utils_1 = require("../../../../db/utils");
 const openapi2_1 = require("./sources/openapi2");
-const openapi3_1 = require("./sources/openapi3");
 const curl_1 = require("./sources/curl");
 // @ts-ignore
 const context_1 = require("@budibase/backend-core/context");
@@ -72,7 +71,7 @@ class RestImporter {
             };
         });
         this.data = data;
-        this.sources = [new openapi2_1.OpenAPI2(), new openapi3_1.OpenAPI3(), new curl_1.Curl()];
+        this.sources = [new openapi2_1.OpenAPI2(), new curl_1.Curl()];
     }
 }
 exports.RestImporter = RestImporter;

package/dist/api/controllers/query/import/sources/base/index.js

@@ -17,18 +17,7 @@ class ImportSource {
             const transformer = "return data";
             const schema = {};
             path = this.processPath(path);
-            if (url) {
-                if (typeof url === "string") {
-                    path = `${url}/${path}`;
-                }
-                else {
-                    let href = url.href;
-                    if (href.endsWith("/")) {
-                        href = href.slice(0, -1);
-                    }
-                    path = `${href}/${path}`;
-                }
-            }
+            path = `${url.origin}/${path}`;
             queryString = this.processQuery(queryString);
             const requestBody = JSON.stringify(body, null, 2);
             const query = {

package/dist/api/controllers/query/import/sources/curl.js

@@ -79,7 +79,7 @@ class Curl extends base_1.ImportSource {
         this.getQueries = (datasourceId) => __awaiter(this, void 0, void 0, function* () {
             const url = this.getUrl();
             const name = url.pathname;
-            const path = url.origin + url.pathname;
+            const path = url.pathname;
             const method = this.curl.method;
             const queryString = url.search;
             const headers = this.curl.headers;
@@ -88,7 +88,7 @@ class Curl extends base_1.ImportSource {
             if (cookieHeader) {
                 headers["Cookie"] = cookieHeader;
             }
-            const query = this.constructQuery(datasourceId, name, method, path, undefined, queryString, headers, [], requestBody);
+            const query = this.constructQuery(datasourceId, name, method, path, url, queryString, headers, [], requestBody);
             return [query];
         });
     }

package/dist/definitions/datasource.js

@@ -50,7 +50,6 @@ 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/index.js

@@ -11,7 +11,6 @@ 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 = {
@@ -26,7 +25,6 @@ const DEFINITIONS = {
     [SourceNames.MYSQL]: mysql.schema,
     [SourceNames.ARANGODB]: arangodb.schema,
     [SourceNames.REST]: rest.schema,
-    [SourceNames.FIREBASE]: firebase.schema,
 };
 const INTEGRATIONS = {
     [SourceNames.POSTGRES]: postgres.integration,
@@ -40,7 +38,6 @@ 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/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.91-alpha.2",
+    "version": "1.0.90",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -71,13 +71,12 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/backend-core": "^1.0.91-alpha.2",
-        "@budibase/client": "^1.0.91-alpha.2",
-        "@budibase/string-templates": "^1.0.91-alpha.2",
+        "@budibase/backend-core": "^1.0.90",
+        "@budibase/client": "^1.0.90",
+        "@budibase/string-templates": "^1.0.90",
         "@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",