@budibase/server 2.2.12-alpha.47 → 2.2.12-alpha.48

package/dist/definitions/datasource.js

@@ -5,9 +5,3 @@
  * be exposed for use by other services.    *
  ********************************************/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthType = void 0;
-var AuthType;
-(function (AuthType) {
-    AuthType["BASIC"] = "basic";
-    AuthType["BEARER"] = "bearer";
-})(AuthType = exports.AuthType || (exports.AuthType = {}));

package/dist/integrations/rest.js

@@ -36,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("@budibase/types");
-const datasource_1 = require("../definitions/datasource");
 const lodash_1 = require("lodash");
 const https = __importStar(require("https"));
 const querystring_1 = __importDefault(require("querystring"));
@@ -318,11 +317,11 @@ class RestIntegration {
             if (authConfig) {
                 let config;
                 switch (authConfig.type) {
-                    case datasource_1.AuthType.BASIC:
+                    case types_1.RestAuthType.BASIC:
                         config = authConfig.config;
                         headers.Authorization = `Basic ${Buffer.from(`${config.username}:${config.password}`).toString("base64")}`;
                         break;
-                    case datasource_1.AuthType.BEARER:
+                    case types_1.RestAuthType.BEARER:
                         config = authConfig.config;
                         headers.Authorization = `Bearer ${config.token}`;
                         break;
@@ -390,5 +389,4 @@ class RestIntegration {
 exports.default = {
     schema: SCHEMA,
     integration: RestIntegration,
-    AuthType: datasource_1.AuthType,
 };

package/dist/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@budibase/server",
     "email": "hi@budibase.com",
-    "version": "2.2.12-alpha.46",
+    "version": "2.2.12-alpha.47",
     "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.2.12-alpha.46",
-        "@budibase/client": "2.2.12-alpha.46",
-        "@budibase/pro": "2.2.12-alpha.46",
-        "@budibase/string-templates": "2.2.12-alpha.46",
-        "@budibase/types": "2.2.12-alpha.46",
+        "@budibase/backend-core": "2.2.12-alpha.47",
+        "@budibase/client": "2.2.12-alpha.47",
+        "@budibase/pro": "2.2.12-alpha.47",
+        "@budibase/string-templates": "2.2.12-alpha.47",
+        "@budibase/types": "2.2.12-alpha.47",
         "@bull-board/api": "3.7.0",
         "@bull-board/koa": "3.9.4",
         "@elastic/elasticsearch": "7.10.0",

package/dist/sdk/app/datasources/datasources.js

@@ -17,7 +17,6 @@ const fp_1 = require("lodash/fp");
 const utils_1 = require("../../utils");
 const integrations_1 = require("../../../integrations");
 const ENV_VAR_PREFIX = "env.";
-const USER_PREFIX = "user";
 function enrichDatasourceWithValues(datasource) {
     return __awaiter(this, void 0, void 0, function* () {
         const cloned = (0, fp_1.cloneDeep)(datasource);
@@ -57,6 +56,17 @@ function getWithEnvVars(datasourceId) {
     });
 }
 exports.getWithEnvVars = getWithEnvVars;
+function hasAuthConfigs(datasource) {
+    var _a;
+    return datasource.source === types_1.SourceName.REST && ((_a = datasource.config) === null || _a === void 0 ? void 0 : _a.authConfigs);
+}
+function useEnvVars(str) {
+    if (typeof str !== "string") {
+        return false;
+    }
+    const blocks = (0, string_templates_1.findHBSBlocks)(str);
+    return blocks.find(block => block.includes(ENV_VAR_PREFIX)) != null;
+}
 function removeSecrets(datasources) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
@@ -68,15 +78,23 @@ function removeSecrets(datasources) {
                 if (datasource.config.auth) {
                     delete datasource.config.auth;
                 }
-                // remove passwords
-                for (let key of Object.keys(datasource.config)) {
-                    if (typeof datasource.config[key] !== "string") {
-                        continue;
+                // specific to REST datasources, contains passwords
+                if (hasAuthConfigs(datasource)) {
+                    const configs = datasource.config.authConfigs;
+                    for (let config of configs) {
+                        if (config.type !== types_1.RestAuthType.BASIC) {
+                            continue;
+                        }
+                        const basic = config.config;
+                        if (!useEnvVars(basic.password)) {
+                            basic.password = types_1.PASSWORD_REPLACEMENT;
+                        }
                     }
-                    const blocks = (0, string_templates_1.findHBSBlocks)(datasource.config[key]);
-                    const usesEnvVars = blocks.find(block => block.includes(ENV_VAR_PREFIX)) != null;
-                    if (!usesEnvVars &&
-                        ((_b = (_a = schema.datasource) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.type) === types_1.DatasourceFieldType.PASSWORD) {
+                }
+                // remove general passwords
+                for (let key of Object.keys(datasource.config)) {
+                    if (((_b = (_a = schema.datasource) === null || _a === void 0 ? void 0 : _a[key]) === null || _b === void 0 ? void 0 : _b.type) === types_1.DatasourceFieldType.PASSWORD &&
+                        !useEnvVars(datasource.config[key])) {
                         datasource.config[key] = types_1.PASSWORD_REPLACEMENT;
                     }
                 }
@@ -93,16 +111,32 @@ function removeSecretSingle(datasource) {
 }
 exports.removeSecretSingle = removeSecretSingle;
 function mergeConfigs(update, old) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (!update.config) {
         return update;
     }
+    // specific to REST datasources, fix the auth configs again if required
+    if (hasAuthConfigs(update)) {
+        const configs = update.config.authConfigs;
+        const oldConfigs = (_a = old.config) === null || _a === void 0 ? void 0 : _a.authConfigs;
+        for (let config of configs) {
+            if (config.type !== types_1.RestAuthType.BASIC) {
+                continue;
+            }
+            const basic = config.config;
+            const oldBasic = (_b = oldConfigs.find(old => old.name === config.name)) === null || _b === void 0 ? void 0 : _b.config;
+            if (basic.password === types_1.PASSWORD_REPLACEMENT) {
+                basic.password = oldBasic.password;
+            }
+        }
+    }
+    // update back to actual passwords for everything else
     for (let [key, value] of Object.entries(update.config)) {
         if (value !== types_1.PASSWORD_REPLACEMENT) {
             continue;
         }
-        if ((_a = old.config) === null || _a === void 0 ? void 0 : _a[key]) {
-            update.config[key] = (_b = old.config) === null || _b === void 0 ? void 0 : _b[key];
+        if ((_c = old.config) === null || _c === void 0 ? void 0 : _c[key]) {
+            update.config[key] = (_d = old.config) === null || _d === void 0 ? void 0 : _d[key];
         }
         else {
             delete update.config[key];