admin/mcp-nextcloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Update client id/secret -> client_info

Browse Source
This commit is contained in:
Chris Coutinho
2025-10-24 19:47:49 +02:00
parent c9db6afb59
commit 01b43c96ba
1 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/conftest.py
+50 -36
View File
@@ -1211,7 +1211,7 @@ async def read_only_oauth_client_credentials(anyio_backend, oauth_callback_serve
authorization_endpoint = oidc_config.get("authorization_endpoint") authorization_endpoint = oidc_config.get("authorization_endpoint")
# Create JWT client with READ-ONLY scopes # Create JWT client with READ-ONLY scopes
client_id, client_secret = await _create_oauth_client_with_scopes( client_info = await _create_oauth_client_with_scopes(
callback_url=callback_url, callback_url=callback_url,
client_name="Test Client Read Only", client_name="Test Client Read Only",
allowed_scopes=DEFAULT_READ_SCOPES, allowed_scopes=DEFAULT_READ_SCOPES,
@@ -1219,8 +1219,8 @@ async def read_only_oauth_client_credentials(anyio_backend, oauth_callback_serve
) )
yield ( yield (
client_id, client_info.client_id,
client_secret, client_info.client_secret,
callback_url, callback_url,
token_endpoint, token_endpoint,
authorization_endpoint, authorization_endpoint,
@@ -1228,23 +1228,27 @@ async def read_only_oauth_client_credentials(anyio_backend, oauth_callback_serve
# Cleanup: Delete OAuth client from Nextcloud using RFC 7592 # Cleanup: Delete OAuth client from Nextcloud using RFC 7592
try: try:
logger.info(f"Cleaning up read-only OAuth client: {client_id[:16]}...") logger.info(
f"Cleaning up read-only OAuth client: {client_info.client_id[:16]}..."
)
success = await delete_client( success = await delete_client(
nextcloud_url=nextcloud_host, nextcloud_url=nextcloud_host,
client_id=client_id, client_id=client_info.client_id,
client_secret=client_secret, registration_access_token=client_info.registration_access_token,
client_secret=client_info.client_secret,
registration_client_uri=client_info.registration_client_uri,
) )
if success: if success:
logger.info( logger.info(
f"Successfully deleted read-only OAuth client: {client_id[:16]}..." f"Successfully deleted read-only OAuth client: {client_info.client_id[:16]}..."
) )
else: else:
logger.warning( logger.warning(
f"Failed to delete read-only OAuth client: {client_id[:16]}..." f"Failed to delete read-only OAuth client: {client_info.client_id[:16]}..."
) )
except Exception as e: except Exception as e:
logger.warning( logger.warning(
f"Error cleaning up read-only OAuth client {client_id[:16]}...: {e}" f"Error cleaning up read-only OAuth client {client_info.client_id[:16]}...: {e}"
) )
@@ -1276,7 +1280,7 @@ async def write_only_oauth_client_credentials(anyio_backend, oauth_callback_serv
authorization_endpoint = oidc_config.get("authorization_endpoint") authorization_endpoint = oidc_config.get("authorization_endpoint")
# Create JWT client with WRITE-ONLY scopes # Create JWT client with WRITE-ONLY scopes
client_id, client_secret = await _create_oauth_client_with_scopes( client_info = await _create_oauth_client_with_scopes(
callback_url=callback_url, callback_url=callback_url,
client_name="Test Client Write Only", client_name="Test Client Write Only",
allowed_scopes=DEFAULT_WRITE_SCOPES, allowed_scopes=DEFAULT_WRITE_SCOPES,
@@ -1284,8 +1288,8 @@ async def write_only_oauth_client_credentials(anyio_backend, oauth_callback_serv
) )
yield ( yield (
client_id, client_info.client_id,
client_secret, client_info.client_secret,
callback_url, callback_url,
token_endpoint, token_endpoint,
authorization_endpoint, authorization_endpoint,
@@ -1293,23 +1297,27 @@ async def write_only_oauth_client_credentials(anyio_backend, oauth_callback_serv
# Cleanup: Delete OAuth client from Nextcloud using RFC 7592 # Cleanup: Delete OAuth client from Nextcloud using RFC 7592
try: try:
logger.info(f"Cleaning up write-only OAuth client: {client_id[:16]}...") logger.info(
f"Cleaning up write-only OAuth client: {client_info.client_id[:16]}..."
)
success = await delete_client( success = await delete_client(
nextcloud_url=nextcloud_host, nextcloud_url=nextcloud_host,
client_id=client_id, client_id=client_info.client_id,
client_secret=client_secret, registration_access_token=client_info.registration_access_token,
client_secret=client_info.client_secret,
registration_client_uri=client_info.registration_client_uri,
) )
if success: if success:
logger.info( logger.info(
f"Successfully deleted write-only OAuth client: {client_id[:16]}..." f"Successfully deleted write-only OAuth client: {client_info.client_id[:16]}..."
) )
else: else:
logger.warning( logger.warning(
f"Failed to delete write-only OAuth client: {client_id[:16]}..." f"Failed to delete write-only OAuth client: {client_info.client_id[:16]}..."
) )
except Exception as e: except Exception as e:
logger.warning( logger.warning(
f"Error cleaning up write-only OAuth client {client_id[:16]}...: {e}" f"Error cleaning up write-only OAuth client {client_info.client_id[:16]}...: {e}"
) )
@@ -1341,7 +1349,7 @@ async def full_access_oauth_client_credentials(anyio_backend, oauth_callback_ser
authorization_endpoint = oidc_config.get("authorization_endpoint") authorization_endpoint = oidc_config.get("authorization_endpoint")
# Create JWT client with FULL ACCESS (both read and write scopes) # Create JWT client with FULL ACCESS (both read and write scopes)
client_id, client_secret = await _create_oauth_client_with_scopes( client_info = await _create_oauth_client_with_scopes(
callback_url=callback_url, callback_url=callback_url,
client_name="Test Client Full Access", client_name="Test Client Full Access",
allowed_scopes=DEFAULT_FULL_SCOPES, allowed_scopes=DEFAULT_FULL_SCOPES,
@@ -1349,8 +1357,8 @@ async def full_access_oauth_client_credentials(anyio_backend, oauth_callback_ser
) )
yield ( yield (
client_id, client_info.client_id,
client_secret, client_info.client_secret,
callback_url, callback_url,
token_endpoint, token_endpoint,
authorization_endpoint, authorization_endpoint,
@@ -1358,23 +1366,27 @@ async def full_access_oauth_client_credentials(anyio_backend, oauth_callback_ser
# Cleanup: Delete OAuth client from Nextcloud using RFC 7592 # Cleanup: Delete OAuth client from Nextcloud using RFC 7592
try: try:
logger.info(f"Cleaning up full-access OAuth client: {client_id[:16]}...") logger.info(
f"Cleaning up full-access OAuth client: {client_info.client_id[:16]}..."
)
success = await delete_client( success = await delete_client(
nextcloud_url=nextcloud_host, nextcloud_url=nextcloud_host,
client_id=client_id, client_id=client_info.client_id,
client_secret=client_secret, registration_access_token=client_info.registration_access_token,
client_secret=client_info.client_secret,
registration_client_uri=client_info.registration_client_uri,
) )
if success: if success:
logger.info( logger.info(
f"Successfully deleted full-access OAuth client: {client_id[:16]}..." f"Successfully deleted full-access OAuth client: {client_info.client_id[:16]}..."
) )
else: else:
logger.warning( logger.warning(
f"Failed to delete full-access OAuth client: {client_id[:16]}..." f"Failed to delete full-access OAuth client: {client_info.client_id[:16]}..."
) )
except Exception as e: except Exception as e:
logger.warning( logger.warning(
f"Error cleaning up full-access OAuth client {client_id[:16]}...: {e}" f"Error cleaning up full-access OAuth client {client_info.client_id[:16]}...: {e}"
) )
@@ -1411,7 +1423,7 @@ async def no_custom_scopes_oauth_client_credentials(
authorization_endpoint = oidc_config.get("authorization_endpoint") authorization_endpoint = oidc_config.get("authorization_endpoint")
# Create JWT client with NO custom scopes (only OIDC defaults) # Create JWT client with NO custom scopes (only OIDC defaults)
client_id, client_secret = await _create_oauth_client_with_scopes( client_info = await _create_oauth_client_with_scopes(
callback_url=callback_url, callback_url=callback_url,
client_name="Test Client No Custom Scopes", client_name="Test Client No Custom Scopes",
allowed_scopes="openid profile email", # No app-specific scopes (no app access) allowed_scopes="openid profile email", # No app-specific scopes (no app access)
@@ -1419,8 +1431,8 @@ async def no_custom_scopes_oauth_client_credentials(
) )
yield ( yield (
client_id, client_info.client_id,
client_secret, client_info.client_secret,
callback_url, callback_url,
token_endpoint, token_endpoint,
authorization_endpoint, authorization_endpoint,
@@ -1429,24 +1441,26 @@ async def no_custom_scopes_oauth_client_credentials(
# Cleanup: Delete OAuth client from Nextcloud using RFC 7592 # Cleanup: Delete OAuth client from Nextcloud using RFC 7592
try: try:
logger.info( logger.info(
f"Cleaning up no-custom-scopes OAuth client: {client_id[:16]}..." f"Cleaning up no-custom-scopes OAuth client: {client_info.client_id[:16]}..."
) )
success = await delete_client( success = await delete_client(
nextcloud_url=nextcloud_host, nextcloud_url=nextcloud_host,
client_id=client_id, client_id=client_info.client_id,
client_secret=client_secret, registration_access_token=client_info.registration_access_token,
client_secret=client_info.client_secret,
registration_client_uri=client_info.registration_client_uri,
) )
if success: if success:
logger.info( logger.info(
f"Successfully deleted no-custom-scopes OAuth client: {client_id[:16]}..." f"Successfully deleted no-custom-scopes OAuth client: {client_info.client_id[:16]}..."
) )
else: else:
logger.warning( logger.warning(
f"Failed to delete no-custom-scopes OAuth client: {client_id[:16]}..." f"Failed to delete no-custom-scopes OAuth client: {client_info.client_id[:16]}..."
) )
except Exception as e: except Exception as e:
logger.warning( logger.warning(
f"Error cleaning up no-custom-scopes OAuth client {client_id[:16]}...: {e}" f"Error cleaning up no-custom-scopes OAuth client {client_info.client_id[:16]}...: {e}"
) )