[MM-62179] Fix: mmctl debug error when setting email (#29953)

* only GetUserByEmail if arg is an email

* fixing tests

* fix typo

server/cmd/mmctl/commands/team_users_test.go

@@ -48,12 +48,6 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 			Return(mockTeam, &model.Response{}, nil).
 			Times(1)
 
-		s.client.
-			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
-			Return(nil, nil, nil).
-			Times(1)
-
 		s.client.
 			EXPECT().
 			GetUserByUsername(context.TODO(), mockUser.Id, "").
@@ -92,7 +86,7 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 
 		s.client.
 			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
+			GetUserByUsername(context.TODO(), mockUser.Id, "").
 			Return(mockUser, nil, nil).
 			Times(1)
 
@@ -121,7 +115,7 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 
 		s.client.
 			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
+			GetUserByUsername(context.TODO(), mockUser.Id, "").
 			Return(mockUser, nil, nil).
 			Times(1)
 
@@ -148,12 +142,6 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 			Return(mockTeam, &model.Response{}, nil).
 			Times(1)
 
-		s.client.
-			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
-			Return(nil, nil, nil).
-			Times(1)
-
 		s.client.
 			EXPECT().
 			GetUserByUsername(context.TODO(), mockUser.Id, "").
@@ -182,12 +170,6 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 			Return(mockTeam, &model.Response{}, nil).
 			Times(1)
 
-		s.client.
-			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
-			Return(nil, nil, nil).
-			Times(1)
-
 		s.client.
 			EXPECT().
 			GetUserByUsername(context.TODO(), mockUser.Id, "").
@@ -226,7 +208,7 @@ func (s *MmctlUnitTestSuite) TestTeamUsersArchiveCmd() {
 
 		s.client.
 			EXPECT().
-			GetUserByEmail(context.TODO(), mockUser.Id, "").
+			GetUserByUsername(context.TODO(), mockUser.Id, "").
 			Return(mockUser, nil, nil).
 			Times(1)
 
@@ -286,12 +268,6 @@ func (s *MmctlUnitTestSuite) TestAddUsersCmd() {
 			Return(&mockTeam, &model.Response{}, nil).
 			Times(1)
 
-		s.client.
-			EXPECT().
-			GetUserByEmail(context.TODO(), "user1", "").
-			Return(nil, &model.Response{}, nil).
-			Times(1)
-
 		s.client.
 			EXPECT().
 			GetUserByUsername(context.TODO(), "user1", "").
@@ -322,7 +298,7 @@ func (s *MmctlUnitTestSuite) TestAddUsersCmd() {
 
 		s.client.
 			EXPECT().
-			GetUserByEmail(context.TODO(), "user1", "").
+			GetUserByUsername(context.TODO(), "user1", "").
 			Return(&mockUser, &model.Response{}, nil).
 			Times(1)
 
@@ -353,7 +329,7 @@ func (s *MmctlUnitTestSuite) TestAddUsersCmd() {
 
 		s.client.
 			EXPECT().
-			GetUserByEmail(context.TODO(), "user1", "").
+			GetUserByUsername(context.TODO(), "user1", "").
 			Return(&mockUser, &model.Response{}, nil).
 			Times(1)