-
Notifications
You must be signed in to change notification settings - Fork 54
feat!: standardize authorization list endpoint pagination #1553
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
015592d
b30f336
7c6eeb8
43986b4
e1e0ed4
1c26527
c1497e2
ab60468
d249bf5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| import { WorkOS } from '../workos'; | ||
| import { AutoPaginatable } from '../common/utils/pagination'; | ||
| import { fetchAndDeserialize } from '../common/utils/fetch-and-deserialize'; | ||
| import { | ||
| Role, | ||
| RoleList, | ||
|
|
@@ -22,15 +24,11 @@ import { | |
| RemoveOrganizationRolePermissionOptions, | ||
| Permission, | ||
| PermissionResponse, | ||
| PermissionList, | ||
| PermissionListResponse, | ||
| CreatePermissionOptions, | ||
| UpdatePermissionOptions, | ||
| ListPermissionsOptions, | ||
| AuthorizationResource, | ||
| AuthorizationResourceResponse, | ||
| AuthorizationResourceList, | ||
| AuthorizationResourceListResponse, | ||
| ListAuthorizationResourcesOptions, | ||
| GetAuthorizationResourceByExternalIdOptions, | ||
| UpdateAuthorizationResourceByExternalIdOptions, | ||
|
|
@@ -45,12 +43,12 @@ import { | |
| RemoveRoleAssignmentOptions, | ||
| RemoveRoleOptions, | ||
| RoleAssignment, | ||
| RoleAssignmentList, | ||
| RoleAssignmentListResponse, | ||
| RoleAssignmentResponse, | ||
| ListMembershipsForResourceByExternalIdOptions, | ||
| ListMembershipsForResourceOptions, | ||
| ListResourcesForMembershipOptions, | ||
| ListEffectivePermissionsOptions, | ||
| ListEffectivePermissionsByExternalIdOptions, | ||
| } from './interfaces'; | ||
| import { | ||
| deserializeEnvironmentRole, | ||
|
|
@@ -74,10 +72,11 @@ import { | |
| serializeRemoveRoleOptions, | ||
| serializeListMembershipsForResourceOptions, | ||
| serializeListResourcesForMembershipOptions, | ||
| serializeListEffectivePermissionsOptions, | ||
| } from './serializers'; | ||
| import { | ||
| AuthorizationOrganizationMembershipList, | ||
| AuthorizationOrganizationMembershipListResponse, | ||
| AuthorizationOrganizationMembership, | ||
| AuthorizationOrganizationMembershipResponse, | ||
| } from '../user-management/interfaces/organization-membership.interface'; | ||
| import { deserializeAuthorizationOrganizationMembership } from '../user-management/serializers/organization-membership.serializer'; | ||
|
|
||
|
|
@@ -242,19 +241,23 @@ export class Authorization { | |
|
|
||
| async listPermissions( | ||
| options?: ListPermissionsOptions, | ||
| ): Promise<PermissionList> { | ||
| const { data } = await this.workos.get<PermissionListResponse>( | ||
| '/authorization/permissions', | ||
| { query: options }, | ||
| ): Promise<AutoPaginatable<Permission>> { | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| '/authorization/permissions', | ||
| deserializePermission, | ||
| options, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| '/authorization/permissions', | ||
| deserializePermission, | ||
| params, | ||
| ), | ||
| options, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializePermission), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| async getPermission(slug: string): Promise<Permission> { | ||
|
|
@@ -321,19 +324,31 @@ export class Authorization { | |
|
|
||
| async listResources( | ||
| options: ListAuthorizationResourcesOptions = {}, | ||
| ): Promise<AuthorizationResourceList> { | ||
| const { data } = await this.workos.get<AuthorizationResourceListResponse>( | ||
| '/authorization/resources', | ||
| { query: serializeListAuthorizationResourcesOptions(options) }, | ||
| ): Promise<AutoPaginatable<AuthorizationResource>> { | ||
| const serializedOptions = | ||
| serializeListAuthorizationResourcesOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize< | ||
| AuthorizationResourceResponse, | ||
| AuthorizationResource | ||
| >( | ||
| this.workos, | ||
| '/authorization/resources', | ||
| deserializeAuthorizationResource, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize< | ||
| AuthorizationResourceResponse, | ||
| AuthorizationResource | ||
| >( | ||
| this.workos, | ||
| '/authorization/resources', | ||
| deserializeAuthorizationResource, | ||
| params, | ||
| ), | ||
| serializedOptions, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializeAuthorizationResource), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| async getResourceByExternalId( | ||
|
|
@@ -385,20 +400,25 @@ export class Authorization { | |
|
|
||
| async listRoleAssignments( | ||
| options: ListRoleAssignmentsOptions, | ||
| ): Promise<RoleAssignmentList> { | ||
| ): Promise<AutoPaginatable<RoleAssignment>> { | ||
| const { organizationMembershipId, ...queryOptions } = options; | ||
| const { data } = await this.workos.get<RoleAssignmentListResponse>( | ||
| `/authorization/organization_memberships/${organizationMembershipId}/role_assignments`, | ||
| { query: queryOptions }, | ||
| const endpoint = `/authorization/organization_memberships/${organizationMembershipId}/role_assignments`; | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize<RoleAssignmentResponse, RoleAssignment>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeRoleAssignment, | ||
| queryOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize<RoleAssignmentResponse, RoleAssignment>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeRoleAssignment, | ||
| params, | ||
| ), | ||
| queryOptions, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializeRoleAssignment), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| async assignRole(options: AssignRoleOptions): Promise<RoleAssignment> { | ||
|
|
@@ -426,63 +446,142 @@ export class Authorization { | |
|
|
||
| async listResourcesForMembership( | ||
| options: ListResourcesForMembershipOptions, | ||
| ): Promise<AuthorizationResourceList> { | ||
| ): Promise<AutoPaginatable<AuthorizationResource>> { | ||
| const { organizationMembershipId } = options; | ||
| const { data } = await this.workos.get<AuthorizationResourceListResponse>( | ||
| `/authorization/organization_memberships/${organizationMembershipId}/resources`, | ||
| { | ||
| query: serializeListResourcesForMembershipOptions(options), | ||
| }, | ||
| const endpoint = `/authorization/organization_memberships/${organizationMembershipId}/resources`; | ||
| const serializedOptions = | ||
| serializeListResourcesForMembershipOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize< | ||
| AuthorizationResourceResponse, | ||
| AuthorizationResource | ||
| >( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeAuthorizationResource, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize< | ||
| AuthorizationResourceResponse, | ||
| AuthorizationResource | ||
| >(this.workos, endpoint, deserializeAuthorizationResource, params), | ||
| serializedOptions, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializeAuthorizationResource), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| async listMembershipsForResource( | ||
| options: ListMembershipsForResourceOptions, | ||
| ): Promise<AuthorizationOrganizationMembershipList> { | ||
| ): Promise<AutoPaginatable<AuthorizationOrganizationMembership>> { | ||
| const { resourceId } = options; | ||
| const { data } = | ||
| await this.workos.get<AuthorizationOrganizationMembershipListResponse>( | ||
| `/authorization/resources/${resourceId}/organization_memberships`, | ||
| { | ||
| query: serializeListMembershipsForResourceOptions(options), | ||
| }, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializeAuthorizationOrganizationMembership), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| const endpoint = `/authorization/resources/${resourceId}/organization_memberships`; | ||
| const serializedOptions = | ||
| serializeListMembershipsForResourceOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize< | ||
| AuthorizationOrganizationMembershipResponse, | ||
| AuthorizationOrganizationMembership | ||
| >( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeAuthorizationOrganizationMembership, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize< | ||
| AuthorizationOrganizationMembershipResponse, | ||
| AuthorizationOrganizationMembership | ||
| >( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeAuthorizationOrganizationMembership, | ||
| params, | ||
| ), | ||
| serializedOptions, | ||
| ); | ||
| } | ||
|
|
||
| async listMembershipsForResourceByExternalId( | ||
| options: ListMembershipsForResourceByExternalIdOptions, | ||
| ): Promise<AuthorizationOrganizationMembershipList> { | ||
| ): Promise<AutoPaginatable<AuthorizationOrganizationMembership>> { | ||
| const { organizationId, resourceTypeSlug, externalId } = options; | ||
| const { data } = | ||
| await this.workos.get<AuthorizationOrganizationMembershipListResponse>( | ||
| `/authorization/organizations/${organizationId}/resources/${resourceTypeSlug}/${externalId}/organization_memberships`, | ||
| { | ||
| query: serializeListMembershipsForResourceOptions(options), | ||
| }, | ||
| ); | ||
| return { | ||
| object: 'list', | ||
| data: data.data.map(deserializeAuthorizationOrganizationMembership), | ||
| listMetadata: { | ||
| before: data.list_metadata.before, | ||
| after: data.list_metadata.after, | ||
| }, | ||
| }; | ||
| const endpoint = `/authorization/organizations/${organizationId}/resources/${resourceTypeSlug}/${externalId}/organization_memberships`; | ||
| const serializedOptions = | ||
| serializeListMembershipsForResourceOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize< | ||
| AuthorizationOrganizationMembershipResponse, | ||
| AuthorizationOrganizationMembership | ||
| >( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeAuthorizationOrganizationMembership, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize< | ||
| AuthorizationOrganizationMembershipResponse, | ||
| AuthorizationOrganizationMembership | ||
| >( | ||
| this.workos, | ||
| endpoint, | ||
| deserializeAuthorizationOrganizationMembership, | ||
| params, | ||
| ), | ||
| serializedOptions, | ||
| ); | ||
|
Comment on lines
447
to
+532
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🧹 Nitpick | 🔵 Trivial Strip path identifiers before serializing query options. These helpers encode 🤖 Prompt for AI Agents |
||
| } | ||
|
|
||
| async listEffectivePermissions( | ||
| options: ListEffectivePermissionsOptions, | ||
| ): Promise<AutoPaginatable<Permission>> { | ||
| const { organizationMembershipId, resourceId } = options; | ||
| const endpoint = `/authorization/resources/${resourceId}/organization_memberships/${organizationMembershipId}/permissions`; | ||
| const serializedOptions = serializeListEffectivePermissionsOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializePermission, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializePermission, | ||
| params, | ||
| ), | ||
| serializedOptions, | ||
| ); | ||
| } | ||
|
|
||
| async listEffectivePermissionsByExternalId( | ||
| options: ListEffectivePermissionsByExternalIdOptions, | ||
| ): Promise<AutoPaginatable<Permission>> { | ||
| const { | ||
| organizationMembershipId, | ||
| organizationId, | ||
| resourceTypeSlug, | ||
| externalId, | ||
| } = options; | ||
| const endpoint = `/authorization/organizations/${organizationId}/resources/${resourceTypeSlug}/${externalId}/organization_memberships/${organizationMembershipId}/permissions`; | ||
| const serializedOptions = serializeListEffectivePermissionsOptions(options); | ||
| return new AutoPaginatable( | ||
| await fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializePermission, | ||
| serializedOptions, | ||
| ), | ||
| (params) => | ||
| fetchAndDeserialize<PermissionResponse, Permission>( | ||
| this.workos, | ||
| endpoint, | ||
| deserializePermission, | ||
| params, | ||
| ), | ||
| serializedOptions, | ||
| ); | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { | ||
| "object": "list", | ||
| "data": [ | ||
| { | ||
| "object": "permission", | ||
| "id": "perm_01HXYZ123ABC456DEF789GHI", | ||
| "slug": "documents:read", | ||
| "name": "Read Documents", | ||
| "description": "Allows reading documents", | ||
| "resource_type_slug": "document", | ||
| "system": false, | ||
| "created_at": "2024-01-15T08:00:00.000Z", | ||
| "updated_at": "2024-01-15T08:00:00.000Z" | ||
| }, | ||
| { | ||
| "object": "permission", | ||
| "id": "perm_01HXYZ123ABC456DEF789GHJ", | ||
| "slug": "documents:edit", | ||
| "name": "Edit Documents", | ||
| "description": "Allows editing documents", | ||
| "resource_type_slug": "document", | ||
| "system": false, | ||
| "created_at": "2024-01-15T09:00:00.000Z", | ||
| "updated_at": "2024-01-15T09:00:00.000Z" | ||
| } | ||
| ], | ||
| "list_metadata": { | ||
| "before": null, | ||
| "after": "perm_01HXYZ123ABC456DEF789GHJ" | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AutoPaginatablechanges the runtime shape of these list responses.This no longer returns a plain
{ object, data, listMetadata }object. Insrc/common/utils/pagination.ts:1-63,AutoPaginatablestoreslist,apiCall, andoptionsas own instance fields, whiledataandlistMetadataare prototype getters. So spreads,Object.keys(), and JSON serialization will behave differently forlistPermissions()and the other converted authz list methods, which is a broader breaking change than the pagination fix itself. Please preserve the old enumerable shape or hide the internal fields before shipping this conversion.🤖 Prompt for AI Agents