Merge pull request #401 from supertokens/fix/tp-rework-dashboard

refactor: Remove core config from dashboard tenants list response

Author: rishabhpoddar

supertokens_python/recipe/dashboard/api/list_tenants.py

@@ -14,7 +14,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, List
+
+from supertokens_python.recipe.dashboard.interfaces import DashboardListTenantItem
 
 if TYPE_CHECKING:
     from supertokens_python.recipe.dashboard.interfaces import (
@@ -36,4 +38,16 @@ async def handle_list_tenants_api(
     user_context: Dict[str, Any],
 ) -> APIResponse:
     tenants = await list_all_tenants(user_context)
-    return DashboardListTenantsGetResponse(tenants.tenants)
+
+    final_tenants: List[DashboardListTenantItem] = []
+
+    for current_tenant in tenants.tenants:
+        dashboard_tenant = DashboardListTenantItem(
+            tenant_id=current_tenant.tenant_id,
+            emailpassword=current_tenant.emailpassword,
+            passwordless=current_tenant.passwordless,
+            third_party=current_tenant.third_party,
+        )
+        final_tenants.append(dashboard_tenant)
+
+    return DashboardListTenantsGetResponse(final_tenants)

supertokens_python/recipe/dashboard/interfaces.py

@@ -101,11 +101,44 @@ def to_json(self) -> Dict[str, Any]:
         }
 
 
-from supertokens_python.recipe.multitenancy.interfaces import ListAllTenantsOkResult
+from supertokens_python.recipe.multitenancy.interfaces import (
+    EmailPasswordConfig,
+    PasswordlessConfig,
+    ThirdPartyConfig,
+)
 
 
-class DashboardListTenantsGetResponse(APIResponse, ListAllTenantsOkResult):
+class DashboardListTenantItem:
+    def __init__(
+        self,
+        tenant_id: str,
+        emailpassword: EmailPasswordConfig,
+        passwordless: PasswordlessConfig,
+        third_party: ThirdPartyConfig,
+    ):
+        self.tenant_id = tenant_id
+        self.emailpassword = emailpassword
+        self.passwordless = passwordless
+        self.third_party = third_party
+
     def to_json(self):
+        res = {
+            "tenantId": self.tenant_id,
+            "emailpassword": self.emailpassword.to_json(),
+            "passwordless": self.passwordless.to_json(),
+            "thirdParty": self.third_party.to_json(),
+        }
+
+        return res
+
+
+class DashboardListTenantsGetResponse(APIResponse):
+    status: str = "OK"
+
+    def __init__(self, tenants: List[DashboardListTenantItem]) -> None:
+        self.tenants = tenants
+
+    def to_json(self) -> Dict[str, Any]:
         return {
             "status": self.status,
             "tenants": [t.to_json() for t in self.tenants],

supertokens_python/recipe/multitenancy/interfaces.py

@@ -126,14 +126,16 @@ def __init__(
         self.tenant_id = tenant_id
 
     def to_json(self):
-        return {
+        res = {
             "tenantId": self.tenant_id,
             "emailpassword": self.emailpassword.to_json(),
             "passwordless": self.passwordless.to_json(),
             "thirdParty": self.third_party.to_json(),
             "coreConfig": self.core_config,
         }
 
+        return res
+
 
 class ListAllTenantsOkResult:
     status = "OK"