From fae0735ee03778f9995e717f2c31d0ca4183b23b Mon Sep 17 00:00:00 2001
From: Matteo Silvestri <matteosilv@gmail.com>
Date: Mon, 25 Sep 2023 11:59:01 +0200
Subject: [PATCH] fix: use publicEmail in GitLab client

client was using commitEmail that is visible only for self-managed GitLab admins.
publicEmail is visible, but only if the user explicitly enable the corresponding setting on GitLab.

Signed-off-by: Matteo Silvestri <matteosilv@gmail.com>
---
 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 79ae328ce2..0b69ded359 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/client.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/client.ts
@@ -205,7 +205,7 @@ export class GitLabClient {
                       user {
                         id
                         username
-                        commitEmail
+                        publicEmail
                         name
                         state
                         webUrl
@@ -240,7 +240,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 a339ac57e4..5a4082eec3 100644
--- a/plugins/catalog-backend-module-gitlab/src/lib/types.ts
+++ b/plugins/catalog-backend-module-gitlab/src/lib/types.ts
@@ -64,7 +64,7 @@ export type GitLabGroupMembersResponse = {
           user: {
             id: string;
             username: string;
-            commitEmail: string;
+            publicEmail: string;
             name: string;
             state: string;
             webUrl: string;