npm - @budibase/server - Versions diffs - 2.7.7-alpha.2 → 2.7.9 - Mend

@budibase/server 2.7.7-alpha.2 → 2.7.9

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 (17) hide show

package/builder/assets/{index.fbee8e8b.js → index.358319af.js} +364 -364
package/builder/assets/{index.b33e8ad5.css → index.a86e2071.css} +1 -1
package/builder/index.html +2 -2
package/dist/automation.js +42 -112
package/dist/automation.js.map +3 -3
package/dist/index.js +42 -116
package/dist/index.js.map +3 -3
package/dist/query.js +20 -24
package/dist/query.js.map +3 -3
package/package.json +8 -8
package/src/api/controllers/datasource.ts +1 -13
package/src/automations/steps/sendSmtpEmail.ts +4 -55
package/src/automations/tests/sendSmtpEmail.spec.js +71 -0
package/src/integrations/googlesheets.ts +2 -18
package/src/sdk/app/datasources/datasources.ts +1 -1
package/src/utilities/workerRequests.ts +9 -20
package/src/automations/tests/sendSmtpEmail.spec.ts +0 -74

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.fbee8e8b.js"></script>
-  <link rel="stylesheet" href="/builder/assets/index.b33e8ad5.css">
+  <script type="module" crossorigin src="/builder/assets/index.358319af.js"></script>
+  <link rel="stylesheet" href="/builder/assets/index.a86e2071.css">
 </head>
 <body id="app">

package/dist/automation.js CHANGED Viewed

@@ -946,7 +946,6 @@ var init_automation2 = __esm({
       AutomationIOType2["NUMBER"] = "number";
       AutomationIOType2["ARRAY"] = "array";
       AutomationIOType2["JSON"] = "json";
-      AutomationIOType2["DATE"] = "date";
       return AutomationIOType2;
     })(AutomationIOType || {});
     AutomationCustomIOType = /* @__PURE__ */ ((AutomationCustomIOType2) => {
@@ -5358,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 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;
@@ -5400,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 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);
   }
@@ -9782,8 +9781,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"],
@@ -9803,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 });
       }
@@ -9811,14 +9810,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);
 }
@@ -9827,9 +9834,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;
   }
@@ -23804,16 +23811,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_fetch9, ALLOWED_TYPES, SCHEMA12, GoogleSheetsIntegration, googlesheets_default;
 var init_googlesheets = __esm({
   "src/integrations/googlesheets.ts"() {
@@ -23851,7 +23848,7 @@ var init_googlesheets = __esm({
       },
       datasource: {
         spreadsheetId: {
-          display: "Spreadsheet URL",
+          display: "Google Sheet URL",
           type: "string" /* STRING */,
           required: true
         }
@@ -23921,7 +23918,6 @@ var init_googlesheets = __esm({
       }
       async testConnection() {
         try {
-          await setupCreationAuth(this.config);
           await this.connect();
           return { connected: true };
         } catch (e) {
@@ -25304,7 +25300,7 @@ function mergeConfigs(update7, old) {
   }
   if (hasAuthConfigs(update7)) {
     const configs = update7.config.authConfigs;
-    const oldConfigs = (_a = old.config) == null ? void 0 : _a.authConfigs;
+    const oldConfigs = ((_a = old.config) == null ? void 0 : _a.authConfigs) || [];
     for (let config of configs) {
       if (config.type !== "basic" /* BASIC */) {
         continue;
@@ -26893,22 +26889,22 @@ function threadSetup() {
   init8();
 }
 async function checkCacheForDynamicVariable(queryId, variable) {
-  const cache3 = await getClient2();
-  return cache3.get(makeVariableKey(queryId, variable));
+  const cache2 = await getClient2();
+  return cache2.get(makeVariableKey(queryId, variable));
 }
 async function invalidateDynamicVariables(cachedVars) {
-  const cache3 = await getClient2();
+  const cache2 = await getClient2();
   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 getClient2();
-  await cache3.store(
+  const cache2 = await getClient2();
+  await cache2.store(
     makeVariableKey(queryId, variable),
     value,
     VARIABLE_TTL_SECONDS
@@ -27376,16 +27372,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_fetch10.default)(
     checkSlashesInUrl2(environment_default.WORKER_URL + `/api/global/email/send`),
     request(void 0, {
@@ -27398,8 +27385,7 @@ async function sendSmtpEmail({
         cc,
         bcc,
         purpose: "custom",
-        automation,
-        invite
+        automation
       }
     })
   );
@@ -27447,35 +27433,6 @@ var definition7 = {
         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"]
@@ -27496,41 +27453,21 @@ var definition7 = {
   }
 };
 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
@@ -30745,15 +30682,8 @@ 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();