From 412c4660f0ebab7c9988014d768501c753cc8a91 Mon Sep 17 00:00:00 2001 From: Scott Guymer Date: Tue, 22 Jul 2025 17:32:19 +0200 Subject: [PATCH] Apply to onMembershipChangedInTeam Signed-off-by: Scott Guymer --- .../GithubMultiOrgEntityProvider.test.ts | 18 +----------------- .../providers/GithubMultiOrgEntityProvider.ts | 6 +++--- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts index 2186b11f50..1aa1af46d7 100644 --- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts +++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.test.ts @@ -2306,23 +2306,7 @@ describe('GithubMultiOrgEntityProvider', () => { organization: { teams: { pageInfo: { hasNextPage: false }, - nodes: [ - { - slug: 'team', - combinedSlug: 'orgA/team', - name: 'TeamA', - description: 'The one and only team', - avatarUrl: 'http://example.com/team.jpeg', - editTeamUrl: 'https://example.com', - parentTeam: { - slug: 'parent', - }, - members: { - pageInfo: { hasNextPage: false }, - nodes: [], - }, - }, - ], + nodes: [], }, }, }) diff --git a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts index 6a0ecd299a..a1c6a17209 100644 --- a/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts +++ b/plugins/catalog-backend-module-github/src/providers/GithubMultiOrgEntityProvider.ts @@ -801,15 +801,15 @@ export class GithubMultiOrgEntityProvider implements EntityProvider { headers: orgHeaders, }); - const { teams } = await getOrganizationTeamsFromUsers( + const { teams } = await getOrganizationTeamsForUser( orgClient, userOrg, - [login], + login, this.defaultMultiOrgTeamTransformer.bind(this), ); if (areGroupEntities(teams)) { - assignGroupsToUsers([user], teams); + assignGroupsToUser(user, teams); } }