From 806fce3030996a950175d3a614b53fa1e9b2dff3 Mon Sep 17 00:00:00 2001 From: Scott Bishel Date: Mon, 24 Feb 2025 11:05:17 -0700 Subject: [PATCH] MM-62760 - Allow Team Admins to view team email (#30170) * allow team admins to view team email. * Update server/channels/api4/team_test.go Co-authored-by: Caleb Roseland --------- Co-authored-by: Mattermost Build Co-authored-by: Caleb Roseland --- server/channels/api4/team.go | 10 ---------- server/channels/api4/team_test.go | 12 +----------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/server/channels/api4/team.go b/server/channels/api4/team.go index 325d6acb8c..8e3d0797d3 100644 --- a/server/channels/api4/team.go +++ b/server/channels/api4/team.go @@ -421,10 +421,6 @@ func regenerateTeamInviteId(c *Context, w http.ResponseWriter, r *http.Request) c.App.SanitizeTeam(*c.AppContext.Session(), patchedTeam) - if !*c.App.Config().PrivacySettings.ShowEmailAddress && !c.IsSystemAdmin() { - patchedTeam.Email = "" - } - auditRec.Success() auditRec.AddEventResultState(patchedTeam) auditRec.AddEventObjectType("team") @@ -492,12 +488,6 @@ func getTeamsForUser(c *Context, w http.ResponseWriter, r *http.Request) { c.App.SanitizeTeams(*c.AppContext.Session(), teams) - if !*c.App.Config().PrivacySettings.ShowEmailAddress && !c.IsSystemAdmin() { - for _, team := range teams { - team.Email = "" - } - } - js, err := json.Marshal(teams) if err != nil { c.Err = model.NewAppError("getTeamsForUser", "api.marshal_error", nil, "", http.StatusInternalServerError).Wrap(err) diff --git a/server/channels/api4/team_test.go b/server/channels/api4/team_test.go index 7d5d431f6d..751980edbe 100644 --- a/server/channels/api4/team_test.go +++ b/server/channels/api4/team_test.go @@ -985,7 +985,6 @@ func TestRegenerateTeamInviteId(t *testing.T) { assert.NotEqual(t, team.InviteId, "") assert.NotEqual(t, team.InviteId, "inviteid0") - *th.App.Config().PrivacySettings.ShowEmailAddress = true rteam, _, err := client.RegenerateTeamInviteId(context.Background(), team.Id) require.NoError(t, err) @@ -993,14 +992,6 @@ func TestRegenerateTeamInviteId(t *testing.T) { assert.NotEqual(t, team.InviteId, "") assert.NotEqual(t, rteam.Email, "") - *th.App.Config().PrivacySettings.ShowEmailAddress = false - rteam, _, err = client.RegenerateTeamInviteId(context.Background(), team.Id) - require.NoError(t, err) - - assert.NotEqual(t, team.InviteId, rteam.InviteId) - assert.NotEqual(t, team.InviteId, "") - assert.Equal(t, rteam.Email, "") - manager := th.SystemManagerClient th.RemovePermissionFromRole(model.PermissionInviteUser.Id, model.SystemManagerRoleId) _, _, err = manager.RegenerateTeamInviteId(context.Background(), team.Id) @@ -1967,7 +1958,6 @@ func TestGetTeamsForUserSanitization(t *testing.T) { require.NotEmpty(t, rteam.Email, "should not have sanitized email") require.NotEmpty(t, rteam.InviteId, "should have not sanitized inviteid") } - *th.App.Config().PrivacySettings.ShowEmailAddress = false rteams, _, err2 := th.Client.GetTeamsForUser(context.Background(), th.BasicUser.Id, "") require.NoError(t, err2) for _, rteam := range rteams { @@ -1975,7 +1965,7 @@ func TestGetTeamsForUserSanitization(t *testing.T) { continue } - require.Empty(t, rteam.Email, "should have sanitized email") + require.NotEmpty(t, rteam.Email, "should have not sanitized email") require.NotEmpty(t, rteam.InviteId, "should have not sanitized inviteid") } })