Merge pull request #1285 from interval/ctx-user-roles-teams

Add role and teams to ctx.user value

src/demos/shutdown.py

@@ -28,7 +28,7 @@ async def handle_close_inner():
         print("Closing...")
         await interval.safely_close()
         print("Closed!")
-    except Exception as err:
+    except Exception:
         print("Failed closing gracefully", file=sys.stderr)
         print("Closing forcibly")
         await interval.immediately_close()

src/interval_sdk/internal_rpc_schema.py

@@ -376,9 +376,14 @@ class IOResponseInputs(BaseModel):
     transaction_id: str
 
 
+ContextUserRole: TypeAlias = Literal["admin", "developer", "member"]
+
+
 @dataclass
 class ContextUser:
     email: str
+    role: ContextUserRole
+    teams: list[str]
     first_name: Optional[str] = None
     last_name: Optional[str] = None
 
@@ -387,6 +392,8 @@ class ContextUserModel(BaseModel):
     email: str
     first_name: Optional[str] = None
     last_name: Optional[str] = None
+    role: ContextUserRole
+    teams: list[str]
 
 
 @dataclass
@@ -580,7 +587,7 @@ class OpenPageInputs(BaseModel):
     client_id: Optional[str] = None
     page: PageInfo
     environment: ActionEnvironment
-    user: ContextUser
+    user: ContextUserModel
     params: SerializableRecord
     params_meta: Optional[Any] = None
 

src/interval_sdk/main.py

@@ -1111,7 +1111,7 @@ async def send_loading_state(loading_state: LoadingState):
             page_ctx = PageContext(
                 page_key=inputs.page_key,
                 logger=self._logger,
-                user=inputs.user,
+                user=ContextUser(**inputs.user.dict(by_alias=False)),
                 params=deserialize_dates(inputs.params),
                 environment=inputs.environment,
                 organization=self.organization,

src/tests/test_main.py

@@ -93,7 +93,9 @@ async def context(_, ctx_arg: ActionContext):
         assert ctx_arg == ctx
 
         return {
-            "user": f"{ctx.user.first_name} {ctx.user.last_name}",
+            "user": f"{ctx.user.first_name} {ctx.user.last_name} ({ctx.user.email})",
+            "role": ctx.user.role,
+            "teams": json.dumps(ctx.user.teams),
             "message": ctx.params.get("message", None),
             "environment": ctx.environment,
         }
@@ -102,7 +104,11 @@ async def context(_, ctx_arg: ActionContext):
     await transactions.run("context")
     await page.goto(page.url + "?message=Hello")
     await transactions.expect_success(
-        user="Test Runner", message="Hello", environment="development"
+        user="Test Runner ([email protected])",
+        message="Hello",
+        environment="development",
+        role="admin",
+        teams="[]",
     )