From 0b569236eb2e2f82664dd5e7d6f482735c9f8ae8 Mon Sep 17 00:00:00 2001 From: Stephen Barry Date: Tue, 1 Aug 2023 10:37:31 +0100 Subject: [PATCH] Switch from commitEmail to publicEmail for email attribute Signed-off-by: Stephen Barry --- plugins/catalog-backend-module-gitlab/src/lib/client.ts | 4 ++-- plugins/catalog-backend-module-gitlab/src/lib/types.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/catalog-backend-module-gitlab/src/lib/client.ts b/plugins/catalog-backend-module-gitlab/src/lib/client.ts index e37d7f27dc..fa4ccf9f97 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts @@ -120,7 +120,7 @@ export class GitLabClient { user { id username - commitEmail + publicEmail name state webUrl @@ -156,7 +156,7 @@ export class GitLabClient { const formattedUserResponse = { id: Number(userItem.user.id.replace(/^gid:\/\/gitlab\/User\//, '')), username: userItem.user.username, - email: userItem.user.commitEmail, + email: userItem.user.publicEmail, name: userItem.user.name, state: userItem.user.state, web_url: userItem.user.webUrl, diff --git a/plugins/catalog-backend-module-gitlab/src/lib/types.ts b/plugins/catalog-backend-module-gitlab/src/lib/types.ts index a00c66b4a7..651fbb00a6 100644 --- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts +++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts @@ -80,7 +80,7 @@ export type GitLabSaasUsersResponse = { user: { id: string; username: string; - commitEmail: string; + publicEmail: string; name: string; state: string; webUrl: string;