fix (integrations): added tool descriptions in connect modals

fix: gsheet whatsapp number issue and description

Author: itsskofficial

src/client/app/integrations/page.js

@@ -1,3 +1,4 @@
+// src/client/app/integrations/page.js
 "use client"
 
 import React, { useState, useEffect, useCallback, useMemo, useRef } from "react"
@@ -59,6 +60,7 @@ import {
 import { Tooltip } from "react-tooltip"
 import ModalDialog from "@components/ModalDialog"
 import { useRouter } from "next/navigation"
+import { INTEGRATION_CAPABILITIES } from "@utils/integration-capabilities"
 
 const integrationColorIcons = {
 	gmail: IconMail,
@@ -86,7 +88,14 @@ const integrationColorIcons = {
 
 const IconPlaceholder = IconSettingsCog
 
-const PRO_ONLY_INTEGRATIONS = ["notion", "github", "slack", "discord", "trello", "whatsapp"]
+const PRO_ONLY_INTEGRATIONS = [
+	"notion",
+	"github",
+	"slack",
+	"discord",
+	"trello",
+	"whatsapp"
+]
 
 const proPlanFeatures = [
 	{ name: "Text Chat", limit: "100 messages per day" },
@@ -797,7 +806,8 @@ const IntegrationsPage = () => {
 	const [activeCategory, setActiveCategory] = useState("Most Popular")
 	const [selectedIntegration, setSelectedIntegration] = useState(null)
 	const [activeManualIntegration, setActiveManualIntegration] = useState(null)
-	const [isWhatsAppDisclaimerOpen, setIsWhatsAppDisclaimerOpen] = useState(false)
+	const [isWhatsAppDisclaimerOpen, setIsWhatsAppDisclaimerOpen] =
+		useState(false)
 	const [isWhatsAppQRModalOpen, setIsWhatsAppQRModalOpen] = useState(false)
 	const [sparkleTrigger, setSparkleTrigger] = useState(0)
 	const [privacyModalService, setPrivacyModalService] = useState(null)
@@ -1349,6 +1359,9 @@ const IntegrationsPage = () => {
 		(integration) => {
 			const Icon =
 				integrationColorIcons[integration.name] || IconPlaceholder
+			const capabilities =
+				INTEGRATION_CAPABILITIES[integration.name] ||
+				"Capabilities for this integration will be detailed here soon."
 			return (
 				<MorphingDialogContent className="pointer-events-auto relative flex h-auto w-full flex-col overflow-hidden border border-neutral-700 bg-neutral-900 sm:w-[600px] rounded-2xl">
 					<BorderTrail className="bg-brand-orange" />
@@ -1369,9 +1382,15 @@ const IntegrationsPage = () => {
 							</div>
 						</div>
 						<MorphingDialogDescription>
-							<p className="text-sm sm:text-base text-neutral-300 mb-6">
-								{integration.description}
-							</p>
+							<div className="bg-neutral-800/50 p-4 rounded-lg border border-neutral-700/50 mb-6">
+								<h4 className="font-semibold text-white mb-2">
+									What I can do with{" "}
+									{integration.display_name}:
+								</h4>
+								<p className="text-sm text-neutral-300 leading-relaxed">
+									{capabilities}
+								</p>
+							</div>
 							{["gmail", "gcalendar"].includes(
 								integration.name
 							) && (
@@ -1411,11 +1430,12 @@ const IntegrationsPage = () => {
 										onClick={async (e) => {
 											e.stopPropagation()
 											if (
-												integration.name ===
-												"whatsapp"
+												integration.name === "whatsapp"
 											) {
 												// Show disclaimer first
-												setIsWhatsAppDisclaimerOpen(true)
+												setIsWhatsAppDisclaimerOpen(
+													true
+												)
 											} else if (
 												integration.auth_type ===
 												"composio"
@@ -1628,4 +1648,4 @@ const IntegrationsPage = () => {
 	)
 }
 
-export default IntegrationsPage
+export default IntegrationsPage

src/client/app/onboarding/page.js

@@ -177,7 +177,7 @@ const questions = [
 	{
 		id: "whatsapp_notifications_number",
 		question:
-			"If you'd like to receive them, please enter your number with the country code. Otherwise, just press Enter to skip.",
+			"If you'd like to enable this, please enter your number with the country code. Otherwise, just press Enter to skip.",
 		type: "text-input",
 		required: false,
 		placeholder: "+14155552671",
@@ -191,7 +191,7 @@ const sentientComments = [
 	"Perfect. Now, to help with local info like weather and places...",
 	"This helps me understand your professional goals and context.",
 	"And when you're not working? Tell me about your hobbies.",
-	"One last thing. I can send you important updates on WhatsApp. We are in the process of getting an official number for Sentient. Until then, notifications will be sent via our co-founder Sarthak's number (+91827507823).",
+	"One last thing. I can send you important notifications, task updates, and reminders on WhatsApp. We're in the process of getting an official number, so for now, messages will come from our co-founder Sarthak (+91827507823), who may also occasionally reach out for feedback.",
 	"Awesome! That's all I need. Let's get you set up."
 ]
 

src/client/app/settings/page.js

@@ -224,16 +224,12 @@ const WhatsAppSettings = () => {
 				WhatsApp Notifications
 			</h2>
 			<p className="text-neutral-400 mb-6">
-				Receive important system notifications on WhatsApp.
+				Receive important notifications, task updates, and reminders on WhatsApp.
 			</p>
 			<div className="bg-neutral-900/50 p-6 rounded-2xl border border-neutral-800">
 				<div className="space-y-4">
 					<p className="text-neutral-400 text-sm">
-						Receive important notifications on WhatsApp. We are in
-						the process of getting an official number for Sentient.
-						Until then, notifications will be sent via our
-						co-founder Sarthak's number (+91827507823). Please enter
-						your number with the country code.
+						Receive important notifications, task updates, and reminders on WhatsApp. We're in the process of getting an official number, so for now, messages will come from our co-founder Sarthak (+91827507823), who may also occasionally reach out for feedback. Please enter your number with the country code.
 					</p>
 					{isNotifLoading ? (
 						<div className="flex justify-center mt-4">

src/client/jsconfig.json

@@ -3,7 +3,8 @@
 		"paths": {
 			"@*": ["./*"],
 			"@components/*": ["./components/*"],
-			"@hooks/*": ["./hooks/*"]
+			"@hooks/*": ["./hooks/*"],
+			"@utils/*": ["./utils/*"]
 		}
 	}
 }

src/client/utils/integration-capabilities.js

@@ -55,7 +55,8 @@ async def _validate_token_and_get_payload(self, token: str) -> dict:
                 permissions = AUTH0_SCOPE.split() if AUTH0_SCOPE else []
                 return {
                     "sub": "self-hosted-user",
-                    "permissions": permissions
+                    "permissions": permissions,
+                    "email": "selfhost@example.com" # Add a dummy email
                 }
             else:
                 raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid self-host token")
@@ -135,6 +136,11 @@ async def get_decoded_payload_with_claims(self, token: str = Depends(oauth2_sche
         if ENVIRONMENT == "selfhost": plan = "selfhost"
         elif "Pro" in payload.get(f"{AUTH0_NAMESPACE}/roles", []): plan = "pro"
         payload["plan"] = plan
+
+        # Add the namespaced email to the top-level 'email' key for convenience
+        if AUTH0_NAMESPACE:
+            payload["email"] = payload.get(f"{AUTH0_NAMESPACE}/email")
+
         return payload
 
     async def ws_authenticate_with_data(self, websocket: WebSocket) -> Optional[Dict]:

src/server/main/auth/utils.py

@@ -7,6 +7,7 @@
 from main.auth.utils import PermissionChecker, AuthHelper
 from main.notifications.whatsapp_client import check_phone_number_exists
 from main.settings.models import WhatsAppMcpRequest, WhatsAppNotificationNumberRequest, ProfileUpdateRequest
+from main.settings.google_sheets_utils import update_contact_in_sheet
 
 logger = logging.getLogger(__name__)
 router = APIRouter(
@@ -82,8 +83,20 @@ async def get_whatsapp_mcp_number(
 @router.post("/whatsapp-notifications", summary="Set or Update WhatsApp number for notifications")
 async def set_whatsapp_notification_number(
     request: WhatsAppNotificationNumberRequest,
-    user_id: str = Depends(PermissionChecker(required_permissions=["write:config"]))
+    payload: dict = Depends(auth_helper.get_decoded_payload_with_claims)
 ):
+    # 1. First, ensure the user has the required permission from the token payload
+    required_permission = "write:config"
+    if required_permission not in payload.get("permissions", []):
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail=f"Missing required permission: {required_permission}"
+        )
+
+    # 2. Extract user_id and email directly from the validated token payload
+    user_id = payload.get("sub")
+    user_email = payload.get("email") # This is the reliable email from Auth0    
+    
     whatsapp_number = request.whatsapp_notifications_number.strip() if request.whatsapp_notifications_number else ""
     if not whatsapp_number:
         update_payload = {
@@ -110,15 +123,15 @@ async def set_whatsapp_notification_number(
         }
         await mongo_manager.update_user_profile(user_id, update_payload)
 
-        # --- NEW: Update Google Sheet ---
+        # 3. Update Google Sheet using the reliable email from the token
         try:
-            user_profile = await mongo_manager.get_user_profile(user_id)
-            user_email = user_profile.get("userData", {}).get("personalInfo", {}).get("email")
             if user_email:
                 await update_contact_in_sheet(user_email, whatsapp_number)
+            else:
+                logger.warning(f"Could not update Google Sheet for user {user_id} because no email was found in their token.")
         except Exception as e:
-            logger.error(f"Non-critical error: Failed to update Google Sheet for user {user_id} after setting WA number. Error: {e}")
-        # --- END NEW ---
+            logger.error(f"Non-critical error: Failed to update Google Sheet for user {user_id}. Error: {e}")
+        
         return JSONResponse(content={"message": "WhatsApp notification number updated successfully."})
 
     except ConnectionError as e:
@@ -165,4 +178,4 @@ async def update_profile_data(
         return JSONResponse(content={"message": "Profile updated successfully."})
     except Exception as e:
         logger.error(f"Error updating profile for user {user_id}: {e}", exc_info=True)
-        raise HTTPException(status_code=500, detail="An unexpected error occurred.")
+        raise HTTPException(status_code=500, detail="An unexpected error occurred.")