feat(subscription): enhance user subscription /info endpoint to include dynamic response headers

Author: x0sina

app/operation/subscription.py

@@ -94,6 +94,21 @@ def create_response_headers(user: UsersResponseWithInbounds, request_url: str, s
             "announce-url": sub_settings.announce_url,
         }
 
+    @staticmethod
+    def create_info_response_headers(user: UsersResponseWithInbounds, sub_settings: SubSettings) -> dict:
+        """Create response headers for /info endpoint with only support-url, announce, and announce-url."""
+        # Prefer admin's support_url over subscription settings
+        support_url = (getattr(user.admin, "support_url", None) if user.admin else None) or sub_settings.support_url
+
+        headers = {
+            "support-url": support_url,
+            "announce": encode_title(sub_settings.announce),
+            "announce-url": sub_settings.announce_url,
+        }
+        
+        # Only include headers that have values
+        return {k: v for k, v in headers.items() if v}
+
     async def fetch_config(self, user: UsersResponseWithInbounds, client_type: ConfigFormat) -> tuple[str, str]:
         # Get client configuration
         config = client_config.get(client_type)
@@ -171,15 +186,24 @@ async def user_subscription_with_client_type(
         # Create response headers
         return Response(content=conf, media_type=media_type, headers=response_headers)
 
-    async def user_subscription_info(self, db: AsyncSession, token: str) -> SubscriptionUserResponse:
+    async def user_subscription_info(
+        self, db: AsyncSession, token: str, request_url: str = ""
+    ) -> tuple[SubscriptionUserResponse, dict]:
         """Retrieves detailed information about the user's subscription."""
-        return await self.get_validated_sub(db, token=token)
+        sub_settings: SubSettings = await subscription_settings()
+        db_user = await self.get_validated_sub(db, token=token)
+        user = await self.validated_user(db_user)
+        
+        response_headers = self.create_info_response_headers(user, sub_settings)
+        user_response = SubscriptionUserResponse.model_validate(db_user.__dict__)
+        
+        return user_response, response_headers
 
     async def user_subscription_apps(self, db: AsyncSession, token: str, request_url: str) -> list[Application]:
         """
         Get available applications for user's subscription.
         """
-        await self.user_subscription_info(db, token)
+        _, _ = await self.user_subscription_info(db, token, request_url)
         sub_settings: SubSettings = await subscription_settings()
         return self._make_apps_import_urls(request_url, sub_settings.applications)
 

app/routers/subscription.py

@@ -1,6 +1,7 @@
 from datetime import datetime as dt
 
 from fastapi import APIRouter, Depends, Header, Query, Request
+from fastapi.responses import JSONResponse
 
 from app.db import AsyncSession, get_db
 from app.models.settings import Application, ConfigFormat
@@ -33,9 +34,14 @@ async def user_subscription(
 
 
 @router.get("/{token}/info", response_model=SubscriptionUserResponse)
-async def user_subscription_info(token: str, db: AsyncSession = Depends(get_db)):
+async def user_subscription_info(
+    request: Request, token: str, db: AsyncSession = Depends(get_db)
+):
     """Retrieves detailed information about the user's subscription."""
-    return await subscription_operator.user_subscription_info(db, token=token)
+    user_data, response_headers = await subscription_operator.user_subscription_info(
+        db, token=token, request_url=str(request.url)
+    )
+    return JSONResponse(content=user_data.model_dump(), headers=response_headers)
 
 
 @router.get("/{token}/apps", response_model=list[Application])