@budibase/server 2.7.7-alpha.2 → 2.7.9

package/dist/index.js

@@ -838,7 +838,6 @@ var init_automation2 = __esm({
       AutomationIOType2["NUMBER"] = "number";
       AutomationIOType2["ARRAY"] = "array";
       AutomationIOType2["JSON"] = "json";
-      AutomationIOType2["DATE"] = "date";
       return AutomationIOType2;
     })(AutomationIOType || {});
     AutomationCustomIOType = /* @__PURE__ */ ((AutomationCustomIOType2) => {
@@ -5398,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 cache3 = await getCache();
+  const cache2 = await getCache();
   const key = doc._id;
   let cacheItem;
   if (key) {
-    cacheItem = await cache3.get(makeCacheKey(db2, key));
+    cacheItem = await cache2.get(makeCacheKey(db2, key));
   }
   const updateDb = !cacheItem || cacheItem.lastWrite < Date.now() - writeRateMs;
   let output = doc;
@@ -5440,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 cache3.store(makeCacheKey(db2, output._id), cacheItem);
+    await cache2.store(makeCacheKey(db2, output._id), cacheItem);
   }
   return { ok: true, id: output._id, rev: output._rev };
 }
 async function get2(db2, id) {
-  const cache3 = await getCache();
+  const cache2 = await getCache();
   const cacheKey = makeCacheKey(db2, id);
-  let cacheItem = await cache3.get(cacheKey);
+  let cacheItem = await cache2.get(cacheKey);
   if (!cacheItem) {
     const doc = await db2.get(id);
     cacheItem = makeCacheItem(doc);
-    await cache3.store(cacheKey, cacheItem);
+    await cache2.store(cacheKey, cacheItem);
   }
   return cacheItem.doc;
 }
 async function remove(db2, docOrId, rev) {
-  const cache3 = await getCache();
+  const cache2 = 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 cache3.delete(makeCacheKey(db2, id));
+    await cache2.delete(makeCacheKey(db2, id));
   } finally {
     await db2.remove(id, rev);
   }
@@ -10061,8 +10060,8 @@ async function preAuth(passport2, ctx, next) {
     callbackUrl,
     ssoSaveUserNoOp
   );
-  if (!ctx.query.appId) {
-    ctx.throw(400, "appId query param not present.");
+  if (!ctx.query.appId || !ctx.query.datasourceId) {
+    ctx.throw(400, "appId and datasourceId query params not present.");
   }
   return passport2.authenticate(strategy, {
     scope: ["profile", "email", "https://www.googleapis.com/auth/spreadsheets"],
@@ -10082,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 });
       }
@@ -10090,14 +10089,22 @@ async function postAuth(passport2, ctx, next) {
     { successRedirect: "/", failureRedirect: "/error" },
     async (err, tokens) => {
       const baseUrl = `/builder/app/${authStateCookie.appId}/data`;
-      const id = newid();
-      await store(
-        `datasource:creation:${authStateCookie.appId}:google:${id}`,
-        {
-          tokens
+      await doWithDB(authStateCookie.appId, async (db2) => {
+        let datasource2;
+        try {
+          datasource2 = await db2.get(authStateCookie.datasourceId);
+        } catch (err2) {
+          if (err2.status === 404) {
+            ctx.redirect(baseUrl);
+          }
         }
-      );
-      ctx.redirect(`${baseUrl}/new?continue_google_setup=${id}`);
+        if (!datasource2.config) {
+          datasource2.config = {};
+        }
+        datasource2.config.auth = { type: "google", ...tokens };
+        await db2.put(datasource2);
+        ctx.redirect(`${baseUrl}/datasource/${authStateCookie.datasourceId}`);
+      });
     }
   )(ctx, next);
 }
@@ -10106,9 +10113,9 @@ var init_google2 = __esm({
   "../backend-core/src/middleware/passport/datasource/google.ts"() {
     init_google();
     init_constants2();
-    init_configs3();
-    init_cache();
     init_utils5();
+    init_db5();
+    init_configs3();
     init_sso2();
     GoogleStrategy2 = require("passport-google-oauth").OAuth2Strategy;
   }
@@ -24334,16 +24341,7 @@ async function checkResponse(response2, errorMsg, { ctx } = {}) {
   }
   return response2.json();
 }
-async function sendSmtpEmail({
-  to,
-  from,
-  subject,
-  contents,
-  cc,
-  bcc,
-  automation,
-  invite
-}) {
+async function sendSmtpEmail(to, from, subject, contents, cc, bcc, automation) {
   const response2 = await (0, import_node_fetch8.default)(
     checkSlashesInUrl2(environment_default2.WORKER_URL + `/api/global/email/send`),
     request(void 0, {
@@ -24356,8 +24354,7 @@ async function sendSmtpEmail({
         cc,
         bcc,
         purpose: "custom",
-        automation,
-        invite
+        automation
       }
     })
   );
@@ -24850,22 +24847,22 @@ function threadSetup() {
   init10();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
-  const cache3 = await getClient3();
-  return cache3.get(makeVariableKey(queryId, variable));
+  const cache2 = await getClient3();
+  return cache2.get(makeVariableKey(queryId, variable));
 }
 async function invalidateDynamicVariables(cachedVars) {
-  const cache3 = await getClient3();
+  const cache2 = await getClient3();
   let promises = [];
   for (let variable of cachedVars) {
     promises.push(
-      cache3.delete(makeVariableKey(variable.queryId, variable.name))
+      cache2.delete(makeVariableKey(variable.queryId, variable.name))
     );
   }
   await Promise.all(promises);
 }
 async function storeDynamicVariable(queryId, variable, value) {
-  const cache3 = await getClient3();
-  await cache3.store(
+  const cache2 = await getClient3();
+  await cache2.store(
     makeVariableKey(queryId, variable),
     value,
     VARIABLE_TTL_SECONDS
@@ -29041,16 +29038,6 @@ 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"() {
@@ -29088,7 +29075,7 @@ var init_googlesheets = __esm({
       },
       datasource: {
         spreadsheetId: {
-          display: "Spreadsheet URL",
+          display: "Google Sheet URL",
           type: "string" /* STRING */,
           required: true
         }
@@ -29158,7 +29145,6 @@ var init_googlesheets = __esm({
       }
       async testConnection() {
         try {
-          await setupCreationAuth(this.config);
           await this.connect();
           return { connected: true };
         } catch (e) {
@@ -30541,7 +30527,7 @@ function mergeConfigs(update15, old) {
   }
   if (hasAuthConfigs(update15)) {
     const configs = update15.config.authConfigs;
-    const oldConfigs = (_a2 = old.config) == null ? void 0 : _a2.authConfigs;
+    const oldConfigs = ((_a2 = old.config) == null ? void 0 : _a2.authConfigs) || [];
     for (let config of configs) {
       if (config.type !== "basic" /* BASIC */) {
         continue;
@@ -32066,41 +32052,21 @@ var init_automationUtils = __esm({
 
 // src/automations/steps/sendSmtpEmail.ts
 async function run3({ inputs }) {
-  let {
-    to,
-    from,
-    subject,
-    contents,
-    cc,
-    bcc,
-    addInvite,
-    startTime,
-    endTime,
-    summary,
-    location,
-    url
-  } = inputs;
+  let { to, from, subject, contents, cc, bcc } = inputs;
   if (!contents) {
     contents = "<h1>No content</h1>";
   }
   to = to || void 0;
   try {
-    let response2 = await sendSmtpEmail({
+    let response2 = await sendSmtpEmail(
       to,
       from,
       subject,
       contents,
       cc,
       bcc,
-      automation: true,
-      invite: addInvite ? {
-        startTime,
-        endTime,
-        summary,
-        location,
-        url
-      } : void 0
-    });
+      true
+    );
     return {
       success: true,
       response: response2
@@ -32156,35 +32122,6 @@ var init_sendSmtpEmail = __esm({
             contents: {
               type: "string" /* STRING */,
               title: "HTML Contents"
-            },
-            addInvite: {
-              type: "boolean" /* BOOLEAN */,
-              title: "Add calendar invite"
-            },
-            startTime: {
-              type: "date" /* DATE */,
-              title: "Start Time",
-              dependsOn: "addInvite"
-            },
-            endTime: {
-              type: "date" /* DATE */,
-              title: "End Time",
-              dependsOn: "addInvite"
-            },
-            summary: {
-              type: "string" /* STRING */,
-              title: "Meeting Summary",
-              dependsOn: "addInvite"
-            },
-            location: {
-              type: "string" /* STRING */,
-              title: "Location",
-              dependsOn: "addInvite"
-            },
-            url: {
-              type: "string" /* STRING */,
-              title: "URL",
-              dependsOn: "addInvite"
             }
           },
           required: ["to", "from", "subject", "contents"]
@@ -34856,9 +34793,6 @@ 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;
@@ -34937,7 +34871,6 @@ async function query(ctx) {
     ctx.throw(400, err);
   }
 }
-var preSaveAction;
 var init_datasource5 = __esm({
   "src/api/controllers/datasource.ts"() {
     init_utils9();
@@ -34947,15 +34880,8 @@ 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);
-      }
-    };
   }
 });