chore: fix up problems with follower creation

Author: rokroskar

bases/renku_data_services/data_api/app.py

@@ -231,9 +231,11 @@ def register_all_handlers(app: Sanic, config: Config) -> Sanic:
     )
 
     # ActivityPub configuration
+    # Use the correct base URL for the local development environment
+    base_url = "http://localhost:8000"
     activitypub_config = ActivityPubConfig(
         domain=config.domain,
-        base_url=config.base_url,
+        base_url=f"{base_url}{url_prefix}",  # Use the correct base URL with API prefix
         admin_email=config.admin_email,
     )
 

components/renku_data_services/activitypub/api.spec.yaml

@@ -73,6 +73,37 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
+  /ap/projects/{project_id}/followers/{follower_uri}:
+    delete:
+      summary: Remove a follower from a project
+      description: Removes a follower from a project's followers list
+      operationId: removeProjectFollower
+      tags:
+        - ActivityPub
+      parameters:
+        - name: project_id
+          in: path
+          description: ID of the project
+          required: true
+          schema:
+            type: string
+            format: ulid
+        - name: follower_uri
+          in: path
+          description: URI of the follower to remove
+          required: true
+          schema:
+            type: string
+            format: uri
+      responses:
+        '204':
+          description: Follower removed successfully
+        '404':
+          description: Project or follower not found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
   /ap/projects/{project_id}/inbox:
     post:
       summary: Receive an ActivityPub activity for a project

components/renku_data_services/activitypub/blueprints.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+import urllib.parse
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Union
 from urllib.parse import urlparse
@@ -66,6 +67,30 @@ async def _get_project_followers(request: Request, user: base_models.APIUser, pr
 
         return "/ap/projects/<project_id:ulid>/followers", ["GET"], _get_project_followers
 
+    def remove_project_follower(self) -> BlueprintFactoryResponse:
+        """Remove a follower from a project."""
+
+        @authenticate(self.authenticator)
+        async def _remove_project_follower(
+            request: Request, user: base_models.APIUser, project_id: ULID, follower_uri: str
+        ) -> JSONResponse:
+            try:
+                # URL-decode the follower_uri
+                follower_uri = urllib.parse.unquote(follower_uri)
+
+                # Remove the follower
+                await self.activitypub_service.handle_unfollow(user=user, project_id=project_id, follower_actor_uri=follower_uri)
+
+                # Return a 204 No Content response
+                return JSONResponse(None, status=204)
+            except errors.MissingResourceError as e:
+                return JSONResponse(
+                    {"error": "not_found", "message": str(e)},
+                    status=404,
+                )
+
+        return "/ap/projects/<project_id:ulid>/followers/<follower_uri:path>", ["DELETE"], _remove_project_follower
+
     def project_inbox(self) -> BlueprintFactoryResponse:
         """Receive an ActivityPub activity for a project."""
 
@@ -90,13 +115,20 @@ async def _project_inbox(request: Request, project_id: ULID) -> HTTPResponse:
                             status=400,
                         )
 
-                    # Handle the follow request
-                    # Note: We're using an admin user here because we need to access the project regardless of permissions
-                    admin_user = base_models.APIUser(id=None, is_admin=True)
-                    await self.activitypub_service.handle_follow(
-                        user=admin_user, project_id=project_id, follower_actor_uri=actor_uri
-                    )
-                    return HTTPResponse(status=200)
+                    try:
+                        # Handle the follow request
+                        # Note: We're using an admin user here because we need to access the project regardless of permissions
+                        admin_user = base_models.APIUser(id=None, is_admin=True)
+                        await self.activitypub_service.handle_follow(
+                            user=admin_user, project_id=project_id, follower_actor_uri=actor_uri
+                        )
+                        return HTTPResponse(status=200)
+                    except Exception as e:
+                        logger.exception(f"Error handling follow activity: {e}")
+                        return JSONResponse(
+                            {"error": "internal_error", "message": f"Error handling follow: {str(e)}"},
+                            status=500,
+                        )
                 elif activity_type == models.ActivityType.UNDO:
                     # Check if the object is a Follow activity
                     object_json = activity_json.get("object", {})
@@ -109,13 +141,20 @@ async def _project_inbox(request: Request, project_id: ULID) -> HTTPResponse:
                                 status=400,
                             )
 
-                        # Handle the unfollow request
-                        # Note: We're using an admin user here because we need to access the project regardless of permissions
-                        admin_user = base_models.APIUser(id=None, is_admin=True)
-                        await self.activitypub_service.handle_unfollow(
-                            user=admin_user, project_id=project_id, follower_actor_uri=actor_uri
-                        )
-                        return HTTPResponse(status=200)
+                        try:
+                            # Handle the unfollow request
+                            # Note: We're using an admin user here because we need to access the project regardless of permissions
+                            admin_user = base_models.APIUser(id=None, is_admin=True)
+                            await self.activitypub_service.handle_unfollow(
+                                user=admin_user, project_id=project_id, follower_actor_uri=actor_uri
+                            )
+                            return HTTPResponse(status=200)
+                        except Exception as e:
+                            logger.exception(f"Error handling unfollow activity: {e}")
+                            return JSONResponse(
+                                {"error": "internal_error", "message": f"Error handling unfollow: {str(e)}"},
+                                status=500,
+                            )
 
                 # For other activity types, just acknowledge receipt
                 return HTTPResponse(status=200)
@@ -127,7 +166,7 @@ async def _project_inbox(request: Request, project_id: ULID) -> HTTPResponse:
             except Exception as e:
                 logger.exception(f"Error handling activity: {e}")
                 return JSONResponse(
-                    {"error": "internal_error", "message": "An internal error occurred"},
+                    {"error": "internal_error", "message": f"An internal error occurred: {str(e)}"},
                     status=500,
                 )