Fix bug in Slack Conversation adapter to make emails case-insensitive

Author: mike-gregory-ovo

adapters/slack/conversation/conversation.go

@@ -181,10 +181,10 @@ func (c *Conversation) Get(_ context.Context) ([]string, error) {
 
 	for _, user := range *users {
 		if !user.IsBot {
-			emails = append(emails, user.Profile.Email)
+			emails = append(emails, strings.ToLower(user.Profile.Email))
 
 			// Add the email -> ID map for use with Remove method.
-			c.cache[user.Profile.Email] = user.ID
+			c.cache[strings.ToLower(user.Profile.Email)] = user.ID
 		}
 	}
 
@@ -200,7 +200,7 @@ func (c *Conversation) Add(_ context.Context, emails []string) error {
 	slackIds := make([]string, len(emails))
 
 	for index, email := range emails {
-		user, err := c.client.GetUserByEmail(email)
+		user, err := c.client.GetUserByEmail(strings.ToLower(email))
 		if err != nil {
 			return fmt.Errorf("slack.conversation.add.getuserbyemail(%s) -> %w", email, err)
 		}
@@ -228,7 +228,7 @@ func (c *Conversation) Remove(_ context.Context, emails []string) error {
 	}
 
 	for _, email := range emails {
-		err := c.client.KickUserFromConversation(c.conversationName, c.cache[email])
+		err := c.client.KickUserFromConversation(c.conversationName, c.cache[strings.ToLower(email)])
 		if err != nil {
 			if c.MuteRestrictedErrOnKickFromPublic && strings.Contains(err.Error(), "restricted_action") {
 				c.Logger.Println("Cannot kick from public channel, but error is muted by configuration - continuing")

adapters/slack/conversation/conversation_internal_test.go

@@ -121,6 +121,7 @@ func TestConversation_Add(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+//nolint:funlen
 func TestConversation_Remove(t *testing.T) {
 	t.Parallel()
 
@@ -168,6 +169,36 @@ func TestConversation_Remove(t *testing.T) {
 
 		assert.NoError(t, err)
 	})
+
+	t.Run("Check case sensitivity", func(t *testing.T) {
+		t.Parallel()
+
+		slackClient := newMockISlackConversation(t)
+		adapter := New(&slack.Client{}, "test")
+		adapter.client = slackClient
+
+		slackClient.EXPECT().GetUsersInConversation(&slack.GetUsersInConversationParameters{
+			ChannelID: "test",
+			Cursor:    "",
+			Limit:     50,
+		}).Return([]string{"foo", "bar"}, "", nil)
+
+		slackClient.EXPECT().GetUsersInfo("foo", "bar").Return(&[]slack.User{
+			// Capitalise the letter E in email.
+			{ID: "foo", IsBot: false, Profile: slack.UserProfile{Email: "foo@Email"}},
+			{ID: "bar", IsBot: false, Profile: slack.UserProfile{Email: "bar@Email"}},
+		}, nil)
+
+		_, _ = adapter.Get(ctx)
+
+		slackClient.EXPECT().KickUserFromConversation("test", "foo").Return(nil)
+		slackClient.EXPECT().KickUserFromConversation("test", "bar").Return(nil)
+
+		// Capitalise the first letter of each email.
+		err := adapter.Remove(ctx, []string{"Foo@email", "Bar@email"})
+
+		assert.NoError(t, err)
+	})
 }
 
 //nolint:funlen