Merge branch 'main' into WebsiteOct

Author: Duncid

blog/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@mdx-js/loader": "^2.3.0",
     "@mdx-js/react": "^2.3.0",
-    "@next/mdx": "^13.2.4",
+    "@next/mdx": "^13.5.4",
     "autoprefixer": "^10.4.7",
     "dd-trace": "^3.16.0",
     "clsx": "^1.2.0",
@@ -21,7 +21,7 @@
     "mdast-util-to-string": "^3.2.0",
     "mdx-annotations": "^0.1.3",
     "motion": "^10.15.5",
-    "next": "13.4.2",
+    "next": "13.5.4",
     "next-themes": "^0.2.1",
     "postcss-focus-visible": "^6.0.4",
     "react": "18.2.0",

connectors/package-lock.json

@@ -25,6 +25,7 @@
     "@types/lodash.memoize": "^4.1.7",
     "@types/minimist": "^1.2.2",
     "@types/uuid": "^9.0.2",
+    "axios": "^1.5.1",
     "body-parser": "^1.20.2",
     "dd-trace": "^3.16.0",
     "eventsource-parser": "^1.0.0",
@@ -47,6 +48,7 @@
     "pg-hstore": "^2.3.4",
     "pino": "^8.11.0",
     "pino-pretty": "^10.0.0",
+    "redis": "^4.6.10",
     "sequelize": "^6.31.0",
     "uuid": "^9.0.0"
   },

connectors/package.json

@@ -108,7 +108,7 @@ const _setBotEnabled = async (
     return apiError(req, res, {
       api_error: {
         type: "internal_server_error",
-        message: `An error occurred while enabling the bot: ${toggleRes.error}`,
+        message: `An error occurred while toggling the bot: ${toggleRes.error.message}`,
       },
       status_code: 500,
     });

connectors/src/api/bot_enabled.ts

@@ -78,6 +78,7 @@ const _getConnector = async (
     firstSuccessfulSyncTime: connector.firstSuccessfulSyncTime?.getTime(),
     firstSyncProgress,
     defaultNewResourcePermission: connector.defaultNewResourcePermission,
+    errorType: connector.errorType || undefined,
   });
 };
 

connectors/src/api/get_connector.ts

@@ -23,6 +23,7 @@ import { literal, Op } from "sequelize";
 
 import { dataSourceConfigFromConnector } from "@connectors/lib/api/data_source_config";
 import { dpdf2text } from "@connectors/lib/dpdf2text";
+import { ExternalOauthTokenError } from "@connectors/lib/error";
 import {
   Connector,
   GoogleDriveFiles,
@@ -861,6 +862,19 @@ export async function renewOneWebhook(webhookId: ModelId) {
         });
       }
     } catch (e) {
+      if (e instanceof ExternalOauthTokenError) {
+        logger.info(
+          {
+            error: e,
+            connectorId: wh.connectorId,
+            workspaceId: connector.workspaceId,
+            id: wh.id,
+          },
+          `Deleting webhook because the oauth token was revoked.`
+        );
+        await wh.destroy();
+        return;
+      }
       logger.error({ error: e }, `Failed to renew webhook`);
       const tags = [
         `connector_id:${wh.connectorId}`,

connectors/src/connectors/google_drive/temporal/activities.ts

@@ -53,6 +53,10 @@ export async function launchGoogleDriveFullSyncWorkflow(
       args: [connectorIdModelId, nangoConnectionId, dataSourceConfig],
       taskQueue: "google-queue",
       workflowId: workflowId,
+
+      memo: {
+        connectorId: connectorId,
+      },
     });
     logger.info(
       {

connectors/src/connectors/google_drive/temporal/client.ts

@@ -18,6 +18,7 @@ import {
   nango_client,
   nangoDeleteConnection,
 } from "@connectors/lib/nango_client";
+import { getAccessTokenFromNango } from "@connectors/lib/nango_helpers";
 import { Err, Ok, Result } from "@connectors/lib/result";
 import mainLogger from "@connectors/logger/logger";
 import { DataSourceConfig } from "@connectors/types/data_source_config";
@@ -44,10 +45,11 @@ export async function createNotionConnector(
     throw new Error("NANGO_NOTION_CONNECTOR_ID not set");
   }
 
-  const notionAccessToken = (await nango_client().getToken(
-    NANGO_NOTION_CONNECTOR_ID,
-    nangoConnectionId
-  )) as string;
+  const notionAccessToken = await getAccessTokenFromNango({
+    connectionId: nangoConnectionId,
+    integrationId: NANGO_NOTION_CONNECTOR_ID,
+    useCache: false,
+  });
 
   if (!validateAccessToken(notionAccessToken)) {
     return new Err(new Error("Notion access token is invalid"));

connectors/src/connectors/notion/index.ts

@@ -729,7 +729,9 @@ function parsePropertyText(
         ? property.title.map((t) => t.plain_text).join(" ")
         : null;
     case "rich_text":
-      return property.rich_text.map((t) => t.plain_text).join(" ");
+      return property.rich_text && property.rich_text.map
+        ? property.rich_text.map((t) => t.plain_text).join(" ")
+        : null;
     case "people":
       return property.people.length > 0
         ? property.people.map((p) => ("name" in p ? p.name : p.id)).join(", ")