Merge pull request #985 from basedosdados/feat/add-uuid-to-token

feat: add user UUID to jwt token

Author: vrtornisiello

backend/apps/account/migrations/0028_alter_account_uuid.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 4.2.10 on 2026-02-12 15:03
+
+import uuid
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("account", "0027_rename_has_access_to_chatbot_account_has_chatbot_access"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="account",
+            name="uuid",
+            field=models.UUIDField(default=uuid.uuid4, unique=True),
+        ),
+    ]

backend/apps/account/models.py

@@ -208,7 +208,7 @@ class Account(BaseModel, AbstractBaseUser, PermissionsMixin):
         (COLABORADOR, "Colaborador"),
     )
 
-    uuid = models.UUIDField(primary_key=False, default=uuid4)
+    uuid = models.UUIDField(primary_key=False, default=uuid4, unique=True)
 
     email = models.EmailField("Email", unique=True)
     gcp_email = models.EmailField("GCP email", null=True, blank=True)  # Google Cloud Platform email

backend/apps/core/management/commands/_disable_unhealthy_flow_schedules/constants.py

@@ -29,6 +29,7 @@ class Querys(Enum):
     where: {
     flow_id: { _eq: $flow_id }
     state: { _in: ["Success", "Failed"] }
+    start_time: { _is_null: false }
     }
     order_by: { start_time: desc }
     limit: 2

backend/custom/graphql_jwt.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from functools import wraps
 from re import findall
+from typing import Any
 
 from django.db.models import Q
 from graphene import Field, ObjectType, String
@@ -9,6 +10,22 @@
 from graphql_jwt.decorators import context
 from graphql_jwt.relay import JSONWebTokenMutation
 from graphql_jwt.settings import jwt_settings
+from graphql_jwt.utils import jwt_payload
+
+
+def jwt_payload_with_uuid(user, context=None) -> dict[str, Any]:
+    """Custom JWT payload handler that adds the user's UUID to the token payload.
+
+    Args:
+        user (Account): An instance of backend.apps.account.models.Account
+        context (Any, optional): Django request context. Defaults to None.
+
+    Returns:
+        dict[str, Any]: JWT token payload with the user's UUID included.
+    """
+    payload = jwt_payload(user, context)
+    payload["uuid"] = str(user.uuid)
+    return payload
 
 
 class User(ObjectType):

backend/settings/base.py

@@ -202,6 +202,7 @@
     "JWT_EXPIRATION_DELTA": timedelta(days=7),
     "JWT_REFRESH_EXPIRATION_DELTA": timedelta(days=14),
     "JWT_ALLOW_ANY_HANDLER": "backend.custom.graphql_jwt.allow_any",
+    "JWT_PAYLOAD_HANDLER": "backend.custom.graphql_jwt.jwt_payload_with_uuid",
 }
 
 # Translations