From 880c08c0b0b9afed2fe555692e28e8ce5344b00b Mon Sep 17 00:00:00 2001 From: Stephen Barry Date: Tue, 22 Aug 2023 08:33:19 +0100 Subject: [PATCH] Apply prettier lint and rename GitlabSaasGroupsResponse -> GitlabDescendantGroupsResponse Signed-off-by: Stephen Barry --- .../src/lib/client.ts | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index 3675d7e779..681c0c7603 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -22,7 +22,7 @@ import { import { Logger } from 'winston'; import { GitLabGroup, - GitLabSaasGroupsResponse, + GitLabDescendantGroupsResponse, GitLabGroupMembersResponse, GitLabUser, } from './types'; @@ -105,7 +105,7 @@ export class GitLabClient { let endCursor: string | null = null; do { - const response: GitLabSaasGroupsResponse = await fetch( + const response: GitLabDescendantGroupsResponse = await fetch( `${this.config.baseUrl}/api/graphql`, { method: 'POST', @@ -191,27 +191,37 @@ export class GitLabClient { }, body: JSON.stringify({ variables: { group: groupPath, relations: relations, endCursor }, - query: /* GraphQL */ `query getGroupMembers($group: ID!, $relations: [GroupMemberRelation!], $endCursor: String) { - group(fullPath: $group) { - groupMembers(first: 100, relations: $relations, after: $endCursor) { - nodes { - user { - id - username - publicEmail - name - state - webUrl - avatarUrl + query: /* GraphQL */ ` + query getGroupMembers( + $group: ID! + $relations: [GroupMemberRelation!] + $endCursor: String + ) { + group(fullPath: $group) { + groupMembers( + first: 100 + relations: $relations + after: $endCursor + ) { + nodes { + user { + id + username + publicEmail + name + state + webUrl + avatarUrl + } + } + pageInfo { + endCursor + hasNextPage } - } - pageInfo { - endCursor - hasNextPage } } } - }`, + `, }), }, ).then(r => r.json());