npm - @budibase/server - Versions diffs - 2.6.26 → 2.6.28-alpha.0 - Mend

@budibase/server 2.6.26 → 2.6.28-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/builder/assets/{index.9bd22774.js → index.9465fac4.js} +399 -399
package/builder/assets/{index.a86e2071.css → index.b33e8ad5.css} +1 -1
package/builder/index.html +2 -2
package/dist/automation.js +55 -35
package/dist/automation.js.map +3 -3
package/dist/index.js +60 -35
package/dist/index.js.map +3 -3
package/dist/query.js +32 -20
package/dist/query.js.map +3 -3
package/package.json +8 -8
package/src/api/controllers/datasource.ts +13 -1
package/src/integrations/googlesheets.ts +18 -2
package/src/websockets/builder.ts +4 -1

package/builder/index.html CHANGED Viewed

@@ -8,8 +8,8 @@
 	<link rel="preconnect" href="https://fonts.gstatic.com" />
 	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
 		rel="stylesheet" />
-  <script type="module" crossorigin src="/builder/assets/index.9bd22774.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.a86e2071.css">
+  <script type="module" crossorigin src="/builder/assets/index.9465fac4.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.b33e8ad5.css">
 </head>
 <body id="app">

package/dist/automation.js CHANGED Viewed

@@ -229,6 +229,7 @@ var init_event = __esm({
       Event6["USER_PASSWORD_UPDATED"] = "user:password:updated";
       Event6["USER_PASSWORD_RESET_REQUESTED"] = "user:password:reset:requested";
       Event6["USER_PASSWORD_RESET"] = "user:password:reset";
+      Event6["USER_DATA_COLLABORATION"] = "user:data:collaboration";
       Event6["EMAIL_SMTP_CREATED"] = "email:smtp:created";
       Event6["EMAIL_SMTP_UPDATED"] = "email:smtp:updated";
       Event6["AUTH_SSO_CREATED"] = "auth:sso:created";
@@ -379,6 +380,7 @@ var init_event = __esm({
       ["user:password:force:reset" /* USER_PASSWORD_FORCE_RESET */]: void 0,
       ["user_group:onboarding_added" /* USER_GROUP_ONBOARDING */]: void 0,
       ["user:onboarding:complete" /* USER_ONBOARDING_COMPLETE */]: void 0,
+      ["user:data:collaboration" /* USER_DATA_COLLABORATION */]: void 0,
       // EMAIL
       ["email:smtp:created" /* EMAIL_SMTP_CREATED */]: `Email configuration created`,
       ["email:smtp:updated" /* EMAIL_SMTP_UPDATED */]: `Email configuration updated`,
@@ -5355,11 +5357,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;
@@ -5397,30 +5399,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);
   }
@@ -8099,6 +8101,12 @@ async function passwordReset(user) {
   };
   await publishEvent("user:password:reset" /* USER_PASSWORD_RESET */, properties);
 }
+async function dataCollaboration(users2) {
+  const properties = {
+    users: users2
+  };
+  await publishEvent("user:data:collaboration" /* USER_DATA_COLLABORATION */, properties);
+}
 var user_default;
 var init_user9 = __esm({
   "../backend-core/src/events/publishers/user.ts"() {
@@ -8119,7 +8127,8 @@ var init_user9 = __esm({
       passwordForceReset,
       passwordUpdated,
       passwordResetRequested,
-      passwordReset
+      passwordReset,
+      dataCollaboration
     };
   }
 });
@@ -9772,8 +9781,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"],
@@ -9793,7 +9802,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 });
       }
@@ -9801,22 +9810,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);
 }
@@ -9826,9 +9827,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;
   }
 });
@@ -23802,9 +23803,20 @@ 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_fetch9, ALLOWED_TYPES, SCHEMA12, GoogleSheetsIntegration, googlesheets_default;
 var init_googlesheets = __esm({
   "src/integrations/googlesheets.ts"() {
+    "use strict";
     init_src();
     import_google_auth_library = require("google-auth-library");
     init_utils14();
@@ -23839,7 +23851,7 @@ var init_googlesheets = __esm({
       },
       datasource: {
         spreadsheetId: {
-          display: "Google Sheet URL",
+          display: "Spreadsheet URL",
           type: "string" /* STRING */,
           required: true
         }
@@ -23909,6 +23921,7 @@ var init_googlesheets = __esm({
       }
       async testConnection() {
         try {
+          await setupCreationAuth(this.config);
           await this.connect();
           return { connected: true };
         } catch (e) {
@@ -26880,22 +26893,22 @@ function threadSetup() {
   init8();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
-  const cache2 = await getClient2();
-  return cache2.get(makeVariableKey(queryId, variable));
+  const cache3 = await getClient2();
+  return cache3.get(makeVariableKey(queryId, variable));
 }
 async function invalidateDynamicVariables(cachedVars) {
-  const cache2 = await getClient2();
+  const cache3 = await getClient2();
   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 getClient2();
-  await cache2.store(
+  const cache3 = await getClient2();
+  await cache3.store(
     makeVariableKey(queryId, variable),
     value,
     VARIABLE_TTL_SECONDS
@@ -30673,8 +30686,15 @@ init_constants6();
 init_integrations2();
 init_utils20();
 init_src2();
+init_src();
 init_sdk3();
 init_websockets();
+init_googlesheets();
+var preSaveAction = {
+  ["GOOGLE_SHEETS" /* GOOGLE_SHEETS */]: async (datasource2) => {
+    await setupCreationAuth(datasource2.config);
+  }
+};
 // src/api/controllers/query/validation.ts
 init_src2();