Merge pull request #231 from ecmwf-projects/COPDS-2284-user-email

Add user email to request metadata
ecmwf-projects · Dec 17, 2024 · b043ee9 · b043ee9
2 parents df302d9 + 4b4435e
commit b043ee9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/cads_processing_api_service/auth.py b/cads_processing_api_service/auth.py
@@ -75,7 +75,7 @@ def get_auth_header(pat: str | None = None, jwt: str | None = None) -> tuple[str
 )
 def authenticate_user(
     auth_header: tuple[str, str], portal_header: str | None = None
-) -> tuple[str, str | None]:
+) -> tuple[str, str | None, str | None]:
     """Verify user authentication.
 
     Verify if the provided authentication header corresponds to a registered user.
@@ -88,7 +88,7 @@ def authenticate_user(
 
     Returns
     -------
-    tuple[str, str | None]
+    tuple[str, str | None, str | None]
         User identifier and role.
 
     Raises
@@ -119,7 +119,8 @@ def authenticate_user(
     user: dict[str, str] = response.json()
     user_uid: str = user["sub"]
     user_role: str | None = user.get("role", None)
-    return user_uid, user_role
+    email: str | None = user.get("email", None)
+    return user_uid, user_role, email
 
 
 def get_auth_info(
@@ -153,11 +154,12 @@ def get_auth_info(
         Raised if none of the expected authentication headers is provided.
     """
     auth_header = get_auth_header(pat, jwt)
-    user_uid, user_role = authenticate_user(auth_header, portal_header)
+    user_uid, user_role, email = authenticate_user(auth_header, portal_header)
     request_origin = REQUEST_ORIGIN[auth_header[0]]
     auth_info = models.AuthInfo(
         user_uid=user_uid,
         user_role=user_role,
+        email=email,
         request_origin=request_origin,
         auth_header=auth_header,
         portal_header=portal_header,

diff --git a/cads_processing_api_service/clients.py b/cads_processing_api_service/clients.py
@@ -292,7 +292,10 @@ def post_process_execution(
                 process_id=process_id,
                 portal=dataset.portal,
                 qos_tags=dataset.qos_tags,
-                metadata={"costs": costs},
+                metadata={
+                    "costs": costs,
+                    "user_data": {"email": auth_info.email},
+                },
                 **job_kwargs,
             )
         dataset_messages = [

diff --git a/cads_processing_api_service/models.py b/cads_processing_api_service/models.py
@@ -25,6 +25,7 @@
 class AuthInfo(pydantic.BaseModel):
     user_uid: str
     user_role: str | None = None
+    email: str | None = None
     request_origin: str
     auth_header: tuple[str, str]
     portal_header: str | None = None