diff --git a/tests/test_webhooks.py b/tests/test_webhooks.py index d4ebccb0..cdcd245a 100644 --- a/tests/test_webhooks.py +++ b/tests/test_webhooks.py @@ -124,8 +124,6 @@ def test_unrecognized_webhook_type_returns_untyped_webhook( assert type(result).__name__ == "UntypedWebhook" assert result.dict() == json.loads(mock_unknown_webhook_body) - # TODO: This test should be updated in the next major version to expect - # a DirectoryActivatedWebhook return type. def test_validate_dsync_activated_event(self): event_body = { "id": "event_01J8SX5FTXYD2YFWVTGJY49EM6", @@ -152,5 +150,5 @@ def test_validate_dsync_activated_event(self): } result = WebhookTypeAdapter.validate_json(json.dumps(event_body)) - assert type(result).__name__ == "UntypedWebhook" + assert type(result).__name__ == "DirectoryActivatedWebhook" assert result.dict() == event_body diff --git a/tests/utils/fixtures/mock_event.py b/tests/utils/fixtures/mock_event.py index a4f0c6bd..ce052ec2 100644 --- a/tests/utils/fixtures/mock_event.py +++ b/tests/utils/fixtures/mock_event.py @@ -3,7 +3,6 @@ from workos.types.events import DirectoryActivatedEvent from workos.types.events.directory_payload_with_legacy_fields import ( DirectoryPayloadWithLegacyFields, - DirectoryPayloadWithLegacyFieldsForEventsApi, ) @@ -14,7 +13,7 @@ def __init__(self, id): object="event", id=id, event="dsync.activated", - data=DirectoryPayloadWithLegacyFieldsForEventsApi( + data=DirectoryPayloadWithLegacyFields( object="directory", id="dir_1234", organization_id="organization_id", diff --git a/workos/types/events/directory_payload_with_legacy_fields.py b/workos/types/events/directory_payload_with_legacy_fields.py index 630ff76b..65e48b3d 100644 --- a/workos/types/events/directory_payload_with_legacy_fields.py +++ b/workos/types/events/directory_payload_with_legacy_fields.py @@ -4,15 +4,6 @@ class MinimalOrganizationDomain(WorkOSModel): - id: str - # TODO: This should be domain: str in the - # next major version to fix object parsing. - organization_id: str - object: Literal["organization_domain"] - - -# TODO: This class should be removed in the next major version once MinimalOrganizationDomain is updated. -class MinimalOrganizationDomainForEventsApi(WorkOSModel): id: str domain: str object: Literal["organization_domain"] @@ -21,9 +12,3 @@ class MinimalOrganizationDomainForEventsApi(WorkOSModel): class DirectoryPayloadWithLegacyFields(DirectoryPayload): domains: Sequence[MinimalOrganizationDomain] external_key: str - - -# TODO: This class should be removed in the next major version once MinimalOrganizationDomain is updated. -class DirectoryPayloadWithLegacyFieldsForEventsApi(DirectoryPayload): - domains: Sequence[MinimalOrganizationDomainForEventsApi] - external_key: str diff --git a/workos/types/events/event.py b/workos/types/events/event.py index 7f6d4513..23a0f804 100644 --- a/workos/types/events/event.py +++ b/workos/types/events/event.py @@ -28,7 +28,6 @@ from workos.types.events.directory_payload import DirectoryPayload from workos.types.events.directory_payload_with_legacy_fields import ( DirectoryPayloadWithLegacyFields, - DirectoryPayloadWithLegacyFieldsForEventsApi, ) from workos.types.events.directory_user_with_previous_attributes import ( DirectoryUserWithPreviousAttributes, @@ -120,7 +119,7 @@ class ConnectionDeletedEvent(EventModel[Connection]): event: Literal["connection.deleted"] -class DirectoryActivatedEvent(EventModel[DirectoryPayloadWithLegacyFieldsForEventsApi]): +class DirectoryActivatedEvent(EventModel[DirectoryPayloadWithLegacyFields]): event: Literal["dsync.activated"] diff --git a/workos/types/events/event_model.py b/workos/types/events/event_model.py index e55df017..6a49ad3c 100644 --- a/workos/types/events/event_model.py +++ b/workos/types/events/event_model.py @@ -27,7 +27,6 @@ from workos.types.events.directory_payload import DirectoryPayload from workos.types.events.directory_payload_with_legacy_fields import ( DirectoryPayloadWithLegacyFields, - DirectoryPayloadWithLegacyFieldsForEventsApi, ) from workos.types.events.directory_user_with_previous_attributes import ( DirectoryUserWithPreviousAttributes, @@ -64,8 +63,6 @@ ConnectionPayloadWithLegacyFields, DirectoryPayload, DirectoryPayloadWithLegacyFields, - # TODO: Remove once merged with DirectoryPayloadWithLegacyFields in next major release. - DirectoryPayloadWithLegacyFieldsForEventsApi, DirectoryGroup, DirectoryGroupWithPreviousAttributes, DirectoryUser,