From e6234483bc3e80382e52f9f17d01a06bf48777ce Mon Sep 17 00:00:00 2001 From: swaroopakkineni Date: Fri, 20 Feb 2026 05:34:19 -1000 Subject: [PATCH 1/3] FGA implementation pr1 --- src/workos/authorization.py | 196 ++++++++++++++++++++- src/workos/types/authorization/resource.py | 5 +- tests/test_authorization_resource_crud.py | 189 ++++++++++++++++++++ 3 files changed, 388 insertions(+), 2 deletions(-) create mode 100644 tests/test_authorization_resource_crud.py diff --git a/src/workos/authorization.py b/src/workos/authorization.py index 6e12f035..eac54b3f 100644 --- a/src/workos/authorization.py +++ b/src/workos/authorization.py @@ -1,6 +1,7 @@ -from typing import Any, Dict, Optional, Protocol, Sequence +from typing import Any, Dict, Optional, Protocol, Sequence, Union from pydantic import TypeAdapter +from typing_extensions import TypedDict from workos.types.authorization.environment_role import ( EnvironmentRole, @@ -8,6 +9,7 @@ ) from workos.types.authorization.organization_role import OrganizationRole from workos.types.authorization.permission import Permission +from workos.types.authorization.resource import Resource from workos.types.authorization.role import Role, RoleList from workos.types.list_resource import ( ListArgs, @@ -28,6 +30,24 @@ ) AUTHORIZATION_PERMISSIONS_PATH = "authorization/permissions" +AUTHORIZATION_RESOURCES_PATH = "authorization/resources" + + +class ParentResourceById(TypedDict): + """Identify a parent resource by its WorkOS resource ID.""" + + resource_id: str + + +class ParentResourceByExternalId(TypedDict): + """Identify a parent resource by organization, type, and external ID.""" + + organization_id: str + resource_type: str + external_id: str + + +ParentResource = Union[ParentResourceById, ParentResourceByExternalId] _role_adapter: TypeAdapter[Role] = TypeAdapter(Role) @@ -161,6 +181,34 @@ def add_environment_role_permission( permission_slug: str, ) -> SyncOrAsync[EnvironmentRole]: ... + # Resources + + def get_resource(self, resource_id: str) -> SyncOrAsync[Resource]: ... + + def create_resource( + self, + *, + resource_type: str, + organization_id: str, + external_id: Optional[str] = None, + meta: Optional[Dict[str, Any]] = None, + parent: Optional[ParentResource] = None, + ) -> SyncOrAsync[Resource]: ... + + def update_resource( + self, + resource_id: str, + *, + meta: Optional[Dict[str, Any]] = None, + ) -> SyncOrAsync[Resource]: ... + + def delete_resource( + self, + resource_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> SyncOrAsync[None]: ... + class Authorization(AuthorizationModule): _http_client: SyncHTTPClient @@ -437,6 +485,79 @@ def add_environment_role_permission( return EnvironmentRole.model_validate(response) + # Resources + + def get_resource(self, resource_id: str) -> Resource: + response = self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_GET, + ) + + return Resource.model_validate(response) + + def create_resource( + self, + *, + resource_type: str, + organization_id: str, + external_id: Optional[str] = None, + meta: Optional[Dict[str, Any]] = None, + parent: Optional[ParentResource] = None, + ) -> Resource: + json: Dict[str, Any] = { + "resource_type": resource_type, + "organization_id": organization_id, + } + if external_id is not None: + json["external_id"] = external_id + if meta is not None: + json["meta"] = meta + if parent is not None: + json["parent"] = parent + + response = self._http_client.request( + AUTHORIZATION_RESOURCES_PATH, + method=REQUEST_METHOD_POST, + json=json, + ) + + return Resource.model_validate(response) + + def update_resource( + self, + resource_id: str, + *, + meta: Optional[Dict[str, Any]] = None, + ) -> Resource: + json: Dict[str, Any] = {} + if meta is not None: + json["meta"] = meta + + response = self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_PATCH, + json=json, + ) + + return Resource.model_validate(response) + + def delete_resource( + self, + resource_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> None: + if cascade_delete is not None: + self._http_client.delete_with_body( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + json={"cascade_delete": cascade_delete}, + ) + else: + self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_DELETE, + ) + class AsyncAuthorization(AuthorizationModule): _http_client: AsyncHTTPClient @@ -712,3 +833,76 @@ async def add_environment_role_permission( ) return EnvironmentRole.model_validate(response) + + # Resources + + async def get_resource(self, resource_id: str) -> Resource: + response = await self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_GET, + ) + + return Resource.model_validate(response) + + async def create_resource( + self, + *, + resource_type: str, + organization_id: str, + external_id: Optional[str] = None, + meta: Optional[Dict[str, Any]] = None, + parent: Optional[ParentResource] = None, + ) -> Resource: + json: Dict[str, Any] = { + "resource_type": resource_type, + "organization_id": organization_id, + } + if external_id is not None: + json["external_id"] = external_id + if meta is not None: + json["meta"] = meta + if parent is not None: + json["parent"] = parent + + response = await self._http_client.request( + AUTHORIZATION_RESOURCES_PATH, + method=REQUEST_METHOD_POST, + json=json, + ) + + return Resource.model_validate(response) + + async def update_resource( + self, + resource_id: str, + *, + meta: Optional[Dict[str, Any]] = None, + ) -> Resource: + json: Dict[str, Any] = {} + if meta is not None: + json["meta"] = meta + + response = await self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_PATCH, + json=json, + ) + + return Resource.model_validate(response) + + async def delete_resource( + self, + resource_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> None: + if cascade_delete is not None: + await self._http_client.delete_with_body( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + json={"cascade_delete": cascade_delete}, + ) + else: + await self._http_client.request( + f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", + method=REQUEST_METHOD_DELETE, + ) diff --git a/src/workos/types/authorization/resource.py b/src/workos/types/authorization/resource.py index 917673c4..5b29778b 100644 --- a/src/workos/types/authorization/resource.py +++ b/src/workos/types/authorization/resource.py @@ -1,4 +1,4 @@ -from typing import Literal, Optional +from typing import Any, Literal, Mapping, Optional from workos.types.workos_model import WorkOSModel @@ -14,5 +14,8 @@ class Resource(WorkOSModel): resource_type_slug: str organization_id: str parent_resource_id: Optional[str] = None + # The API returns meta when set via create_resource / update_resource. + # Without this field the model would silently discard that data. + meta: Optional[Mapping[str, Any]] = None created_at: str updated_at: str diff --git a/tests/test_authorization_resource_crud.py b/tests/test_authorization_resource_crud.py new file mode 100644 index 00000000..6cd9ea68 --- /dev/null +++ b/tests/test_authorization_resource_crud.py @@ -0,0 +1,189 @@ +from typing import Union + +import pytest +from tests.utils.fixtures.mock_resource import MockResource +from tests.utils.syncify import syncify +from workos.authorization import AsyncAuthorization, Authorization + + +@pytest.mark.sync_and_async(Authorization, AsyncAuthorization) +class TestAuthorizationResourceCRUD: + @pytest.fixture(autouse=True) + def setup(self, module_instance: Union[Authorization, AsyncAuthorization]): + self.http_client = module_instance._http_client + self.authorization = module_instance + + @pytest.fixture + def mock_resource(self): + return MockResource(id="res_01ABC").dict() + + # --- get_resource --- + + def test_get_resource(self, mock_resource, capture_and_mock_http_client_request): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 200 + ) + + resource = syncify(self.authorization.get_resource("res_01ABC")) + + assert resource.id == "res_01ABC" + assert resource.object == "authorization_resource" + assert request_kwargs["method"] == "get" + assert request_kwargs["url"].endswith("/authorization/resources/res_01ABC") + + # --- create_resource --- + + def test_create_resource_required_fields_only( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 201 + ) + + resource = syncify( + self.authorization.create_resource( + resource_type="document", + organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + ) + ) + + assert resource.id == "res_01ABC" + assert request_kwargs["method"] == "post" + assert request_kwargs["url"].endswith("/authorization/resources") + assert request_kwargs["json"] == { + "resource_type": "document", + "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", + } + + def test_create_resource_with_all_optional_fields( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 201 + ) + + syncify( + self.authorization.create_resource( + resource_type="document", + organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + external_id="ext_123", + meta={"key": "value"}, + parent={"resource_id": "res_01PARENT"}, + ) + ) + + assert request_kwargs["json"] == { + "resource_type": "document", + "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "external_id": "ext_123", + "meta": {"key": "value"}, + "parent": {"resource_id": "res_01PARENT"}, + } + + def test_create_resource_with_parent_by_id( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 201 + ) + + syncify( + self.authorization.create_resource( + resource_type="document", + organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + parent={"resource_id": "res_01PARENT"}, + ) + ) + + assert request_kwargs["json"]["parent"] == {"resource_id": "res_01PARENT"} + + def test_create_resource_with_parent_by_external_id( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 201 + ) + + syncify( + self.authorization.create_resource( + resource_type="document", + organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + parent={ + "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "resource_type": "folder", + "external_id": "ext_parent_456", + }, + ) + ) + + assert request_kwargs["json"]["parent"] == { + "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "resource_type": "folder", + "external_id": "ext_parent_456", + } + + # --- update_resource --- + + def test_update_resource_with_meta( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 200 + ) + + resource = syncify( + self.authorization.update_resource( + "res_01ABC", + meta={"updated_key": "updated_value"}, + ) + ) + + assert resource.id == "res_01ABC" + assert request_kwargs["method"] == "patch" + assert request_kwargs["url"].endswith("/authorization/resources/res_01ABC") + assert request_kwargs["json"] == {"meta": {"updated_key": "updated_value"}} + + def test_update_resource_without_meta( + self, mock_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_resource, 200 + ) + + syncify(self.authorization.update_resource("res_01ABC")) + + assert request_kwargs["method"] == "patch" + assert request_kwargs["json"] == {} + + # --- delete_resource --- + + def test_delete_resource_without_cascade( + self, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, + status_code=202, + headers={"content-type": "text/plain; charset=utf-8"}, + ) + + response = syncify(self.authorization.delete_resource("res_01ABC")) + + assert response is None + assert request_kwargs["method"] == "delete" + assert request_kwargs["url"].endswith("/authorization/resources/res_01ABC") + + def test_delete_resource_with_cascade(self, capture_and_mock_http_client_request): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, + status_code=202, + headers={"content-type": "text/plain; charset=utf-8"}, + ) + + response = syncify( + self.authorization.delete_resource("res_01ABC", cascade_delete=True) + ) + + assert response is None + assert request_kwargs["method"] == "delete" + assert request_kwargs["url"].endswith("/authorization/resources/res_01ABC") + assert request_kwargs["json"] == {"cascade_delete": True} From a5d3ce2a1b6dea42b126d005b3dd1d6feac773ed Mon Sep 17 00:00:00 2001 From: swaroopakkineni Date: Fri, 20 Feb 2026 06:52:02 -1000 Subject: [PATCH 2/3] cleanup --- src/workos/authorization.py | 89 +++++++++++----------- src/workos/types/authorization/resource.py | 3 - 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/workos/authorization.py b/src/workos/authorization.py index eac54b3f..eeea21bb 100644 --- a/src/workos/authorization.py +++ b/src/workos/authorization.py @@ -34,17 +34,12 @@ class ParentResourceById(TypedDict): - """Identify a parent resource by its WorkOS resource ID.""" - - resource_id: str + parent_resource_id: str class ParentResourceByExternalId(TypedDict): - """Identify a parent resource by organization, type, and external ID.""" - - organization_id: str - resource_type: str - external_id: str + parent_resource_external_id: str + parent_resource_type_slug: str ParentResource = Union[ParentResourceById, ParentResourceByExternalId] @@ -188,18 +183,20 @@ def get_resource(self, resource_id: str) -> SyncOrAsync[Resource]: ... def create_resource( self, *, - resource_type: str, + resource_type_slug: str, organization_id: str, - external_id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - parent: Optional[ParentResource] = None, + external_id: str, + name: str, + parent: ParentResource, + description: Optional[str] = None, ) -> SyncOrAsync[Resource]: ... def update_resource( self, resource_id: str, *, - meta: Optional[Dict[str, Any]] = None, + name: Optional[str] = None, + description: Optional[str] = None, ) -> SyncOrAsync[Resource]: ... def delete_resource( @@ -498,22 +495,22 @@ def get_resource(self, resource_id: str) -> Resource: def create_resource( self, *, - resource_type: str, + resource_type_slug: str, organization_id: str, - external_id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - parent: Optional[ParentResource] = None, + external_id: str, + name: str, + parent: ParentResource, + description: Optional[str] = None, ) -> Resource: json: Dict[str, Any] = { - "resource_type": resource_type, + "resource_type_slug": resource_type_slug, "organization_id": organization_id, + "external_id": external_id, + "name": name, + **parent, } - if external_id is not None: - json["external_id"] = external_id - if meta is not None: - json["meta"] = meta - if parent is not None: - json["parent"] = parent + if description is not None: + json["description"] = description response = self._http_client.request( AUTHORIZATION_RESOURCES_PATH, @@ -525,13 +522,16 @@ def create_resource( def update_resource( self, - resource_id: str, *, - meta: Optional[Dict[str, Any]] = None, + resource_id: str, + name: Optional[str] = None, + description: Optional[str] = None, ) -> Resource: json: Dict[str, Any] = {} - if meta is not None: - json["meta"] = meta + if name is not None: + json["name"] = name + if description is not None: + json["description"] = description response = self._http_client.request( f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", @@ -543,8 +543,8 @@ def update_resource( def delete_resource( self, - resource_id: str, *, + resource_id: str, cascade_delete: Optional[bool] = None, ) -> None: if cascade_delete is not None: @@ -847,22 +847,22 @@ async def get_resource(self, resource_id: str) -> Resource: async def create_resource( self, *, - resource_type: str, + resource_type_slug: str, organization_id: str, - external_id: Optional[str] = None, - meta: Optional[Dict[str, Any]] = None, - parent: Optional[ParentResource] = None, + external_id: str, + name: str, + parent: ParentResource, + description: Optional[str] = None, ) -> Resource: json: Dict[str, Any] = { - "resource_type": resource_type, + "resource_type_slug": resource_type_slug, "organization_id": organization_id, + "external_id": external_id, + "name": name, + **parent, } - if external_id is not None: - json["external_id"] = external_id - if meta is not None: - json["meta"] = meta - if parent is not None: - json["parent"] = parent + if description is not None: + json["description"] = description response = await self._http_client.request( AUTHORIZATION_RESOURCES_PATH, @@ -876,11 +876,14 @@ async def update_resource( self, resource_id: str, *, - meta: Optional[Dict[str, Any]] = None, + name: Optional[str] = None, + description: Optional[str] = None, ) -> Resource: json: Dict[str, Any] = {} - if meta is not None: - json["meta"] = meta + if name is not None: + json["name"] = name + if description is not None: + json["description"] = description response = await self._http_client.request( f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", diff --git a/src/workos/types/authorization/resource.py b/src/workos/types/authorization/resource.py index 5b29778b..e699292b 100644 --- a/src/workos/types/authorization/resource.py +++ b/src/workos/types/authorization/resource.py @@ -14,8 +14,5 @@ class Resource(WorkOSModel): resource_type_slug: str organization_id: str parent_resource_id: Optional[str] = None - # The API returns meta when set via create_resource / update_resource. - # Without this field the model would silently discard that data. - meta: Optional[Mapping[str, Any]] = None created_at: str updated_at: str From ed27e87f957dd1253ebae03e7c2023c196411ca6 Mon Sep 17 00:00:00 2001 From: swaroopakkineni Date: Fri, 20 Feb 2026 08:41:50 -1000 Subject: [PATCH 3/3] fga-p2 --- src/workos/authorization.py | 226 +++++++++++++++- src/workos/types/authorization/resource.py | 2 +- tests/test_authorization_resource_crud.py | 59 ++--- ...test_authorization_resource_external_id.py | 244 ++++++++++++++++++ 4 files changed, 498 insertions(+), 33 deletions(-) create mode 100644 tests/test_authorization_resource_external_id.py diff --git a/src/workos/authorization.py b/src/workos/authorization.py index eeea21bb..e1712ff3 100644 --- a/src/workos/authorization.py +++ b/src/workos/authorization.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, Optional, Protocol, Sequence, Union +from typing import Any, Dict, Mapping, Optional, Protocol, Sequence, Union from pydantic import TypeAdapter from typing_extensions import TypedDict @@ -11,6 +11,7 @@ from workos.types.authorization.permission import Permission from workos.types.authorization.resource import Resource from workos.types.authorization.role import Role, RoleList +from workos.types.fga import AuthorizationResource from workos.types.list_resource import ( ListArgs, ListMetadata, @@ -56,6 +57,15 @@ class PermissionListFilters(ListArgs, total=False): ] +class ResourceByExternalIdListFilters(ListArgs, total=False): + resource_type_slug: Optional[str] + + +ResourceByExternalIdListResource = WorkOSListResource[ + AuthorizationResource, ResourceByExternalIdListFilters, ListMetadata +] + + class AuthorizationModule(Protocol): """Offers methods through the WorkOS Authorization service.""" @@ -206,6 +216,44 @@ def delete_resource( cascade_delete: Optional[bool] = None, ) -> SyncOrAsync[None]: ... + # Resources by External ID + + def get_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + ) -> SyncOrAsync[AuthorizationResource]: ... + + def update_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + meta: Optional[Mapping[str, Any]] = None, + ) -> SyncOrAsync[AuthorizationResource]: ... + + def delete_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> SyncOrAsync[None]: ... + + def list_resources( + self, + organization_id: str, + *, + resource_type_slug: Optional[str] = None, + limit: int = DEFAULT_LIST_RESPONSE_LIMIT, + before: Optional[str] = None, + after: Optional[str] = None, + order: PaginationOrder = "desc", + ) -> SyncOrAsync[ResourceByExternalIdListResource]: ... + class Authorization(AuthorizationModule): _http_client: SyncHTTPClient @@ -522,8 +570,8 @@ def create_resource( def update_resource( self, - *, resource_id: str, + *, name: Optional[str] = None, description: Optional[str] = None, ) -> Resource: @@ -543,8 +591,8 @@ def update_resource( def delete_resource( self, - *, resource_id: str, + *, cascade_delete: Optional[bool] = None, ) -> None: if cascade_delete is not None: @@ -558,6 +606,92 @@ def delete_resource( method=REQUEST_METHOD_DELETE, ) + # Resources by External ID + + def get_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + ) -> AuthorizationResource: + response = self._http_client.request( + f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}", + method=REQUEST_METHOD_GET, + ) + + return AuthorizationResource.model_validate(response) + + def update_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + meta: Optional[Mapping[str, Any]] = None, + ) -> AuthorizationResource: + json: Dict[str, Any] = {} + if meta is not None: + json["meta"] = meta + + response = self._http_client.request( + f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}", + method=REQUEST_METHOD_PATCH, + json=json, + ) + + return AuthorizationResource.model_validate(response) + + def delete_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> None: + path = f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}" + if cascade_delete is not None: + self._http_client.delete_with_body( + path, + json={"cascade_delete": cascade_delete}, + ) + else: + self._http_client.request( + path, + method=REQUEST_METHOD_DELETE, + ) + + def list_resources( + self, + organization_id: str, + *, + resource_type_slug: Optional[str] = None, + limit: int = DEFAULT_LIST_RESPONSE_LIMIT, + before: Optional[str] = None, + after: Optional[str] = None, + order: PaginationOrder = "desc", + ) -> ResourceByExternalIdListResource: + list_params: ResourceByExternalIdListFilters = { + "limit": limit, + "before": before, + "after": after, + "order": order, + } + if resource_type_slug is not None: + list_params["resource_type_slug"] = resource_type_slug + + response = self._http_client.request( + f"authorization/organizations/{organization_id}/resources", + method=REQUEST_METHOD_GET, + params=list_params, + ) + + return ResourceByExternalIdListResource( + list_method=self.list_resources, + list_args=list_params, + **ListPage[AuthorizationResource](**response).model_dump(), + ) + class AsyncAuthorization(AuthorizationModule): _http_client: AsyncHTTPClient @@ -909,3 +1043,89 @@ async def delete_resource( f"{AUTHORIZATION_RESOURCES_PATH}/{resource_id}", method=REQUEST_METHOD_DELETE, ) + + # Resources by External ID + + async def get_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + ) -> AuthorizationResource: + response = await self._http_client.request( + f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}", + method=REQUEST_METHOD_GET, + ) + + return AuthorizationResource.model_validate(response) + + async def update_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + meta: Optional[Mapping[str, Any]] = None, + ) -> AuthorizationResource: + json: Dict[str, Any] = {} + if meta is not None: + json["meta"] = meta + + response = await self._http_client.request( + f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}", + method=REQUEST_METHOD_PATCH, + json=json, + ) + + return AuthorizationResource.model_validate(response) + + async def delete_resource_by_external_id( + self, + organization_id: str, + resource_type: str, + external_id: str, + *, + cascade_delete: Optional[bool] = None, + ) -> None: + path = f"authorization/organizations/{organization_id}/resources/{resource_type}/{external_id}" + if cascade_delete is not None: + await self._http_client.delete_with_body( + path, + json={"cascade_delete": cascade_delete}, + ) + else: + await self._http_client.request( + path, + method=REQUEST_METHOD_DELETE, + ) + + async def list_resources( + self, + organization_id: str, + *, + resource_type_slug: Optional[str] = None, + limit: int = DEFAULT_LIST_RESPONSE_LIMIT, + before: Optional[str] = None, + after: Optional[str] = None, + order: PaginationOrder = "desc", + ) -> ResourceByExternalIdListResource: + list_params: ResourceByExternalIdListFilters = { + "limit": limit, + "before": before, + "after": after, + "order": order, + } + if resource_type_slug is not None: + list_params["resource_type_slug"] = resource_type_slug + + response = await self._http_client.request( + f"authorization/organizations/{organization_id}/resources", + method=REQUEST_METHOD_GET, + params=list_params, + ) + + return ResourceByExternalIdListResource( + list_method=self.list_resources, + list_args=list_params, + **ListPage[AuthorizationResource](**response).model_dump(), + ) diff --git a/src/workos/types/authorization/resource.py b/src/workos/types/authorization/resource.py index e699292b..917673c4 100644 --- a/src/workos/types/authorization/resource.py +++ b/src/workos/types/authorization/resource.py @@ -1,4 +1,4 @@ -from typing import Any, Literal, Mapping, Optional +from typing import Literal, Optional from workos.types.workos_model import WorkOSModel diff --git a/tests/test_authorization_resource_crud.py b/tests/test_authorization_resource_crud.py index 6cd9ea68..4942e29a 100644 --- a/tests/test_authorization_resource_crud.py +++ b/tests/test_authorization_resource_crud.py @@ -42,8 +42,11 @@ def test_create_resource_required_fields_only( resource = syncify( self.authorization.create_resource( - resource_type="document", + resource_type_slug="document", organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + external_id="ext_123", + name="Test Document", + parent={"parent_resource_id": "res_01PARENT"}, ) ) @@ -51,11 +54,14 @@ def test_create_resource_required_fields_only( assert request_kwargs["method"] == "post" assert request_kwargs["url"].endswith("/authorization/resources") assert request_kwargs["json"] == { - "resource_type": "document", + "resource_type_slug": "document", "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "external_id": "ext_123", + "name": "Test Document", + "parent_resource_id": "res_01PARENT", } - def test_create_resource_with_all_optional_fields( + def test_create_resource_with_description( self, mock_resource, capture_and_mock_http_client_request ): request_kwargs = capture_and_mock_http_client_request( @@ -64,21 +70,16 @@ def test_create_resource_with_all_optional_fields( syncify( self.authorization.create_resource( - resource_type="document", + resource_type_slug="document", organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", external_id="ext_123", - meta={"key": "value"}, - parent={"resource_id": "res_01PARENT"}, + name="Test Document", + parent={"parent_resource_id": "res_01PARENT"}, + description="A test document", ) ) - assert request_kwargs["json"] == { - "resource_type": "document", - "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", - "external_id": "ext_123", - "meta": {"key": "value"}, - "parent": {"resource_id": "res_01PARENT"}, - } + assert request_kwargs["json"]["description"] == "A test document" def test_create_resource_with_parent_by_id( self, mock_resource, capture_and_mock_http_client_request @@ -89,13 +90,15 @@ def test_create_resource_with_parent_by_id( syncify( self.authorization.create_resource( - resource_type="document", + resource_type_slug="document", organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", - parent={"resource_id": "res_01PARENT"}, + external_id="ext_123", + name="Test Document", + parent={"parent_resource_id": "res_01PARENT"}, ) ) - assert request_kwargs["json"]["parent"] == {"resource_id": "res_01PARENT"} + assert request_kwargs["json"]["parent_resource_id"] == "res_01PARENT" def test_create_resource_with_parent_by_external_id( self, mock_resource, capture_and_mock_http_client_request @@ -106,25 +109,23 @@ def test_create_resource_with_parent_by_external_id( syncify( self.authorization.create_resource( - resource_type="document", + resource_type_slug="document", organization_id="org_01EHT88Z8J8795GZNQ4ZP1J81T", + external_id="ext_123", + name="Test Document", parent={ - "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", - "resource_type": "folder", - "external_id": "ext_parent_456", + "parent_resource_external_id": "ext_parent_456", + "parent_resource_type_slug": "folder", }, ) ) - assert request_kwargs["json"]["parent"] == { - "organization_id": "org_01EHT88Z8J8795GZNQ4ZP1J81T", - "resource_type": "folder", - "external_id": "ext_parent_456", - } + assert request_kwargs["json"]["parent_resource_external_id"] == "ext_parent_456" + assert request_kwargs["json"]["parent_resource_type_slug"] == "folder" # --- update_resource --- - def test_update_resource_with_meta( + def test_update_resource_with_name( self, mock_resource, capture_and_mock_http_client_request ): request_kwargs = capture_and_mock_http_client_request( @@ -134,16 +135,16 @@ def test_update_resource_with_meta( resource = syncify( self.authorization.update_resource( "res_01ABC", - meta={"updated_key": "updated_value"}, + name="Updated Name", ) ) assert resource.id == "res_01ABC" assert request_kwargs["method"] == "patch" assert request_kwargs["url"].endswith("/authorization/resources/res_01ABC") - assert request_kwargs["json"] == {"meta": {"updated_key": "updated_value"}} + assert request_kwargs["json"] == {"name": "Updated Name"} - def test_update_resource_without_meta( + def test_update_resource_without_changes( self, mock_resource, capture_and_mock_http_client_request ): request_kwargs = capture_and_mock_http_client_request( diff --git a/tests/test_authorization_resource_external_id.py b/tests/test_authorization_resource_external_id.py new file mode 100644 index 00000000..a82866f2 --- /dev/null +++ b/tests/test_authorization_resource_external_id.py @@ -0,0 +1,244 @@ +from typing import Union + +import pytest +from tests.utils.list_resource import list_response_of +from tests.utils.syncify import syncify +from workos.authorization import AsyncAuthorization, Authorization + + +@pytest.mark.sync_and_async(Authorization, AsyncAuthorization) +class TestAuthorizationResourceByExternalId: + @pytest.fixture(autouse=True) + def setup(self, module_instance: Union[Authorization, AsyncAuthorization]): + self.http_client = module_instance._http_client + self.authorization = module_instance + + @pytest.fixture + def mock_authorization_resource(self): + return { + "resource_type": "document", + "resource_id": "doc_123", + "meta": {"title": "Test Document"}, + "created_at": "2024-01-01T00:00:00Z", + } + + # --- get_resource_by_external_id --- + + def test_get_resource_by_external_id( + self, mock_authorization_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_authorization_resource, 200 + ) + + resource = syncify( + self.authorization.get_resource_by_external_id( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "document", + "ext_123", + ) + ) + + assert resource.resource_type == "document" + assert resource.resource_id == "doc_123" + assert resource.meta == {"title": "Test Document"} + assert request_kwargs["method"] == "get" + assert request_kwargs["url"].endswith( + "/authorization/organizations/org_01EHT88Z8J8795GZNQ4ZP1J81T" + "/resources/document/ext_123" + ) + + # --- update_resource_by_external_id --- + + def test_update_resource_by_external_id_with_meta( + self, mock_authorization_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_authorization_resource, 200 + ) + + resource = syncify( + self.authorization.update_resource_by_external_id( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "document", + "ext_123", + meta={"title": "Updated Document"}, + ) + ) + + assert resource.resource_type == "document" + assert resource.resource_id == "doc_123" + assert request_kwargs["method"] == "patch" + assert request_kwargs["url"].endswith( + "/authorization/organizations/org_01EHT88Z8J8795GZNQ4ZP1J81T" + "/resources/document/ext_123" + ) + assert request_kwargs["json"] == {"meta": {"title": "Updated Document"}} + + def test_update_resource_by_external_id_without_meta( + self, mock_authorization_resource, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_authorization_resource, 200 + ) + + syncify( + self.authorization.update_resource_by_external_id( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "document", + "ext_123", + ) + ) + + assert request_kwargs["method"] == "patch" + assert request_kwargs["json"] == {} + + # --- delete_resource_by_external_id --- + + def test_delete_resource_by_external_id_without_cascade( + self, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, + status_code=202, + headers={"content-type": "text/plain; charset=utf-8"}, + ) + + response = syncify( + self.authorization.delete_resource_by_external_id( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "document", + "ext_123", + ) + ) + + assert response is None + assert request_kwargs["method"] == "delete" + assert request_kwargs["url"].endswith( + "/authorization/organizations/org_01EHT88Z8J8795GZNQ4ZP1J81T" + "/resources/document/ext_123" + ) + + def test_delete_resource_by_external_id_with_cascade( + self, capture_and_mock_http_client_request + ): + request_kwargs = capture_and_mock_http_client_request( + self.http_client, + status_code=202, + headers={"content-type": "text/plain; charset=utf-8"}, + ) + + response = syncify( + self.authorization.delete_resource_by_external_id( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + "document", + "ext_123", + cascade_delete=True, + ) + ) + + assert response is None + assert request_kwargs["method"] == "delete" + assert request_kwargs["url"].endswith( + "/authorization/organizations/org_01EHT88Z8J8795GZNQ4ZP1J81T" + "/resources/document/ext_123" + ) + assert request_kwargs["json"] == {"cascade_delete": True} + + # --- list_resources --- + + def test_list_resources_with_results(self, capture_and_mock_http_client_request): + mock_resources = [ + { + "resource_type": "document", + "resource_id": "doc_1", + "meta": {"title": "Doc 1"}, + "created_at": "2024-01-01T00:00:00Z", + }, + { + "resource_type": "document", + "resource_id": "doc_2", + "meta": None, + "created_at": "2024-01-02T00:00:00Z", + }, + ] + mock_response = list_response_of(data=mock_resources) + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_response, 200 + ) + + result = syncify( + self.authorization.list_resources( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + ) + ) + + assert len(result.data) == 2 + assert result.data[0].resource_type == "document" + assert result.data[0].resource_id == "doc_1" + assert result.data[1].resource_id == "doc_2" + assert request_kwargs["method"] == "get" + assert request_kwargs["url"].endswith( + "/authorization/organizations/org_01EHT88Z8J8795GZNQ4ZP1J81T/resources" + ) + + def test_list_resources_empty(self, capture_and_mock_http_client_request): + mock_response = list_response_of(data=[]) + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_response, 200 + ) + + result = syncify( + self.authorization.list_resources( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + ) + ) + + assert len(result.data) == 0 + assert request_kwargs["method"] == "get" + + def test_list_resources_with_resource_type_slug_filter( + self, capture_and_mock_http_client_request + ): + mock_response = list_response_of( + data=[ + { + "resource_type": "document", + "resource_id": "doc_1", + "created_at": "2024-01-01T00:00:00Z", + } + ] + ) + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_response, 200 + ) + + syncify( + self.authorization.list_resources( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + resource_type_slug="document", + ) + ) + + assert request_kwargs["params"]["resource_type_slug"] == "document" + + def test_list_resources_with_pagination_params( + self, capture_and_mock_http_client_request + ): + mock_response = list_response_of(data=[]) + request_kwargs = capture_and_mock_http_client_request( + self.http_client, mock_response, 200 + ) + + syncify( + self.authorization.list_resources( + "org_01EHT88Z8J8795GZNQ4ZP1J81T", + limit=5, + after="cursor_abc", + order="asc", + ) + ) + + assert request_kwargs["params"]["limit"] == 5 + assert request_kwargs["params"]["after"] == "cursor_abc" + assert request_kwargs["params"]["order"] == "asc"