@budibase/server 1.0.19-alpha.2 → 1.0.19-alpha.3

package/coverage/lcov-report/threads/query.js.html

@@ -313,7 +313,7 @@ module.exports = (input, callback) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -109,7 +109,7 @@ const SALT_ROUNDS = <span class="cstat-no" title="statement not covered" >env.SA
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -94,7 +94,7 @@ module.exports.budibaseTempDir = budibaseTempDir
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -130,7 +130,7 @@ exports.resolve = <span class="fstat-no" title="function not covered" >fu</span>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -496,7 +496,7 @@ module.exports = {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -367,7 +367,7 @@ exports.getGlobalUsersFromMetadata = async (appId, users) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/index.html

@@ -245,7 +245,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -374,14 +374,14 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const env = require("../environment")
 const { OBJ_STORE_DIRECTORY } = require("../constants")
@@ -553,7 +553,7 @@ exports.formatBytes = bytes =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/inMemoryQueue.js.html

@@ -367,7 +367,7 @@ module.exports = InMemoryQueue
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/queue/index.html

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/index.html

@@ -95,7 +95,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/routing/index.js.html

@@ -139,7 +139,7 @@ exports.createRoutingView = createRoutingView
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.html

@@ -110,7 +110,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/index.js.html

@@ -850,7 +850,7 @@ exports.outputProcessing = async (
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/utilities/rowProcessor/utils.js.html

@@ -133,7 +133,7 @@ exports.processFormulas = (table, rows) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../../prettify.js"></script>

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

@@ -136,7 +136,7 @@ module.exports = ScriptRunner
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -265,7 +265,7 @@ exports.CURRENTLY_SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -85,7 +85,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 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 Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

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

@@ -403,7 +403,7 @@ exports.removeAppFromUserRoles = async (ctx, appId) => {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Dec 14 2021 11:39:00 GMT+0000 (Coordinated Universal Time)
+                at Tue Dec 14 2021 12:31:13 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
         <script src="../prettify.js"></script>

package/coverage/lcov.info

@@ -8112,7 +8112,7 @@ FNDA:0,(anonymous_11)
 FNDA:0,(anonymous_12)
 FNDA:0,(anonymous_13)
 FNDA:0,(anonymous_14)
-FNDA:4,(anonymous_15)
+FNDA:6,(anonymous_15)
 DA:1,37
 DA:2,37
 DA:3,37
@@ -8182,13 +8182,13 @@ DA:147,0
 DA:148,0
 DA:150,0
 DA:154,37
-DA:155,4
-DA:156,4
-DA:157,4
-DA:158,4
-DA:159,4
+DA:155,6
+DA:156,6
+DA:157,6
+DA:158,6
+DA:159,6
 DA:160,0
-DA:162,4
+DA:162,6
 LF:76
 LH:55
 BRDA:16,0,0,1
@@ -8209,14 +8209,14 @@ BRDA:120,7,0,4
 BRDA:120,7,1,4
 BRDA:148,8,0,0
 BRDA:148,8,1,0
-BRDA:158,9,0,4
-BRDA:158,9,1,4
-BRDA:159,10,0,4
+BRDA:158,9,0,6
+BRDA:158,9,1,6
+BRDA:159,10,0,6
 BRDA:159,10,1,0
 BRDA:162,11,0,0
-BRDA:162,11,1,4
-BRDA:162,12,0,4
-BRDA:162,12,1,4
+BRDA:162,11,1,6
+BRDA:162,12,0,6
+BRDA:162,12,1,6
 BRF:26
 BRH:13
 end_of_record

package/dist/definitions/datasource.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilterTypes = exports.IncludeRelationships = exports.SourceNames = exports.DatasourceFieldTypes = exports.QueryTypes = exports.SortDirection = exports.Operation = void 0;
+exports.AuthType = exports.FilterTypes = exports.IncludeRelationships = exports.SourceNames = exports.DatasourceFieldTypes = exports.QueryTypes = exports.SortDirection = exports.Operation = void 0;
 var Operation;
 (function (Operation) {
     Operation["CREATE"] = "CREATE";
@@ -66,3 +66,8 @@ var FilterTypes;
     FilterTypes["NOT_EMPTY"] = "notEmpty";
     FilterTypes["ONE_OF"] = "oneOf";
 })(FilterTypes = exports.FilterTypes || (exports.FilterTypes = {}));
+var AuthType;
+(function (AuthType) {
+    AuthType["BASIC"] = "basic";
+    AuthType["BEARER"] = "bearer";
+})(AuthType = exports.AuthType || (exports.AuthType = {}));

package/dist/integrations/rest.js

@@ -142,10 +142,33 @@ var RestModule;
             }
             return complete;
         }
+        getAuthHeaders(authConfigId) {
+            let headers = {};
+            if (this.config.authConfigs && authConfigId) {
+                const authConfig = this.config.authConfigs.filter(c => c._id === authConfigId)[0];
+                // check the config still exists before proceeding
+                // if not - do nothing
+                if (authConfig) {
+                    let config;
+                    switch (authConfig.type) {
+                        case datasource_1.AuthType.BASIC:
+                            config = authConfig.config;
+                            headers.Authorization = `Basic ${Buffer.from(`${config.username}:${config.password}`).toString("base64")}`;
+                            break;
+                        case datasource_1.AuthType.BEARER:
+                            config = authConfig.config;
+                            headers.Authorization = `Bearer ${config.token}`;
+                            break;
+                    }
+                }
+            }
+            return headers;
+        }
         _req(query) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody } = query;
-                this.headers = Object.assign(Object.assign({}, this.config.defaultHeaders), headers);
+                const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId } = query;
+                const authHeaders = this.getAuthHeaders(authConfigId);
+                this.headers = Object.assign(Object.assign(Object.assign({}, this.config.defaultHeaders), headers), authHeaders);
                 if (disabledHeaders) {
                     for (let headerKey of Object.keys(this.headers)) {
                         if (disabledHeaders[headerKey]) {
@@ -167,7 +190,8 @@ var RestModule;
                     input.body = JSON.stringify(json);
                 }
                 this.startTimeMs = performance.now();
-                const response = yield fetch(this.getUrl(path, queryString), input);
+                const url = this.getUrl(path, queryString);
+                const response = yield fetch(url, input);
                 return yield this.parseResponse(response);
             });
         }
@@ -200,5 +224,6 @@ var RestModule;
     module.exports = {
         schema: SCHEMA,
         integration: RestIntegration,
+        AuthType: datasource_1.AuthType,
     };
 })(RestModule || (RestModule = {}));

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "1.0.19-alpha.1",
+    "version": "1.0.19-alpha.2",
     "description": "Budibase Web Server",
     "main": "src/index.ts",
     "repository": {
@@ -70,9 +70,9 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@budibase/auth": "^1.0.19-alpha.1",
-        "@budibase/client": "^1.0.19-alpha.1",
-        "@budibase/string-templates": "^1.0.19-alpha.1",
+        "@budibase/auth": "^1.0.19-alpha.2",
+        "@budibase/client": "^1.0.19-alpha.2",
+        "@budibase/string-templates": "^1.0.19-alpha.2",
         "@bull-board/api": "^3.7.0",
         "@bull-board/koa": "^3.7.0",
         "@elastic/elasticsearch": "7.10.0",