Merge branch 'taylorwilsdon:main' into feat/tasks-manage-permission

auth/service_decorator.py

@@ -28,6 +28,7 @@ from auth.scopes import (
     GMAIL_MODIFY_SCOPE,
     GMAIL_LABELS_SCOPE,
     GMAIL_SETTINGS_BASIC_SCOPE,
+    DRIVE_SCOPE,
     DRIVE_READONLY_SCOPE,
     DRIVE_FILE_SCOPE,
     DOCS_READONLY_SCOPE,
@@ -426,6 +427,7 @@ SCOPE_GROUPS = {
     "gmail_labels": GMAIL_LABELS_SCOPE,
     "gmail_settings_basic": GMAIL_SETTINGS_BASIC_SCOPE,
     # Drive scopes
+    "drive": DRIVE_SCOPE,
     "drive_read": DRIVE_READONLY_SCOPE,
     "drive_file": DRIVE_FILE_SCOPE,
     # Docs scopes

gtasks/tasks_tools.py

@@ -26,7 +26,11 @@ LIST_TASKS_MAX_POSITION = "99999999999999999999"
 
 
 def _format_reauth_message(error: Exception, user_google_email: str) -> str:
-    base = f"API error: {error}. You might need to re-authenticate."
+    base = f"API error: {error}"
+
+    # Only suggest re-authentication for auth-related errors (401, 403)
+    if isinstance(error, HttpError) and error.resp.status in (401, 403):
+        base += ". You might need to re-authenticate."
         if is_oauth21_enabled():
             if is_external_oauth21_provider():
                 hint = (
@@ -45,6 +49,8 @@ def _format_reauth_message(error: Exception, user_google_email: str) -> str:
             )
         return f"{base} {hint}"
 
+    return base
+
 
 class StructuredTask:
     def __init__(self, task: Dict[str, str], is_placeholder_parent: bool) -> None: