fix: fix google sheets oauth config (#1625)

Because - google-sheet should be google-sheets This commit - fix google sheets oauth config
instill-ai · Nov 27, 2024 · 92734df · 92734df
1 parent d4c56a1
commit 92734df
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 8 deletions.
diff --git a/packages/toolkit/src/lib/integrations/core.ts b/packages/toolkit/src/lib/integrations/core.ts
@@ -98,10 +98,10 @@ export function getAuthHandler({
         },
       }),
       GoogleProvider({
-        id: "google-sheet",
-        clientId: String(process.env.INTEGRATION_GOOGLE_SHEET_CLIENT_ID),
+        id: "google-sheets",
+        clientId: String(process.env.INTEGRATION_GOOGLE_SHEETS_CLIENT_ID),
         clientSecret: String(
-          process.env.INTEGRATION_GOOGLE_SHEET_CLIENT_SECRET,
+          process.env.INTEGRATION_GOOGLE_SHEETS_CLIENT_SECRET,
         ),
         authorization: {
           url: "https://accounts.google.com/o/oauth2/auth",
@@ -174,6 +174,39 @@ export function getAuthHandler({
                 };
                 break;
               }
+              case "google-sheets": {
+                const identity = profile.email ?? profile.name;
+
+                if (!identity) {
+                  throw new Error(
+                    "Instill Integration Error: Google Sheets user not found, can't get the identity",
+                  );
+                }
+
+                const prefilledIntegrationConnectionId =
+                  getPrefilledOAuthIntegrationConnectionId({
+                    provider: "google-sheets",
+                    connectionIdentity: identity,
+                  });
+
+                payload = {
+                  integrationId: "google-sheets",
+                  method: "METHOD_OAUTH",
+                  setup: {
+                    token: account.access_token,
+                    "refresh-token": account.refresh_token,
+                  },
+                  namespaceId,
+                  id: prefilledIntegrationConnectionId,
+                  oAuthAccessDetails: {
+                    ...account,
+                    ...profile,
+                  },
+                  identity: identity,
+                  scopes: googleDriveScopes,
+                };
+                break;
+              }
               case "github": {
                 const identity = profile.login as string | undefined;
 

diff --git a/packages/toolkit/src/lib/integrations/types.ts b/packages/toolkit/src/lib/integrations/types.ts
@@ -9,6 +9,6 @@ export type OnOAuthCallback = (props: OnOAuthCallbackProps) => void;
 
 export type IntegrationProvider =
   | "google-drive"
-  | "google-sheet"
+  | "google-sheets"
   | "slack"
   | "github";
diff --git a/...toolkit/src/view/settings/integrations/connectable-integration/ConnectableIntegration.tsx b/...toolkit/src/view/settings/integrations/connectable-integration/ConnectableIntegration.tsx
@@ -94,8 +94,8 @@ export const ConnectableIntegration = ({
                 case "google-drive":
                   provider = "google-drive";
                   break;
-                case "google-sheet":
-                  provider = "google-sheet";
+                case "google-sheets":
+                  provider = "google-sheets";
                   break;
                 default:
                   break;

diff --git a/turbo.json b/turbo.json
@@ -37,8 +37,8 @@
     "INSTILL_API_VERSION",
     "INTEGRATION_GOOGLE_DRIVE_CLIENT_ID",
     "INTEGRATION_GOOGLE_DRIVE_CLIENT_SECRET",
-    "INTEGRATION_GOOGLE_SHEET_CLIENT_ID",
-    "INTEGRATION_GOOGLE_SHEET_CLIENT_SECRET",
+    "INTEGRATION_GOOGLE_SHEETS_CLIENT_ID",
+    "INTEGRATION_GOOGLE_SHEETS_CLIENT_SECRET",
     "INTEGRATION_GITHUB_CLIENT_ID",
     "INTEGRATION_GITHUB_CLIENT_SECRET",
     "INTEGRATION_SLACK_CLIENT_ID",