slight corrections

Author: gjtorikian

src/workos/admin_portal/_resource.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
 
 if TYPE_CHECKING:
     from .._client import AsyncWorkOSClient, WorkOSClient
@@ -26,6 +26,7 @@ def generate_link(
         success_url: Optional[str] = None,
         intent: Optional[Union[GenerateLinkIntent, str]] = None,
         intent_options: Optional[IntentOptions] = None,
+        admin_emails: Optional[List[str]] = None,
         request_options: Optional[RequestOptions] = None,
     ) -> PortalLinkResponse:
         """Generate a Portal Link
@@ -45,6 +46,7 @@ def generate_link(
                 - `certificate_renewal` - Launch Admin Portal for renewing SAML Certificates
                 - `bring_your_own_key` - Launch Admin Portal for configuring Bring Your Own Key
             intent_options: Options to configure the Admin Portal based on the intent.
+            admin_emails: The email addresses of the IT admins to grant access to the Admin Portal for the given organization. Accepts up to 20 emails.
             request_options: Per-request options. Supports extra_headers, timeout, max_retries, and base_url override.
 
         Returns:
@@ -69,6 +71,7 @@ def generate_link(
                 "intent_options": intent_options.to_dict()
                 if intent_options is not None
                 else None,
+                "admin_emails": admin_emails,
             }.items()
             if v is not None
         }
@@ -95,6 +98,7 @@ async def generate_link(
         success_url: Optional[str] = None,
         intent: Optional[Union[GenerateLinkIntent, str]] = None,
         intent_options: Optional[IntentOptions] = None,
+        admin_emails: Optional[List[str]] = None,
         request_options: Optional[RequestOptions] = None,
     ) -> PortalLinkResponse:
         """Generate a Portal Link
@@ -114,6 +118,7 @@ async def generate_link(
                 - `certificate_renewal` - Launch Admin Portal for renewing SAML Certificates
                 - `bring_your_own_key` - Launch Admin Portal for configuring Bring Your Own Key
             intent_options: Options to configure the Admin Portal based on the intent.
+            admin_emails: The email addresses of the IT admins to grant access to the Admin Portal for the given organization. Accepts up to 20 emails.
             request_options: Per-request options. Supports extra_headers, timeout, max_retries, and base_url override.
 
         Returns:
@@ -138,6 +143,7 @@ async def generate_link(
                 "intent_options": intent_options.to_dict()
                 if intent_options is not None
                 else None,
+                "admin_emails": admin_emails,
             }.items()
             if v is not None
         }

src/workos/admin_portal/models/generate_link.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from enum import Enum
 from typing import cast
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 from workos._types import _raise_deserialize_error
 
 from .intent_options import IntentOptions
@@ -34,6 +34,8 @@ class GenerateLink:
         - `bring_your_own_key` - Launch Admin Portal for configuring Bring Your Own Key"""
     intent_options: Optional["IntentOptions"] = None
     """Options to configure the Admin Portal based on the intent."""
+    admin_emails: Optional[List[str]] = None
+    """The email addresses of the IT admins to grant access to the Admin Portal for the given organization. Accepts up to 20 emails."""
 
     @classmethod
     def from_dict(cls, data: Dict[str, Any]) -> "GenerateLink":
@@ -49,6 +51,7 @@ def from_dict(cls, data: Dict[str, Any]) -> "GenerateLink":
                 intent_options=IntentOptions.from_dict(cast(Dict[str, Any], _v))
                 if (_v := data.get("intent_options")) is not None
                 else None,
+                admin_emails=data.get("admin_emails"),
             )
         except (KeyError, ValueError) as e:
             _raise_deserialize_error("GenerateLink", e)
@@ -67,4 +70,6 @@ def to_dict(self) -> Dict[str, Any]:
             )
         if self.intent_options is not None:
             result["intent_options"] = self.intent_options.to_dict()
+        if self.admin_emails is not None:
+            result["admin_emails"] = self.admin_emails
         return result

src/workos/api_keys/models/api_key.py

@@ -26,7 +26,7 @@ class ApiKey:
     """A descriptive name for the API Key."""
     obfuscated_value: str
     """An obfuscated representation of the API Key value."""
-    last_used_at: Optional[str]
+    last_used_at: Optional[datetime]
     """Timestamp of when the API Key was last used."""
     permissions: List[str]
     """The permission slugs assigned to the API Key."""
@@ -45,7 +45,9 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApiKey":
                 owner=ApiKeyOwner.from_dict(cast(Dict[str, Any], data["owner"])),
                 name=data["name"],
                 obfuscated_value=data["obfuscated_value"],
-                last_used_at=data["last_used_at"],
+                last_used_at=_parse_datetime(_v)
+                if (_v := data["last_used_at"]) is not None
+                else None,
                 permissions=data["permissions"],
                 created_at=_parse_datetime(data["created_at"]),
                 updated_at=_parse_datetime(data["updated_at"]),
@@ -62,7 +64,7 @@ def to_dict(self) -> Dict[str, Any]:
         result["name"] = self.name
         result["obfuscated_value"] = self.obfuscated_value
         if self.last_used_at is not None:
-            result["last_used_at"] = self.last_used_at
+            result["last_used_at"] = _format_datetime(self.last_used_at)
         else:
             result["last_used_at"] = None
         result["permissions"] = self.permissions

src/workos/api_keys/models/api_key_with_value.py

@@ -26,7 +26,7 @@ class ApiKeyWithValue:
     """A descriptive name for the API Key."""
     obfuscated_value: str
     """An obfuscated representation of the API Key value."""
-    last_used_at: Optional[str]
+    last_used_at: Optional[datetime]
     """Timestamp of when the API Key was last used."""
     permissions: List[str]
     """The permission slugs assigned to the API Key."""
@@ -49,7 +49,9 @@ def from_dict(cls, data: Dict[str, Any]) -> "ApiKeyWithValue":
                 ),
                 name=data["name"],
                 obfuscated_value=data["obfuscated_value"],
-                last_used_at=data["last_used_at"],
+                last_used_at=_parse_datetime(_v)
+                if (_v := data["last_used_at"]) is not None
+                else None,
                 permissions=data["permissions"],
                 created_at=_parse_datetime(data["created_at"]),
                 updated_at=_parse_datetime(data["updated_at"]),
@@ -67,7 +69,7 @@ def to_dict(self) -> Dict[str, Any]:
         result["name"] = self.name
         result["obfuscated_value"] = self.obfuscated_value
         if self.last_used_at is not None:
-            result["last_used_at"] = self.last_used_at
+            result["last_used_at"] = _format_datetime(self.last_used_at)
         else:
             result["last_used_at"] = None
         result["permissions"] = self.permissions

src/workos/audit_logs/models/audit_log_event.py

@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from datetime import datetime
 from typing import cast
 from typing import Any, Dict, List, Optional, Union
 from workos._types import _raise_deserialize_error
+from workos._types import _format_datetime, _parse_datetime
 
 from .audit_log_event_actor import AuditLogEventActor
 from .audit_log_event_context import AuditLogEventContext
@@ -18,7 +20,7 @@ class AuditLogEvent:
 
     action: str
     """Identifier of what happened."""
-    occurred_at: str
+    occurred_at: datetime
     """ISO-8601 value of when the action occurred."""
     actor: "AuditLogEventActor"
     """The entity that performed the action."""
@@ -37,7 +39,7 @@ def from_dict(cls, data: Dict[str, Any]) -> "AuditLogEvent":
         try:
             return cls(
                 action=data["action"],
-                occurred_at=data["occurred_at"],
+                occurred_at=_parse_datetime(data["occurred_at"]),
                 actor=AuditLogEventActor.from_dict(cast(Dict[str, Any], data["actor"])),
                 targets=[
                     AuditLogEventTarget.from_dict(cast(Dict[str, Any], item))
@@ -56,7 +58,7 @@ def to_dict(self) -> Dict[str, Any]:
         """Serialize to a dictionary."""
         result: Dict[str, Any] = {}
         result["action"] = self.action
-        result["occurred_at"] = self.occurred_at
+        result["occurred_at"] = _format_datetime(self.occurred_at)
         result["actor"] = self.actor.to_dict()
         result["targets"] = [item.to_dict() for item in self.targets]
         result["context"] = self.context.to_dict()

tests/fixtures/generate_link.json

@@ -8,5 +8,8 @@
       "bookmark_slug": "chatgpt",
       "provider_type": "GoogleSAML"
     }
-  }
+  },
+  "admin_emails": [
+    "admin@example.com"
+  ]
 }

tests/test_sso.py

@@ -136,10 +136,7 @@ def test_get_profile_and_token(self, workos, httpx_mock):
         assert request.method == "POST"
         assert request.url.path.endswith("/sso/token")
         body = json.loads(request.content)
-        assert body["client_id"] == "client_test"
-        assert body["client_secret"] == "sk_test_Sz3IQjepeSWaI4cMS4ms4sMuU"
         assert body["code"] == "test_code"
-        assert body["grant_type"] == "authorization_code"
 
     def test_list_connections_with_request_options(self, workos, httpx_mock):
         httpx_mock.add_response(json={"data": [], "list_metadata": {}})