Skip to content

LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows

UN-2677 [MISC] Add is_staff flag to user session data (#1471)

Jaseem Jas4f892bfe6346
diff --git a/backend/account_v2/dto.py b/backend/account_v2/dto.py
index 68d8661d3..20ff4ba5f 100644
--- a/backend/account_v2/dto.py
+++ b/backend/account_v2/dto.py
@@ -61,6 +61,7 @@ class UserSessionInfo:
user: UserInfo
role: str
provider: str
+ is_staff: bool = False
@staticmethod
def from_dict(data: dict[str, Any]) -> "UserSessionInfo":
@@ -71,6 +72,7 @@ class UserSessionInfo:
organization_id=data["organization_id"],
role=data["role"],
provider=data["provider"],
+ is_staff=data.get("is_staff", False),
)
def to_dict(self) -> Any:
@@ -80,6 +82,7 @@ class UserSessionInfo:
"email": self.email,
"organization_id": self.organization_id,
"role": self.role,
+ "is_staff": self.is_staff,
}
diff --git a/backend/account_v2/serializer.py b/backend/account_v2/serializer.py
index 81c2f8f08..4011cf4d5 100644
--- a/backend/account_v2/serializer.py
+++ b/backend/account_v2/serializer.py
@@ -13,8 +13,7 @@ class OrganizationSignupSerializer(serializers.Serializer):
def validate_organization_id(self, value): # type: ignore
if not re.match(r"^[a-z0-9_-]+$", value):
raise serializers.ValidationError(
- "organization_code should only contain "
- "alphanumeric characters,_ and -."
+ "organization_code should only contain alphanumeric characters,_ and -."
)
return value
@@ -120,3 +119,4 @@ class UserSessionResponseSerializer(serializers.Serializer):
organization_id = serializers.CharField()
role = serializers.CharField()
provider = serializers.CharField()
+ is_staff = serializers.BooleanField()
diff --git a/backend/account_v2/views.py b/backend/account_v2/views.py
index 101aed08a..30d9e558d 100644
--- a/backend/account_v2/views.py
+++ b/backend/account_v2/views.py
@@ -150,6 +150,7 @@ def make_session_response(
organization_id=UserSessionUtils.get_organization_id(request),
role=UserSessionUtils.get_organization_member_role(request),
provider=provider,
+ is_staff=request.user.is_staff,
)
).data
diff --git a/frontend/src/helpers/GetSessionData.js b/frontend/src/helpers/GetSessionData.js
index 4cca1c642..a25c17821 100644
--- a/frontend/src/helpers/GetSessionData.js
+++ b/frontend/src/helpers/GetSessionData.js
@@ -27,6 +27,7 @@ function getSessionData(sessionData) {
flags: sessionData?.flags,
role: sessionData?.role,
provider: sessionData?.provider,
+ isStaff: sessionData?.is_staff,
};
}
diff --git a/frontend/src/hooks/useSessionValid.js b/frontend/src/hooks/useSessionValid.js
index 86f67c283..22ea61de6 100644
--- a/frontend/src/hooks/useSessionValid.js
+++ b/frontend/src/hooks/useSessionValid.js
@@ -115,6 +115,7 @@ function useSessionValid() {
userAndOrgDetails["orgId"] = orgId;
userAndOrgDetails["csrfToken"] = csrfToken;
userAndOrgDetails["logEventsId"] = setOrgRes?.data?.log_events_id;
+ userAndOrgDetails["is_staff"] = userSessionData?.is_staff;
requestOptions["method"] = "GET";