diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33e674e..5511d1d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,4 +32,4 @@ jobs: - name: Run integration tests run: pnpm test # Make sure this command runs your integration tests env: - AUTHORIZER_IMAGE: quay.io/authorizer/authorizer:2.4.0-rc.7 + AUTHORIZER_IMAGE: quay.io/authorizer/authorizer:2.4.0-rc.9 diff --git a/__test__/admin.test.ts b/__test__/admin.test.ts index b436aca..47394ef 100644 --- a/__test__/admin.test.ts +++ b/__test__/admin.test.ts @@ -190,7 +190,7 @@ describe('Integration Tests - AuthorizerAdmin (graphql + rest)', () => { }); expect(addRes.errors).toHaveLength(0); - const listRes = await a.webhooks({ pagination: { limit: 50, page: 1 } }); + const listRes = await a.webhooks({ limit: 50, page: 1 }); expect(listRes.errors).toHaveLength(0); const created = listRes.data?.webhooks.find((w) => (w.event_name ?? '').startsWith(event), @@ -219,9 +219,7 @@ describe('Integration Tests - AuthorizerAdmin (graphql + rest)', () => { }); expect(addRes.errors).toHaveLength(0); - const listRes = await a.emailTemplates({ - pagination: { limit: 50, page: 1 }, - }); + const listRes = await a.emailTemplates({ limit: 50, page: 1 }); expect(listRes.errors).toHaveLength(0); const created = listRes.data?.email_templates.find( (t) => t.event_name === event, diff --git a/src/admin.ts b/src/admin.ts index b608103..82ba8a5 100644 --- a/src/admin.ts +++ b/src/admin.ts @@ -366,13 +366,13 @@ export class AuthorizerAdmin { // verificationRequests returns a paginated list of pending verification requests. verificationRequests = ( - params?: Types.PaginatedRequest, + params?: Types.PaginationRequest, ): Promise> => this.dispatch( 'VerificationRequests', ['graphql', 'rest'], { - query: `query _verification_requests($params: PaginatedRequest) { _verification_requests(params: $params) { pagination { ${paginationFragment} } verification_requests { id identifier token email expires created_at updated_at nonce redirect_uri } } }`, + query: `query _verification_requests($params: PaginationRequest) { _verification_requests(params: $params) { pagination { ${paginationFragment} } verification_requests { id identifier token email expires created_at updated_at nonce redirect_uri } } }`, operationName: '_verification_requests', op: '_verification_requests', }, @@ -515,13 +515,13 @@ export class AuthorizerAdmin { // webhooks returns a paginated list of webhooks. webhooks = ( - params?: Types.PaginatedRequest, + params?: Types.PaginationRequest, ): Promise> => this.dispatch( 'Webhooks', ['graphql', 'rest'], { - query: `query _webhooks($params: PaginatedRequest) { _webhooks(params: $params) { pagination { ${paginationFragment} } webhooks { ${webhookFragment} } } }`, + query: `query _webhooks($params: PaginationRequest) { _webhooks(params: $params) { pagination { ${paginationFragment} } webhooks { ${webhookFragment} } } }`, operationName: '_webhooks', op: '_webhooks', }, @@ -626,13 +626,13 @@ export class AuthorizerAdmin { // emailTemplates returns a paginated list of email templates. emailTemplates = ( - params?: Types.PaginatedRequest, + params?: Types.PaginationRequest, ): Promise> => this.dispatch( 'EmailTemplates', ['graphql', 'rest'], { - query: `query _email_templates($params: PaginatedRequest) { _email_templates(params: $params) { pagination { ${paginationFragment} } email_templates { ${emailTemplateFragment} } } }`, + query: `query _email_templates($params: PaginationRequest) { _email_templates(params: $params) { pagination { ${paginationFragment} } email_templates { ${emailTemplateFragment} } } }`, operationName: '_email_templates', op: '_email_templates', }, diff --git a/src/types.ts b/src/types.ts index c7f4430..a671067 100644 --- a/src/types.ts +++ b/src/types.ts @@ -643,11 +643,6 @@ export interface AdminMeta { is_multi_factor_auth_service_enabled: boolean; } -// PaginatedRequest wraps the pagination input for list queries. -export interface PaginatedRequest { - pagination?: PaginationRequest | null; -} - // ListUsersRequest is the admin _users query input. query is an optional // case-insensitive substring filter matched against email, given_name, // family_name and nickname. Empty/absent means no filter (full list).