Merge remote-tracking branch 'origin/master' into feature/user-api

nextcloud_mcp_server/client/__init__.py

@@ -2,13 +2,13 @@ import logging
 import os
 
 from httpx import (
+    AsyncBaseTransport,
     AsyncClient,
+    AsyncHTTPTransport,
     Auth,
     BasicAuth,
     Request,
     Response,
-    AsyncBaseTransport,
-    AsyncHTTPTransport,
 )
 
 from ..controllers.notes_search import NotesSearchController
@@ -87,6 +87,23 @@ class NextcloudClient:
         # Pass username to constructor
         return cls(base_url=host, username=username, auth=BasicAuth(username, password))
 
+    @classmethod
+    def from_token(cls, base_url: str, token: str, username: str):
+        """Create NextcloudClient with OAuth bearer token.
+
+        Args:
+            base_url: Nextcloud base URL
+            token: OAuth access token
+            username: Nextcloud username
+
+        Returns:
+            NextcloudClient configured with bearer token authentication
+        """
+        from ..auth import BearerAuth
+
+        logger.info(f"Creating NC Client for user '{username}' using OAuth token")
+        return cls(base_url=base_url, username=username, auth=BearerAuth(token))
+
     async def capabilities(self):
         response = await self._client.get(
             "/ocs/v2.php/cloud/capabilities",

nextcloud_mcp_server/client/base.py

@@ -1,11 +1,11 @@
 """Base client for Nextcloud operations with shared authentication."""
 
 import logging
-from abc import ABC
-
-from functools import wraps
 import time
-from httpx import HTTPStatusError, codes, RequestError, AsyncClient
+from abc import ABC
+from functools import wraps
+
+from httpx import AsyncClient, HTTPStatusError, RequestError, codes
 
 logger = logging.getLogger(__name__)
 

nextcloud_mcp_server/client/contacts.py

@@ -1,10 +1,12 @@
 """CardDAV client for NextCloud contacts operations."""
 
 import logging
-from .base import BaseNextcloudClient
 import xml.etree.ElementTree as ET
+
 from pythonvCard4.vcard import Contact
 
+from .base import BaseNextcloudClient
+
 logger = logging.getLogger(__name__)
 
 

nextcloud_mcp_server/client/deck.py

@@ -1,16 +1,16 @@
-from typing import List, Optional, Dict, Any
+from typing import Any, Dict, List, Optional
 
 from nextcloud_mcp_server.client.base import BaseNextcloudClient
 from nextcloud_mcp_server.models.deck import (
-    DeckBoard,
-    DeckStack,
-    DeckCard,
-    DeckLabel,
     DeckACL,
     DeckAttachment,
+    DeckBoard,
+    DeckCard,
     DeckComment,
-    DeckSession,
     DeckConfig,
+    DeckLabel,
+    DeckSession,
+    DeckStack,
 )