Merge branch 'main' into minor/expose-api-key-validation

Author: nholden

tests/test_sso.py

@@ -30,6 +30,7 @@ def mock_magic_link_profile(self):
             first_name=None,
             last_name=None,
             role=None,
+            roles=None,
             groups=None,
             raw_attributes={},
         ).dict()

tests/test_user_management.py

@@ -1194,3 +1194,59 @@ def test_revoke_invitation(
         )
         assert request_kwargs["method"] == "post"
         assert isinstance(invitation, Invitation)
+
+    def test_resend_invitation(
+        self, capture_and_mock_http_client_request, mock_invitation
+    ):
+        request_kwargs = capture_and_mock_http_client_request(
+            self.http_client, mock_invitation, 200
+        )
+
+        invitation = syncify(self.user_management.resend_invitation("invitation_ABCDE"))
+
+        assert request_kwargs["url"].endswith(
+            "user_management/invitations/invitation_ABCDE/resend"
+        )
+        assert request_kwargs["method"] == "post"
+        assert isinstance(invitation, Invitation)
+        assert invitation.id == "invitation_ABCDE"
+
+    def test_resend_invitation_not_found(self, capture_and_mock_http_client_request):
+        error_response = {
+            "message": "Invitation not found",
+            "code": "not_found",
+        }
+        capture_and_mock_http_client_request(self.http_client, error_response, 404)
+
+        with pytest.raises(Exception):
+            syncify(self.user_management.resend_invitation("invitation_nonexistent"))
+
+    def test_resend_invitation_expired(self, capture_and_mock_http_client_request):
+        error_response = {
+            "message": "Invite has expired.",
+            "code": "invite_expired",
+        }
+        capture_and_mock_http_client_request(self.http_client, error_response, 400)
+
+        with pytest.raises(Exception):
+            syncify(self.user_management.resend_invitation("invitation_expired"))
+
+    def test_resend_invitation_revoked(self, capture_and_mock_http_client_request):
+        error_response = {
+            "message": "Invite has been revoked.",
+            "code": "invite_revoked",
+        }
+        capture_and_mock_http_client_request(self.http_client, error_response, 400)
+
+        with pytest.raises(Exception):
+            syncify(self.user_management.resend_invitation("invitation_revoked"))
+
+    def test_resend_invitation_accepted(self, capture_and_mock_http_client_request):
+        error_response = {
+            "message": "Invite has already been accepted.",
+            "code": "invite_accepted",
+        }
+        capture_and_mock_http_client_request(self.http_client, error_response, 400)
+
+        with pytest.raises(Exception):
+            syncify(self.user_management.resend_invitation("invitation_accepted"))

tests/utils/fixtures/mock_directory_user.py

@@ -49,4 +49,5 @@ def __init__(self, id):
                 ],
             },
             role=InlineRole(slug="member"),
+            roles=[InlineRole(slug="member")],
         )

tests/utils/fixtures/mock_profile.py

@@ -11,6 +11,7 @@ def __init__(self, id: str):
             first_name="WorkOS",
             last_name="Demo",
             role={"slug": "admin"},
+            roles=[{"slug": "admin"}],
             groups=["Admins", "Developers"],
             organization_id="org_01FG53X8636WSNW2WEKB2C31ZB",
             connection_id="conn_01EMH8WAK20T42N2NBMNBCYHAG",

workos/__about__.py

@@ -12,7 +12,7 @@
 
 __package_url__ = "https://github.com/workos-inc/workos-python"
 
-__version__ = "5.32.0"
+__version__ = "5.34.1"
 
 __author__ = "WorkOS"
 

workos/types/directory_sync/directory_user.py

@@ -38,6 +38,7 @@ class DirectoryUser(WorkOSModel):
     created_at: str
     updated_at: str
     role: Optional[InlineRole] = None
+    roles: Optional[Sequence[InlineRole]] = None
 
     def primary_email(self) -> Union[DirectoryUserEmail, None]:
         return next((email for email in self.emails if email.primary), None)

workos/types/sso/profile.py

@@ -22,6 +22,7 @@ class Profile(WorkOSModel):
     last_name: Optional[str] = None
     idp_id: str
     role: Optional[ProfileRole] = None
+    roles: Optional[Sequence[ProfileRole]] = None
     groups: Optional[Sequence[str]] = None
     custom_attributes: Optional[Mapping[str, Any]] = None
     raw_attributes: Optional[Mapping[str, Any]] = None

workos/user_management.py

@@ -94,6 +94,7 @@
 INVITATION_DETAIL_PATH = "user_management/invitations/{0}"
 INVITATION_DETAIL_BY_TOKEN_PATH = "user_management/invitations/by_token/{0}"
 INVITATION_REVOKE_PATH = "user_management/invitations/{0}/revoke"
+INVITATION_RESEND_PATH = "user_management/invitations/{0}/resend"
 PASSWORD_RESET_PATH = "user_management/password_reset"
 PASSWORD_RESET_DETAIL_PATH = "user_management/password_reset/{0}"
 
@@ -896,6 +897,17 @@ def revoke_invitation(self, invitation_id: str) -> SyncOrAsync[Invitation]:
         """
         ...
 
+    def resend_invitation(self, invitation_id: str) -> SyncOrAsync[Invitation]:
+        """Resends an existing Invitation.
+
+        Args:
+            invitation_id (str):  The unique ID of the Invitation.
+
+        Returns:
+            Invitation: Invitation response from WorkOS.
+        """
+        ...
+
 
 class UserManagement(UserManagementModule):
     _http_client: SyncHTTPClient
@@ -1584,6 +1596,13 @@ def revoke_invitation(self, invitation_id: str) -> Invitation:
 
         return Invitation.model_validate(response)
 
+    def resend_invitation(self, invitation_id: str) -> Invitation:
+        response = self._http_client.request(
+            INVITATION_RESEND_PATH.format(invitation_id), method=REQUEST_METHOD_POST
+        )
+
+        return Invitation.model_validate(response)
+
 
 class AsyncUserManagement(UserManagementModule):
     _http_client: AsyncHTTPClient
@@ -2286,3 +2305,10 @@ async def revoke_invitation(self, invitation_id: str) -> Invitation:
         )
 
         return Invitation.model_validate(response)
+
+    async def resend_invitation(self, invitation_id: str) -> Invitation:
+        response = await self._http_client.request(
+            INVITATION_RESEND_PATH.format(invitation_id), method=REQUEST_METHOD_POST
+        )
+
+        return Invitation.model_validate(response)