@budibase/server 2.2.12-alpha.43 → 2.2.12-alpha.45

package/dist/utilities/fileSystem/filesystem.js

@@ -13,23 +13,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFolderFileSystem = exports.findFileRec = exports.extractTarball = exports.createTempFolder = exports.readFileSync = exports.sendTempFile = exports.stringToFileStream = exports.storeTempFile = exports.streamFile = exports.apiFileReturn = exports.loadHandlebarsFile = exports.checkDevelopmentEnvironment = exports.init = exports.TOP_LEVEL_PATH = void 0;
-const { budibaseTempDir } = require("../budibaseDir");
-const fs = require("fs");
-const { join } = require("path");
-const uuid = require("uuid/v4");
+const fs_1 = __importDefault(require("fs"));
+const budibaseDir_1 = require("../budibaseDir");
+const path_1 = require("path");
 const environment_1 = __importDefault(require("../../environment"));
 const tar_1 = __importDefault(require("tar"));
-exports.TOP_LEVEL_PATH = join(__dirname, "..", "..", "..");
+const uuid = require("uuid/v4");
+exports.TOP_LEVEL_PATH = (0, path_1.join)(__dirname, "..", "..", "..");
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.
  */
 const init = () => {
-    const tempDir = budibaseTempDir();
-    if (!fs.existsSync(tempDir)) {
+    const tempDir = (0, budibaseDir_1.budibaseTempDir)();
+    if (!fs_1.default.existsSync(tempDir)) {
         // some test cases fire this quickly enough that
         // synchronous cases can end up here at the same time
         try {
-            fs.mkdirSync(tempDir);
+            fs_1.default.mkdirSync(tempDir);
         }
         catch (err) {
             if (!err || err.code !== "EEXIST") {
@@ -37,9 +37,9 @@ const init = () => {
             }
         }
     }
-    const clientLibPath = join(budibaseTempDir(), "budibase-client.js");
-    if (environment_1.default.isTest() && !fs.existsSync(clientLibPath)) {
-        fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
+    const clientLibPath = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "budibase-client.js");
+    if (environment_1.default.isTest() && !fs_1.default.existsSync(clientLibPath)) {
+        fs_1.default.copyFileSync(require.resolve("@budibase/client"), clientLibPath);
     }
 };
 exports.init = init;
@@ -51,11 +51,11 @@ const checkDevelopmentEnvironment = () => {
     if (!environment_1.default.isDev() || environment_1.default.isTest()) {
         return;
     }
-    if (!fs.existsSync(budibaseTempDir())) {
-        fs.mkdirSync(budibaseTempDir());
+    if (!fs_1.default.existsSync((0, budibaseDir_1.budibaseTempDir)())) {
+        fs_1.default.mkdirSync((0, budibaseDir_1.budibaseTempDir)());
     }
     let error;
-    if (!fs.existsSync(join(process.cwd(), ".env"))) {
+    if (!fs_1.default.existsSync((0, path_1.join)(process.cwd(), ".env"))) {
         error = "Must run via yarn once to generate environment.";
     }
     if (error) {
@@ -72,7 +72,7 @@ exports.checkDevelopmentEnvironment = checkDevelopmentEnvironment;
  * @returns {string} The loaded handlebars file as a string - loaded as utf8.
  */
 const loadHandlebarsFile = (path) => {
-    return fs.readFileSync(path, "utf8");
+    return fs_1.default.readFileSync(path, "utf8");
 };
 exports.loadHandlebarsFile = loadHandlebarsFile;
 /**
@@ -82,13 +82,13 @@ exports.loadHandlebarsFile = loadHandlebarsFile;
  * @return {Object} the read stream which can be put into the koa context body.
  */
 const apiFileReturn = (contents) => {
-    const path = join(budibaseTempDir(), uuid());
-    fs.writeFileSync(path, contents);
-    return fs.createReadStream(path);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, contents);
+    return fs_1.default.createReadStream(path);
 };
 exports.apiFileReturn = apiFileReturn;
 const streamFile = (path) => {
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.streamFile = streamFile;
 /**
@@ -97,8 +97,8 @@ exports.streamFile = streamFile;
  * @return {string} the path to the temp file.
  */
 const storeTempFile = (fileContents) => {
-    const path = join(budibaseTempDir(), uuid());
-    fs.writeFileSync(path, fileContents);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), uuid());
+    fs_1.default.writeFileSync(path, fileContents);
     return path;
 };
 exports.storeTempFile = storeTempFile;
@@ -108,7 +108,7 @@ exports.storeTempFile = storeTempFile;
  */
 const stringToFileStream = (contents) => {
     const path = (0, exports.storeTempFile)(contents);
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.stringToFileStream = stringToFileStream;
 /**
@@ -117,7 +117,7 @@ exports.stringToFileStream = stringToFileStream;
  */
 const sendTempFile = (fileContents) => {
     const path = (0, exports.storeTempFile)(fileContents);
-    return fs.createReadStream(path);
+    return fs_1.default.createReadStream(path);
 };
 exports.sendTempFile = sendTempFile;
 /**
@@ -125,17 +125,18 @@ exports.sendTempFile = sendTempFile;
  * allows a centralised location to check logic is all good.
  */
 const readFileSync = (filepath, options = "utf8") => {
-    return fs.readFileSync(filepath, options);
+    // @ts-ignore
+    return fs_1.default.readFileSync(filepath, options);
 };
 exports.readFileSync = readFileSync;
 const createTempFolder = (item) => {
-    const path = join(budibaseTempDir(), item);
+    const path = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), item);
     try {
         // remove old tmp directories automatically - don't combine
-        if (fs.existsSync(path)) {
-            fs.rmSync(path, { recursive: true, force: true });
+        if (fs_1.default.existsSync(path)) {
+            fs_1.default.rmSync(path, { recursive: true, force: true });
         }
-        fs.mkdirSync(path);
+        fs_1.default.mkdirSync(path);
     }
     catch (err) {
         throw new Error(`Path cannot be created: ${err.message}`);
@@ -154,13 +155,14 @@ exports.extractTarball = extractTarball;
  * Find for a file recursively from start path applying filter, return first match
  */
 const findFileRec = (startPath, filter) => {
-    if (!fs.existsSync(startPath)) {
+    if (!fs_1.default.existsSync(startPath)) {
         return;
     }
-    const files = fs.readdirSync(startPath);
+    const files = fs_1.default.readdirSync(startPath);
     for (let i = 0, len = files.length; i < len; i++) {
-        const filename = join(startPath, files[i]);
-        const stat = fs.lstatSync(filename);
+        // @ts-ignore
+        const filename = (0, path_1.join)(startPath, files[i]);
+        const stat = fs_1.default.lstatSync(filename);
         if (stat.isDirectory()) {
             return (0, exports.findFileRec)(filename, filter);
         }
@@ -174,9 +176,9 @@ exports.findFileRec = findFileRec;
  * Remove a folder which is not empty from the file system
  */
 const deleteFolderFileSystem = (path) => {
-    if (!fs.existsSync(path)) {
+    if (!fs_1.default.existsSync(path)) {
         return;
     }
-    fs.rmSync(path, { recursive: true, force: true });
+    fs_1.default.rmSync(path, { recursive: true, force: true });
 };
 exports.deleteFolderFileSystem = deleteFolderFileSystem;

package/dist/utilities/fileSystem/plugin.js

@@ -8,18 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.getDatasourcePlugin = exports.getPluginMetadata = void 0;
-const { budibaseTempDir } = require("../budibaseDir");
-const fs = require("fs");
-const { join } = require("path");
+const budibaseDir_1 = require("../budibaseDir");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const backend_core_1 = require("@budibase/backend-core");
-const DATASOURCE_PATH = join(budibaseTempDir(), "datasource");
+const DATASOURCE_PATH = (0, path_1.join)((0, budibaseDir_1.budibaseTempDir)(), "datasource");
 const getPluginMetadata = (path) => __awaiter(void 0, void 0, void 0, function* () {
     let metadata = {};
     try {
-        const pkg = fs.readFileSync(join(path, "package.json"), "utf8");
-        const schema = fs.readFileSync(join(path, "schema.json"), "utf8");
+        const pkg = fs_1.default.readFileSync((0, path_1.join)(path, "package.json"), "utf8");
+        const schema = fs_1.default.readFileSync((0, path_1.join)(path, "schema.json"), "utf8");
         metadata.schema = JSON.parse(schema);
         metadata.package = JSON.parse(pkg);
         if (!metadata.package.name ||
@@ -37,13 +40,13 @@ exports.getPluginMetadata = getPluginMetadata;
 const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const hash = (_a = plugin.schema) === null || _a === void 0 ? void 0 : _a.hash;
-    if (!fs.existsSync(DATASOURCE_PATH)) {
-        fs.mkdirSync(DATASOURCE_PATH);
+    if (!fs_1.default.existsSync(DATASOURCE_PATH)) {
+        fs_1.default.mkdirSync(DATASOURCE_PATH);
     }
-    const filename = join(DATASOURCE_PATH, plugin.name);
+    const filename = (0, path_1.join)(DATASOURCE_PATH, plugin.name);
     const metadataName = `${filename}.bbmetadata`;
-    if (fs.existsSync(filename)) {
-        const currentHash = fs.readFileSync(metadataName, "utf8");
+    if (fs_1.default.existsSync(filename)) {
+        const currentHash = fs_1.default.readFileSync(metadataName, "utf8");
         // if hash is the same return the file, otherwise remove it and re-download
         if (currentHash === hash) {
             return require(filename);
@@ -51,13 +54,13 @@ const getDatasourcePlugin = (plugin) => __awaiter(void 0, void 0, void 0, functi
         else {
             console.log(`Updating plugin: ${plugin.name}`);
             delete require.cache[require.resolve(filename)];
-            fs.unlinkSync(filename);
+            fs_1.default.unlinkSync(filename);
         }
     }
     const pluginKey = backend_core_1.objectStore.getPluginJSKey(plugin);
     const pluginJs = yield backend_core_1.objectStore.retrieve(backend_core_1.objectStore.ObjectStoreBuckets.PLUGINS, pluginKey);
-    fs.writeFileSync(filename, pluginJs);
-    fs.writeFileSync(metadataName, hash);
+    fs_1.default.writeFileSync(filename, pluginJs);
+    fs_1.default.writeFileSync(metadataName, hash);
     return require(filename);
 });
 exports.getDatasourcePlugin = getDatasourcePlugin;

package/dist/utilities/fileSystem/template.js

@@ -8,10 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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.downloadTemplate = exports.getTemplateStream = void 0;
-const fs = require("fs");
-const { join } = require("path");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
 const constants_1 = require("../../constants");
 const backend_core_1 = require("@budibase/backend-core");
 /**
@@ -21,12 +24,12 @@ const backend_core_1 = require("@budibase/backend-core");
  */
 const getTemplateStream = (template) => __awaiter(void 0, void 0, void 0, function* () {
     if (template.file) {
-        return fs.createReadStream(template.file.path);
+        return fs_1.default.createReadStream(template.file.path);
     }
     else {
         const [type, name] = template.key.split("/");
         const tmpPath = yield (0, exports.downloadTemplate)(type, name);
-        return fs.createReadStream(join(tmpPath, name, "db", "dump.txt"));
+        return fs_1.default.createReadStream((0, path_1.join)(tmpPath, name, "db", "dump.txt"));
     }
 });
 exports.getTemplateStream = getTemplateStream;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.2.12-alpha.43",
+  "version": "2.2.12-alpha.45",
   "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.43",
-    "@budibase/client": "2.2.12-alpha.43",
-    "@budibase/pro": "2.2.12-alpha.42",
-    "@budibase/string-templates": "2.2.12-alpha.43",
-    "@budibase/types": "2.2.12-alpha.43",
+    "@budibase/backend-core": "2.2.12-alpha.45",
+    "@budibase/client": "2.2.12-alpha.45",
+    "@budibase/pro": "2.2.12-alpha.44",
+    "@budibase/string-templates": "2.2.12-alpha.45",
+    "@budibase/types": "2.2.12-alpha.45",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -169,5 +169,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "b15dc542e352e796912be022f778ea931b0cedbe"
+  "gitHead": "93274fcdf05bf53c3bbe47d3bf3297912c9c56d0"
 }

package/scripts/dev/manage.js

@@ -29,6 +29,7 @@ async function init() {
       ACCOUNT_PORTAL_URL: "http://localhost:10001",
       ACCOUNT_PORTAL_API_KEY: "budibase",
       JWT_SECRET: "testsecret",
+      ENCRYPTION_KEY: "testsecret",
       REDIS_PASSWORD: "budibase",
       MINIO_ACCESS_KEY: "budibase",
       MINIO_SECRET_KEY: "budibase",

package/src/api/controllers/application.ts

@@ -112,12 +112,11 @@ function checkAppName(
   }
 }
 
-async function createInstance(template: any, includeSampleData: boolean) {
-  const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
-  const baseAppId = generateAppID(tenantId)
-  const appId = generateDevAppID(baseAppId)
-  await context.updateAppId(appId)
-
+async function createInstance(
+  appId: string,
+  template: any,
+  includeSampleData: boolean
+) {
   const db = context.getAppDB()
   await db.put({
     _id: "_design/database",
@@ -250,82 +249,90 @@ async function performAppCreate(ctx: BBContext) {
     instanceConfig.file = ctx.request.files.templateFile
   }
   const includeSampleData = isQsTrue(ctx.request.body.sampleData)
-  const instance = await createInstance(instanceConfig, includeSampleData)
-  const appId = instance._id
-  const db = context.getAppDB()
+  const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null
+  const appId = generateDevAppID(generateAppID(tenantId))
 
-  let newApplication: App = {
-    _id: DocumentType.APP_METADATA,
-    _rev: undefined,
-    appId,
-    type: "app",
-    version: packageJson.version,
-    componentLibraries: ["@budibase/standard-components"],
-    name: name,
-    url: url,
-    template: templateKey,
-    instance,
-    tenantId: tenancy.getTenantId(),
-    updatedAt: new Date().toISOString(),
-    createdAt: new Date().toISOString(),
-    status: AppStatus.DEV,
-    navigation: {
-      navigation: "Top",
-      title: name,
-      navWidth: "Large",
-      navBackground: "var(--spectrum-global-color-gray-100)",
-      links: [
-        {
-          url: "/home",
-          text: "Home",
-        },
-      ],
-    },
-    theme: "spectrum--light",
-    customTheme: {
-      buttonBorderRadius: "16px",
-    },
-  }
+  return await context.doInAppContext(appId, async () => {
+    const instance = await createInstance(
+      appId,
+      instanceConfig,
+      includeSampleData
+    )
+    const db = context.getAppDB()
 
-  // If we used a template or imported an app there will be an existing doc.
-  // Fetch and migrate some metadata from the existing app.
-  try {
-    const existing: App = await db.get(DocumentType.APP_METADATA)
-    const keys: (keyof App)[] = [
-      "_rev",
-      "navigation",
-      "theme",
-      "customTheme",
-      "icon",
-    ]
-    keys.forEach(key => {
-      if (existing[key]) {
-        // @ts-ignore
-        newApplication[key] = existing[key]
-      }
-    })
+    let newApplication: App = {
+      _id: DocumentType.APP_METADATA,
+      _rev: undefined,
+      appId,
+      type: "app",
+      version: packageJson.version,
+      componentLibraries: ["@budibase/standard-components"],
+      name: name,
+      url: url,
+      template: templateKey,
+      instance,
+      tenantId: tenancy.getTenantId(),
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+      status: AppStatus.DEV,
+      navigation: {
+        navigation: "Top",
+        title: name,
+        navWidth: "Large",
+        navBackground: "var(--spectrum-global-color-gray-100)",
+        links: [
+          {
+            url: "/home",
+            text: "Home",
+          },
+        ],
+      },
+      theme: "spectrum--light",
+      customTheme: {
+        buttonBorderRadius: "16px",
+      },
+    }
+
+    // If we used a template or imported an app there will be an existing doc.
+    // Fetch and migrate some metadata from the existing app.
+    try {
+      const existing: App = await db.get(DocumentType.APP_METADATA)
+      const keys: (keyof App)[] = [
+        "_rev",
+        "navigation",
+        "theme",
+        "customTheme",
+        "icon",
+      ]
+      keys.forEach(key => {
+        if (existing[key]) {
+          // @ts-ignore
+          newApplication[key] = existing[key]
+        }
+      })
 
-    // Migrate navigation settings and screens if required
-    if (existing) {
-      const navigation = await migrateAppNavigation()
-      if (navigation) {
-        newApplication.navigation = navigation
+      // Migrate navigation settings and screens if required
+      if (existing) {
+        const navigation = await migrateAppNavigation()
+        if (navigation) {
+          newApplication.navigation = navigation
+        }
       }
+    } catch (err) {
+      // Nothing to do
     }
-  } catch (err) {
-    // Nothing to do
-  }
 
-  const response = await db.put(newApplication, { force: true })
-  newApplication._rev = response.rev
+    const response = await db.put(newApplication, { force: true })
+    newApplication._rev = response.rev
 
-  /* istanbul ignore next */
-  if (!env.isTest()) {
-    await createApp(appId)
-  }
+    /* istanbul ignore next */
+    if (!env.isTest()) {
+      await createApp(appId)
+    }
 
-  await cache.app.invalidateAppMetadata(appId, newApplication)
-  return newApplication
+    await cache.app.invalidateAppMetadata(appId, newApplication)
+    return newApplication
+  })
 }
 
 async function creationEvents(request: any, app: App) {

package/src/api/controllers/datasource.ts

@@ -12,9 +12,11 @@ import { getIntegration } from "../../integrations"
 import { getDatasourceAndQuery } from "./row/utils"
 import { invalidateDynamicVariables } from "../../threads/utils"
 import { db as dbCore, context, events } from "@budibase/backend-core"
-import { BBContext, Datasource, Row } from "@budibase/types"
+import { UserCtx, Datasource, Row } from "@budibase/types"
+import sdk from "../../sdk"
+import { mergeConfigs } from "../../sdk/app/datasources/datasources"
 
-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx) {
   // Get internal tables
   const db = context.getAppDB()
   const internalTables = await db.allDocs(
@@ -43,25 +45,23 @@ export async function fetch(ctx: BBContext) {
     )
   ).rows.map(row => row.doc)
 
-  const allDatasources = [bbInternalDb, ...datasources]
+  const allDatasources: Datasource[] = await sdk.datasources.removeSecrets([
+    bbInternalDb,
+    ...datasources,
+  ])
 
   for (let datasource of allDatasources) {
-    if (datasource.config && datasource.config.auth) {
-      // strip secrets from response so they don't show in the network request
-      delete datasource.config.auth
-    }
-
     if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
-      datasource.entities = internal[datasource._id]
+      datasource.entities = internal[datasource._id!]
     }
   }
 
   ctx.body = [bbInternalDb, ...datasources]
 }
 
-export async function buildSchemaFromDb(ctx: BBContext) {
+export async function buildSchemaFromDb(ctx: UserCtx) {
   const db = context.getAppDB()
-  const datasource = await db.get(ctx.params.datasourceId)
+  const datasource = await sdk.datasources.get(ctx.params.datasourceId)
   const tablesFilter = ctx.request.body.tablesFilter
 
   let { tables, error } = await buildSchemaHelper(datasource)
@@ -146,11 +146,11 @@ async function invalidateVariables(
   await invalidateDynamicVariables(toInvalidate)
 }
 
-export async function update(ctx: BBContext) {
+export async function update(ctx: UserCtx) {
   const db = context.getAppDB()
   const datasourceId = ctx.params.datasourceId
-  let datasource = await db.get(datasourceId)
-  const auth = datasource.config.auth
+  let datasource = await sdk.datasources.get(datasourceId)
+  const auth = datasource.config?.auth
   await invalidateVariables(datasource, ctx.request.body)
 
   const isBudibaseSource = datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE
@@ -159,10 +159,13 @@ export async function update(ctx: BBContext) {
     ? { name: ctx.request.body?.name }
     : ctx.request.body
 
-  datasource = { ...datasource, ...dataSourceBody }
+  datasource = {
+    ...datasource,
+    ...sdk.datasources.mergeConfigs(dataSourceBody, datasource),
+  }
   if (auth && !ctx.request.body.auth) {
     // don't strip auth config from DB
-    datasource.config.auth = auth
+    datasource.config!.auth = auth
   }
 
   const response = await db.put(datasource)
@@ -179,10 +182,12 @@ export async function update(ctx: BBContext) {
 
   ctx.status = 200
   ctx.message = "Datasource saved successfully."
-  ctx.body = { datasource }
+  ctx.body = {
+    datasource: await sdk.datasources.removeSecretSingle(datasource),
+  }
 }
 
-export async function save(ctx: BBContext) {
+export async function save(ctx: UserCtx) {
   const db = context.getAppDB()
   const plus = ctx.request.body.datasource.plus
   const fetchSchema = ctx.request.body.fetchSchema
@@ -213,7 +218,9 @@ export async function save(ctx: BBContext) {
     }
   }
 
-  const response: any = { datasource }
+  const response: any = {
+    datasource: await sdk.datasources.removeSecretSingle(datasource),
+  }
   if (schemaError) {
     response.error = schemaError
   }
@@ -251,11 +258,11 @@ async function destroyInternalTablesBySourceId(datasourceId: string) {
   }
 }
 
-export async function destroy(ctx: BBContext) {
+export async function destroy(ctx: UserCtx) {
   const db = context.getAppDB()
   const datasourceId = ctx.params.datasourceId
 
-  const datasource = await db.get(datasourceId)
+  const datasource = await sdk.datasources.get(datasourceId)
   // Delete all queries for the datasource
 
   if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) {
@@ -279,13 +286,14 @@ export async function destroy(ctx: BBContext) {
   ctx.status = 200
 }
 
-export async function find(ctx: BBContext) {
+export async function find(ctx: UserCtx) {
   const database = context.getAppDB()
-  ctx.body = await database.get(ctx.params.datasourceId)
+  const datasource = await database.get(ctx.params.datasourceId)
+  ctx.body = await sdk.datasources.removeSecretSingle(datasource)
 }
 
 // dynamic query functionality
-export async function query(ctx: BBContext) {
+export async function query(ctx: UserCtx) {
   const queryJson = ctx.request.body
   try {
     ctx.body = await getDatasourceAndQuery(queryJson)
@@ -313,7 +321,7 @@ function updateError(error: any, newError: any, tables: string[]) {
 
 async function buildSchemaHelper(datasource: Datasource) {
   const Connector = await getIntegration(datasource.source)
-
+  datasource = await sdk.datasources.enrich(datasource)
   // Connect to the DB and build the schema
   const connector = new Connector(datasource.config)
   await connector.buildSchema(datasource._id, datasource.entities)