Final Gdrive changes

Author: DK09876

package-lock.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
-    "@vectorize-io/vectorize-connect": "^0.2.3",
+    "@vectorize-io/vectorize-connect": "^0.2.4",
     "next": "15.2.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package.json

@@ -5,7 +5,7 @@ import {manageGDriveUser, VectorizeAPIConfig} from '@vectorize-io/vectorize-conn
 
 // Base URL for API endpoints
 const BASE_URL = process.env.VECTORIZE_API_URL;
-const API_PATH = '/api';
+const API_PATH = process.env.VECTORIZE_API_PATH;
 
 const ALLOWED_ORIGINS = [BASE_URL, 'https://api.vectorize.io/v1'].filter(Boolean); 
 // Adjust this array for all the origins you want to allow
@@ -92,6 +92,14 @@ export async function POST(request: NextRequest) {
     // Determine platformUrl - pass undefined if BASE_URL is not set
     const platformUrl = BASE_URL ? `${BASE_URL}${API_PATH}` : undefined;
 
+    console.log("Received request to add Google Drive user:", {
+        selectionData,
+        connectorId,
+        userId,
+        platformUrl,
+        config
+    });
+
     // Call the manageGDriveUser function from @vectorize-io/vectorize-connect
     const response = await manageGDriveUser(
         config,

src/app/api/add-google-drive-user/[connectorId]/route.ts

@@ -9,21 +9,20 @@ import { NextRequest, NextResponse } from "next/server";
  * - Calls the Vectorize API to get a one-time token
  * - Returns the token response to the client
  */
-export async function POST(request: NextRequest) {
+export async function GET(request: NextRequest) {
     try {
       // Get authentication details from environment variables or secure storage
       const apiKey = process.env.VECTORIZE_TOKEN;
       const organizationId = process.env.VECTORIZE_ORG;
-
-      const Base_URL = process.env.VECTORIZE_API_URL
-      const API_Path = process.env.VECTORIZE_API_PATH
 
-      
-      if (!apiKey || !organizationId || !Base_URL || !API_Path) {
+      if (!apiKey || !organizationId) {
         return NextResponse.json({ 
           error: 'Missing Vectorize API configuration' 
         }, { status: 500 });
       }
+
+      const Base_URL = process.env.VECTORIZE_API_URL
+      const API_Path = process.env.VECTORIZE_API_PATH
 
       // Configure the Vectorize API client
       const config: VectorizeAPIConfig = {
@@ -43,16 +42,23 @@ export async function POST(request: NextRequest) {
         }, { status: 400 });
     }
 
-    console.log("getting one time connector token for userId:", userId, "and connectorId:", connectorId);
+
+
+    console.log("getting one time connector token for userId:", userId, "and connectorId:", connectorId, "with URL" , `${Base_URL}${API_Path}`);
+
+      // Determine platformUrl - pass undefined if BASE_URL is not set
+      const platformUrl = Base_URL ? `${Base_URL}${API_Path}` : undefined;
 
       // Call Vectorize API to get the token
       const tokenResponse = await getOneTimeConnectorToken(
         config,
         userId,
         connectorId,
-        `${Base_URL}${API_Path}`,
+        platformUrl,
       );
 
+      console.log("Token response:", tokenResponse);
+
       // Return the token to the client
       return NextResponse.json(tokenResponse, { status: 200 });
 

src/app/api/get_One_Time_Vectorize_Connector_Token/route.ts

@@ -20,7 +20,7 @@ export async function GET(request: NextRequest) {
     clientId: process.env.GOOGLE_OAUTH_CLIENT_ID!,
     clientSecret: process.env.GOOGLE_OAUTH_CLIENT_SECRET!,
     apiKey: process.env.GOOGLE_API_KEY!,
-    redirectUri: "http://localhost:3001" + CALLBACK_PATH,
+    redirectUri: "http://localhost:3000" + CALLBACK_PATH,
   };
 
   try {

src/app/api/google-callback/route.ts

@@ -116,40 +116,58 @@ export default function Home() {
     }
   };
 
-  // Handle the redirect to Google Drive connect for Non-White Label
-  const handleNonWhiteLabelConnectGoogleDrive = async () => {
-    setIsLoading(true);
-    setError(null);
-    setSuccessMessage(null);
-    setAddedUserId(null);
-    
-    try {
-      const config = await fetch("/api/getVectorizeConfig")
+
+// Handle the redirect to Google Drive connect for Non-White Label
+const handleNonWhiteLabelConnectGoogleDrive = async () => {
+  setIsLoading(true);
+  setError(null);
+  setSuccessMessage(null);
+  setAddedUserId(null);
+  
+  try {
+    // Get Vectorize configuration
+    const config = await fetch("/api/getVectorizeConfig")
       .then(response => response.json())
       .then(data => {
         return {
           organizationId: data.organizationId,
           authorization: data.authorization
         }
       });
-      
-      // Only set platformUrl if BASE_URL exists
-      const platformUrl = BASE_URL? BASE_URL : undefined;
-      
-      // Call the redirect function (opens in a new tab)
-      await redirectToVectorizeGoogleDriveConnect(
-        `/api/get_One_Time_Vectorize_Connector_Token?userId=${"newNonWhiteLabelUser" + Math.floor(Math.random() * 1000)}&connectorId=${nonWhiteLabelConnectorId!}`, // Random username for demo purposes
-        config.organizationId,
-        platformUrl,
-      );
-    } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : 'Failed to connect to Google Drive';
-      setError(errorMessage);
-      console.error('Google Drive connection error:', err);
-    } finally {
-      setIsLoading(false);
+    
+    // Generate random user ID for demo purposes
+    const userId = "newNonWhiteLabelUser" + Math.floor(Math.random() * 1000);
+    
+    // Get one-time token from API
+    const tokenResponse = await fetch(`/api/get_One_Time_Vectorize_Connector_Token?userId=${userId}&connectorId=${nonWhiteLabelConnectorId!}`)
+      .then(response => {
+        if (!response.ok) {
+          throw new Error(`Failed to generate one-time token. Status: ${response.status}`);
+        }
+        return response.json();
+      });
+    
+    if (!tokenResponse || !tokenResponse.token) {
+      throw new Error('Failed to generate one-time token');
     }
-  };
+    
+    // Only set platformUrl if redirect_URI exists
+    const platformUrl = redirect_URI ? redirect_URI : undefined;
+    
+    // Call the redirect function with the obtained token
+    await redirectToVectorizeGoogleDriveConnect(
+      tokenResponse.token,
+      config.organizationId,
+      platformUrl
+    );
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : 'Failed to connect to Google Drive';
+    setError(errorMessage);
+    console.error('Google Drive connection error:', err);
+  } finally {
+    setIsLoading(false);
+  }
+};
 
   // Handle the redirect to Google Drive connect for White Label
   const handleWhiteLabelConnectGoogleDrive = async () => {
@@ -170,7 +188,7 @@ export default function Home() {
     });
 
     // Set to your redirectUri
-    const redirectUri = "http://localhost:3001" + CALLBACK_PATH;
+    const redirectUri = "http://localhost:3000" + CALLBACK_PATH;
 
     const config = {
       clientId: clientId,