@budibase/server 2.7.6 → 2.7.7-alpha.0

package/dist/query.js

@@ -2747,23 +2747,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) => {
@@ -2781,7 +2781,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())
@@ -5624,7 +5624,7 @@ var environment = {
   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 (isDev() && environment.DISABLE_THREADING == null) {
   environment._set("DISABLE_THREADING", "1");
@@ -6741,11 +6741,11 @@ var Replication = class {
     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}`);
       });
@@ -8204,7 +8204,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];
@@ -11478,8 +11478,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"],
@@ -11499,7 +11499,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 });
       }
@@ -11507,22 +11507,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 (db) => {
-        let datasource2;
-        try {
-          datasource2 = await db.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 db.put(datasource2);
-        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
-      });
+      );
+      ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
     }
   )(ctx, next);
 }
@@ -12118,12 +12110,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 });
       }
     );
   });
@@ -12144,12 +12136,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 });
       }
     );
   });
@@ -14246,13 +14238,13 @@ var PostgresIntegration = class extends sql_default {
   }
   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();
         }
       });
     });
@@ -15964,7 +15956,7 @@ var S3Integration = class {
       Key: query.key
     }).createReadStream();
     let csvError = false;
-    return new Promise((resolve2, reject) => {
+    return new Promise((resolve3, reject) => {
       stream3.on("error", (err) => {
         reject(err);
       });
@@ -15972,7 +15964,7 @@ var S3Integration = class {
         csvError = true;
       });
       stream3.on("finish", () => {
-        resolve2(response);
+        resolve3(response);
       });
     }).catch((err) => {
       if (csvError) {
@@ -17260,7 +17252,7 @@ var SCHEMA12 = {
   },
   datasource: {
     spreadsheetId: {
-      display: "Google Sheet URL",
+      display: "Spreadsheet URL",
       type: "string" /* STRING */,
       required: true
     }
@@ -17330,6 +17322,7 @@ var GoogleSheetsIntegration = class {
   }
   async testConnection() {
     try {
+      await setupCreationAuth(this.config);
       await this.connect();
       return { connected: true };
     } catch (e) {
@@ -17691,6 +17684,16 @@ var GoogleSheetsIntegration = class {
     }
   }
 };
+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 googlesheets_default = {
   schema: SCHEMA12,
   integration: GoogleSheetsIntegration
@@ -18476,7 +18479,7 @@ var import_fs4 = __toESM(require("fs"));
 var import_path4 = require("path");
 var import_tar = __toESM(require("tar"));
 var uuid2 = require("uuid/v4");
-var TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path4.join)(__dirname, "..", "..", "..");
+var TOP_LEVEL_PATH = environment_default.TOP_LEVEL_PATH || (0, import_path4.resolve)((0, import_path4.join)(__dirname, "..", "..", ".."));
 var streamFile = (path2) => {
   return import_fs4.default.createReadStream(path2);
 };