@budibase/server 2.7.6 → 2.7.7-alpha.0

package/dist/index.js

@@ -2782,23 +2782,23 @@ function init2(selectDb = DEFAULT_SELECT_DB) {
   CLIENTS[selectDb] = client3;
 }
 function waitForConnection(selectDb = DEFAULT_SELECT_DB) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     if (pickClient(selectDb) == null) {
       init2();
     } else if (CONNECTED) {
-      resolve2("");
+      resolve3("");
       return;
     }
     const interval = set(() => {
       if (CONNECTED) {
         clear(interval);
-        resolve2("");
+        resolve3("");
       }
     }, 500);
   });
 }
 function promisifyStream(stream3, client3) {
-  return new Promise((resolve2, reject) => {
+  return new Promise((resolve3, reject) => {
     const outputKeys = /* @__PURE__ */ new Set();
     stream3.on("data", (keys2) => {
       keys2.forEach((key) => {
@@ -2816,7 +2816,7 @@ function promisifyStream(stream3, client3) {
           getPromises.push(client3.get(key));
         }
         const jsonArray = await Promise.all(getPromises);
-        resolve2(
+        resolve3(
           keysArray.map((key) => ({
             key: removeDbPrefix(key),
             value: JSON.parse(jsonArray.shift())
@@ -4532,11 +4532,11 @@ var init_Replication = __esm({
         return Promise.all([closePouchDB(this.source), closePouchDB(this.target)]);
       }
       promisify(operation, opts = {}) {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           operation(this.target, opts).on("denied", function(err) {
             throw new Error(`Denied: Document failed to replicate ${err}`);
           }).on("complete", function(info) {
-            return resolve2(info);
+            return resolve3(info);
           }).on("error", function(err) {
             throw new Error(`Replication Error: ${err}`);
           });
@@ -5397,11 +5397,11 @@ function makeCacheItem(doc, lastWrite = null) {
   return { doc, lastWrite: lastWrite || Date.now() };
 }
 async function put(db2, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
-  const cache2 = await getCache();
+  const cache3 = await getCache();
   const key = doc._id;
   let cacheItem;
   if (key) {
-    cacheItem = await cache2.get(makeCacheKey(db2, key));
+    cacheItem = await cache3.get(makeCacheKey(db2, key));
   }
   const updateDb = !cacheItem || cacheItem.lastWrite < Date.now() - writeRateMs;
   let output = doc;
@@ -5439,30 +5439,30 @@ async function put(db2, doc, writeRateMs = DEFAULT_WRITE_RATE_MS) {
   }
   cacheItem = makeCacheItem(output, updateDb ? null : cacheItem == null ? void 0 : cacheItem.lastWrite);
   if (output._id) {
-    await cache2.store(makeCacheKey(db2, output._id), cacheItem);
+    await cache3.store(makeCacheKey(db2, output._id), cacheItem);
   }
   return { ok: true, id: output._id, rev: output._rev };
 }
 async function get2(db2, id) {
-  const cache2 = await getCache();
+  const cache3 = await getCache();
   const cacheKey = makeCacheKey(db2, id);
-  let cacheItem = await cache2.get(cacheKey);
+  let cacheItem = await cache3.get(cacheKey);
   if (!cacheItem) {
     const doc = await db2.get(id);
     cacheItem = makeCacheItem(doc);
-    await cache2.store(cacheKey, cacheItem);
+    await cache3.store(cacheKey, cacheItem);
   }
   return cacheItem.doc;
 }
 async function remove(db2, docOrId, rev) {
-  const cache2 = await getCache();
+  const cache3 = await getCache();
   if (!docOrId) {
     throw new Error("No ID/Rev provided.");
   }
   const id = typeof docOrId === "string" ? docOrId : docOrId._id;
   rev = typeof docOrId === "string" ? rev : docOrId._rev;
   try {
-    await cache2.delete(makeCacheKey(db2, id));
+    await cache3.delete(makeCacheKey(db2, id));
   } finally {
     await db2.remove(id, rev);
   }
@@ -6131,7 +6131,7 @@ function isClient(ctx) {
   return ctx.headers["x-budibase-type" /* TYPE */] === "client";
 }
 function timeout(timeMs) {
-  return new Promise((resolve2) => setTimeout(resolve2, timeMs));
+  return new Promise((resolve3) => setTimeout(resolve3, timeMs));
 }
 function isAudited(event) {
   return !!AuditedEventFriendlyName[event];
@@ -10060,8 +10060,8 @@ async function preAuth(passport2, ctx, next) {
     callbackUrl,
     ssoSaveUserNoOp
   );
-  if (!ctx.query.appId || !ctx.query.datasourceId) {
-    ctx.throw(400, "appId and datasourceId query params not present.");
+  if (!ctx.query.appId) {
+    ctx.throw(400, "appId query param not present.");
   }
   return passport2.authenticate(strategy, {
     scope: ["profile", "email", "https://www.googleapis.com/auth/spreadsheets"],
@@ -10081,7 +10081,7 @@ async function postAuth(passport2, ctx, next) {
         clientSecret: config.clientSecret,
         callbackURL: callbackUrl
       },
-      (accessToken, refreshToken, profile, done) => {
+      (accessToken, refreshToken, _profile, done) => {
         clearCookie(ctx, "budibase:datasourceauth" /* DatasourceAuth */);
         done(null, { accessToken, refreshToken });
       }
@@ -10089,22 +10089,14 @@ async function postAuth(passport2, ctx, next) {
     { successRedirect: "/", failureRedirect: "/error" },
     async (err, tokens) => {
       const baseUrl = `/builder/app/${authStateCookie.appId}/data`;
-      await doWithDB(authStateCookie.appId, async (db2) => {
-        let datasource2;
-        try {
-          datasource2 = await db2.get(authStateCookie.datasourceId);
-        } catch (err2) {
-          if (err2.status === 404) {
-            ctx.redirect(baseUrl);
-          }
-        }
-        if (!datasource2.config) {
-          datasource2.config = {};
+      const id = utils_exports2.newid();
+      await cache_exports.store(
+        `datasource:creation:${authStateCookie.appId}:google:${id}`,
+        {
+          tokens
         }
-        datasource2.config.auth = { type: "google", ...tokens };
-        await db2.put(datasource2);
-        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
-      });
+      );
+      ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
     }
   )(ctx, next);
 }
@@ -10114,9 +10106,9 @@ var init_google2 = __esm({
     init_google();
     init_constants2();
     init_utils5();
-    init_db5();
     init_configs3();
     init_sso2();
+    init_src2();
     GoogleStrategy2 = require("passport-google-oauth").OAuth2Strategy;
   }
 });
@@ -10838,12 +10830,12 @@ async function refreshOIDCAccessToken(chosenConfig, refreshToken) {
       return strategy._getOAuth2Client(enrichedConfig);
     }
   });
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     refresh.requestNewAccessToken(
       "oidc" /* OIDC */,
       refreshToken,
       (err, accessToken, refreshToken2, params2) => {
-        resolve2({ err, accessToken, refreshToken: refreshToken2, params: params2 });
+        resolve3({ err, accessToken, refreshToken: refreshToken2, params: params2 });
       }
     );
   });
@@ -10864,12 +10856,12 @@ async function refreshGoogleAccessToken(config, refreshToken) {
     );
   }
   refresh.use(strategy);
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     refresh.requestNewAccessToken(
       "google" /* GOOGLE */,
       refreshToken,
       (err, accessToken, refreshToken2, params2) => {
-        resolve2({ err, accessToken, refreshToken: refreshToken2, params: params2 });
+        resolve3({ err, accessToken, refreshToken: refreshToken2, params: params2 });
       }
     );
   });
@@ -12135,7 +12127,7 @@ var init_environment3 = __esm({
       isInThread: () => {
         return process.env.FORKED_PROCESS;
       },
-      TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH
+      TOP_LEVEL_PATH: process.env.TOP_LEVEL_PATH || process.env.SERVER_TOP_LEVEL_PATH
     };
     if (isDev2() && environment2.DISABLE_THREADING == null) {
       environment2._set("DISABLE_THREADING", "1");
@@ -12163,7 +12155,7 @@ var init_filesystem = __esm({
     import_tar = __toESM(require("tar"));
     init_environment3();
     uuid2 = require("uuid/v4");
-    TOP_LEVEL_PATH = environment_default2.TOP_LEVEL_PATH || (0, import_path5.join)(__dirname, "..", "..", "..");
+    TOP_LEVEL_PATH = environment_default2.TOP_LEVEL_PATH || (0, import_path5.resolve)((0, import_path5.join)(__dirname, "..", "..", ".."));
     init9 = () => {
       const tempDir = budibaseTempDir2();
       if (!import_fs4.default.existsSync(tempDir)) {
@@ -24198,7 +24190,7 @@ var init_datasource_bb_default = __esm({
 
 // src/utilities/index.ts
 function wait(ms) {
-  return new Promise((resolve2) => setTimeout(resolve2, ms));
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
 function removeFromArray(array, element) {
   const index2 = array.indexOf(element);
@@ -24499,7 +24491,7 @@ var init_threads = __esm({
       }
       run(job) {
         const timeout2 = this.timeoutMs;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           function fire(worker) {
             worker.execute(job, (err, response2) => {
               if (err && err.type === "TimeoutError") {
@@ -24507,7 +24499,7 @@ var init_threads = __esm({
               } else if (err) {
                 reject(err);
               } else {
-                resolve2(response2);
+                resolve3(response2);
               }
             });
           }
@@ -24521,15 +24513,15 @@ var init_threads = __esm({
         });
       }
       static stopThreads() {
-        return new Promise((resolve2) => {
+        return new Promise((resolve3) => {
           if (_Thread.workerRefs.length === 0) {
-            resolve2();
+            resolve3();
           }
           let count = 0;
           function complete() {
             count++;
             if (count >= _Thread.workerRefs.length) {
-              resolve2();
+              resolve3();
             }
           }
           for (let worker of _Thread.workerRefs) {
@@ -24847,22 +24839,22 @@ function threadSetup() {
   init10();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
-  const cache2 = await getClient3();
-  return cache2.get(makeVariableKey(queryId, variable));
+  const cache3 = await getClient3();
+  return cache3.get(makeVariableKey(queryId, variable));
 }
 async function invalidateDynamicVariables(cachedVars) {
-  const cache2 = await getClient3();
+  const cache3 = await getClient3();
   let promises = [];
   for (let variable of cachedVars) {
     promises.push(
-      cache2.delete(makeVariableKey(variable.queryId, variable.name))
+      cache3.delete(makeVariableKey(variable.queryId, variable.name))
     );
   }
   await Promise.all(promises);
 }
 async function storeDynamicVariable(queryId, variable, value) {
-  const cache2 = await getClient3();
-  await cache2.store(
+  const cache3 = await getClient3();
+  await cache3.store(
     makeVariableKey(queryId, variable),
     value,
     VARIABLE_TTL_SECONDS
@@ -26377,13 +26369,13 @@ var init_postgres = __esm({
       }
       closeConnection() {
         const pg = this;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           this.client.end((err) => {
             pg.open = false;
             if (err) {
               reject(err);
             } else {
-              resolve2();
+              resolve3();
             }
           });
         });
@@ -28134,7 +28126,7 @@ var init_s3 = __esm({
           Key: query3.key
         }).createReadStream();
         let csvError = false;
-        return new Promise((resolve2, reject) => {
+        return new Promise((resolve3, reject) => {
           stream3.on("error", (err) => {
             reject(err);
           });
@@ -28142,7 +28134,7 @@ var init_s3 = __esm({
             csvError = true;
           });
           stream3.on("finish", () => {
-            resolve2(response2);
+            resolve3(response2);
           });
         }).catch((err) => {
           if (csvError) {
@@ -29038,6 +29030,16 @@ var init_rest = __esm({
 });
 
 // src/integrations/googlesheets.ts
+async function setupCreationAuth(datasouce) {
+  if (datasouce.continueSetupId) {
+    const appId = context_exports.getAppId();
+    const tokens = await cache_exports.get(
+      `datasource:creation:${appId}:google:${datasouce.continueSetupId}`
+    );
+    datasouce.auth = tokens.tokens;
+    delete datasouce.continueSetupId;
+  }
+}
 var import_google_auth_library, import_google_spreadsheet, import_node_fetch10, ALLOWED_TYPES, SCHEMA12, GoogleSheetsIntegration, googlesheets_default;
 var init_googlesheets = __esm({
   "src/integrations/googlesheets.ts"() {
@@ -29075,7 +29077,7 @@ var init_googlesheets = __esm({
       },
       datasource: {
         spreadsheetId: {
-          display: "Google Sheet URL",
+          display: "Spreadsheet URL",
           type: "string" /* STRING */,
           required: true
         }
@@ -29145,6 +29147,7 @@ var init_googlesheets = __esm({
       }
       async testConnection() {
         try {
+          await setupCreationAuth(this.config);
           await this.connect();
           return { connected: true };
         } catch (e) {
@@ -34793,6 +34796,9 @@ async function save13(ctx) {
     datasource2.entities = tables;
     setDefaultDisplayColumns(datasource2);
   }
+  if (preSaveAction[datasource2.source]) {
+    await preSaveAction[datasource2.source](datasource2);
+  }
   const dbResp = await db2.put(datasource2);
   await events_exports.datasource.created(datasource2);
   datasource2._rev = dbResp.rev;
@@ -34871,6 +34877,7 @@ async function query(ctx) {
     ctx.throw(400, err);
   }
 }
+var preSaveAction;
 var init_datasource5 = __esm({
   "src/api/controllers/datasource.ts"() {
     init_utils9();
@@ -34880,8 +34887,15 @@ var init_datasource5 = __esm({
     init_utils24();
     init_utils18();
     init_src2();
+    init_src();
     init_sdk3();
     init_websockets();
+    init_googlesheets();
+    preSaveAction = {
+      ["GOOGLE_SHEETS" /* GOOGLE_SHEETS */]: async (datasource2) => {
+        await setupCreationAuth(datasource2.config);
+      }
+    };
   }
 });
 
@@ -37905,7 +37919,7 @@ function executeSynchronously(job) {
   if (!appId) {
     throw new Error("Unable to execute, event doesn't contain app ID.");
   }
-  const timeoutPromise = new Promise((resolve2, reject) => {
+  const timeoutPromise = new Promise((resolve3, reject) => {
     setTimeout(() => {
       reject(new Error("Timeout exceeded"));
     }, job.data.event.timeout || 12e3);
@@ -43314,7 +43328,7 @@ var init_static = __esm({
         };
         return;
       }
-      let builderPath = resolve(TOP_LEVEL_PATH, "new_design_ui");
+      let builderPath = join3(TOP_LEVEL_PATH, "new_design_ui");
       if (!import_fs15.default.existsSync(builderPath)) {
         import_fs15.default.mkdirSync(builderPath);
       }
@@ -43328,7 +43342,7 @@ var init_static = __esm({
       };
     };
     serveBuilder = async function(ctx) {
-      const builderPath = resolve(TOP_LEVEL_PATH, "builder");
+      const builderPath = join3(TOP_LEVEL_PATH, "builder");
       await send2(ctx, ctx.file, { root: builderPath });
     };
     uploadFile = async function(ctx) {