From 12e60e2ecd8fdc7b7b3c980ce4a00a36d7a5abae Mon Sep 17 00:00:00 2001
From: Caleb Rutan <crutan@users.noreply.github.com>
Date: Wed, 29 Jan 2025 17:41:26 -0500
Subject: [PATCH] Move JWT token claims to v3_users_current (#4939)

move token claims to v3_users_current, expand that response to cover most user needs in the angular client
---
 seed/landing/serializers.py |  4 +---
 seed/views/v3/users.py      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/seed/landing/serializers.py b/seed/landing/serializers.py
index 2e084d75f7..32f3518baf 100644
--- a/seed/landing/serializers.py
+++ b/seed/landing/serializers.py
@@ -7,8 +7,6 @@ def get_token(cls, user):
         token = super().get_token(user)
 
         # Add custom claims
-        token["name"] = f"{user.first_name} {user.last_name}".strip()
-        token["username"] = user.username
-        token["email"] = user.email
+        # token["name"] = f"{user.first_name} {user.last_name}".strip()
 
         return token
diff --git a/seed/views/v3/users.py b/seed/views/v3/users.py
index 9737975495..0b2defda88 100644
--- a/seed/views/v3/users.py
+++ b/seed/views/v3/users.py
@@ -28,6 +28,7 @@
 from seed.utils.api_schema import AutoSchemaHelper, swagger_auto_schema_org_query_param
 from seed.utils.organizations import create_organization
 from seed.utils.users import get_role_from_js
+from seed.views.main import _get_default_org as get_default_org_for_user
 
 _log = logging.getLogger(__name__)
 
@@ -258,7 +259,23 @@ def current(self, request):
                 required: true
                 type: string
         """
-        return JsonResponse({"pk": request.user.id})
+        response = dict(
+            list(
+                zip(
+                    ("org_id", "org_name", "org_role", "ali_name", "ali_id", "is_ali_root", "is_ali_leaf"),
+                    get_default_org_for_user(request.user),
+                )
+            )
+        )
+        response["pk"] = request.user.id
+        response["id"] = request.user.id
+        response["first_name"] = request.user.first_name
+        response["last_name"] = request.user.last_name
+        response["email"] = request.user.email
+        response["username"] = request.user.username
+        response["is_superuser"] = request.user.is_superuser
+        response["api_key"] = request.user.api_key
+        return JsonResponse(response)
 
     @swagger_auto_schema(
         manual_parameters=[AutoSchemaHelper.query_org_id_field()],