Merge branch 'main' into task/WP-834

client/package.json

@@ -12,7 +12,7 @@
     "axios": "^1.7.7",
     "bowser": "^2.9.0",
     "cross-fetch": "^3.1.4",
-    "dompurify": "^2.5.4",
+    "dompurify": "^3.2.4",
     "formik": "^2.2.9",
     "html-react-parser": "^1.4.8",
     "js-cookie": "^2.2.1",
@@ -77,7 +77,7 @@
     "@types/react-redux": "^7.1.18",
     "@typescript-eslint/parser": "^8.8.0",
     "@vitejs/plugin-react": "^4.3.2",
-    "@vitest/coverage-v8": "^2.1.1",
+    "@vitest/coverage-v8": "^2.1.9",
     "eslint": "^8.57.1",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.26.1",
@@ -99,7 +99,7 @@
     "timekeeper": "^2.3.1",
     "typescript": "5.5",
     "vite": "^5.4.14",
-    "vitest": "^2.1.1",
+    "vitest": "^2.1.9",
     "weak-key": "^1.0.1"
   }
 }

server/portal/apps/auth/views.py

@@ -18,6 +18,7 @@
 )
 from portal.apps.search.tasks import index_allocations
 from portal.apps.users.utils import check_user_groups
+from portal.utils import get_client_ip
 
 logger = logging.getLogger(__name__)
 METRICS = logging.getLogger(f'metrics.{__name__}')
@@ -138,8 +139,18 @@ def tapis_oauth_callback(request):
             TapisOAuthToken.objects.update_or_create(user=user, defaults={**token_data})
 
             login(request, user)
-            METRICS.debug(f"user:{user.username} successful oauth login")
             launch_setup_checks(user)
+            METRICS.info(
+                "Auth",
+                extra={
+                    "user": user.username,
+                    "sessionId": getattr(request.session, "session_key", ""),
+                    "operation": "LOGIN",
+                    "agent": request.META.get("HTTP_USER_AGENT"),
+                    "ip": get_client_ip(request),
+                    "info": {},
+                },
+            )
         else:
             messages.error(
                 request,

server/portal/apps/datafiles/handlers/tapis_handlers.py

@@ -15,27 +15,27 @@
 }
 
 
-def tapis_get_handler(client, scheme, system, path, operation, **kwargs):
+def tapis_get_handler(client, scheme, system, path, operation, tapis_tracking_id=None, **kwargs):
     if operation not in allowed_actions[scheme]:
         raise PermissionDenied
     op = getattr(operations, operation)
-    return op(client, system, path, **kwargs)
+    return op(client, system, path, tapis_tracking_id=tapis_tracking_id, **kwargs)
 
 
 def tapis_post_handler(client, scheme, system,
-                       path, operation, body=None):
+                       path, operation, body=None, tapis_tracking_id=None):
     if operation not in allowed_actions[scheme]:
         raise PermissionDenied("")
 
     op = getattr(operations, operation)
-    return op(client, system, path, **body)
+    return op(client, system, path, tapis_tracking_id=tapis_tracking_id, **body)
 
 
 def tapis_put_handler(client, scheme, system,
-                      path, operation, body=None):
+                      path, operation, body=None, tapis_tracking_id=None):
     if operation not in allowed_actions[scheme]:
         raise PermissionDenied
 
     op = getattr(operations, operation)
 
-    return op(client, system, path, **body)
+    return op(client, system, path, tapis_tracking_id=tapis_tracking_id, **body)