diff --git a/server/cmd/mmctl/commands/bot_test.go b/server/cmd/mmctl/commands/bot_test.go index fd8716b50e..14bb4fb56e 100644 --- a/server/cmd/mmctl/commands/bot_test.go +++ b/server/cmd/mmctl/commands/bot_test.go @@ -56,12 +56,6 @@ func (s *MmctlUnitTestSuite) TestBotCreateCmd() { Return(&mockBot, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -116,12 +110,6 @@ func (s *MmctlUnitTestSuite) TestBotUpdateCmd() { mockBot := model.Bot{Username: "new-username", DisplayName: "some-name", Description: "some-text"} mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -148,12 +136,6 @@ func (s *MmctlUnitTestSuite) TestBotUpdateCmd() { cmd.Flags().String("username", "bot-username", "") cmd.Flags().Lookup("username").Changed = true - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -183,12 +165,6 @@ func (s *MmctlUnitTestSuite) TestBotUpdateCmd() { cmd.Flags().Lookup("description").Changed = true mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -417,12 +393,6 @@ func (s *MmctlUnitTestSuite) TestBotDisableCmd() { mockBot := model.Bot{Username: botArg, DisplayName: "some-name", Description: "some-text"} mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -446,12 +416,6 @@ func (s *MmctlUnitTestSuite) TestBotDisableCmd() { botArg := "a-bot" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -481,12 +445,6 @@ func (s *MmctlUnitTestSuite) TestBotDisableCmd() { cmd.Flags().Lookup("description").Changed = true mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -515,12 +473,6 @@ func (s *MmctlUnitTestSuite) TestBotEnableCmd() { mockBot := model.Bot{Username: botArg, DisplayName: "some-name", Description: "some-text"} mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -544,12 +496,6 @@ func (s *MmctlUnitTestSuite) TestBotEnableCmd() { botArg := "a-bot" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -579,12 +525,6 @@ func (s *MmctlUnitTestSuite) TestBotEnableCmd() { cmd.Flags().Lookup("description").Changed = true mockUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -615,24 +555,12 @@ func (s *MmctlUnitTestSuite) TestBotAssignCmd() { mockBotUser := model.User{Id: model.NewId()} mockNewOwner := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). Return(&mockBotUser, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -669,12 +597,6 @@ func (s *MmctlUnitTestSuite) TestBotAssignCmd() { Return(nil, &model.Response{}, errors.New("mock error")). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - err := botAssignCmdF(s.client, &cobra.Command{}, []string{botArg, userArg}) s.Require().NotNil(err) s.Require().Len(printer.GetLines(), 0) @@ -689,12 +611,6 @@ func (s *MmctlUnitTestSuite) TestBotAssignCmd() { mockBotUser := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). @@ -713,12 +629,6 @@ func (s *MmctlUnitTestSuite) TestBotAssignCmd() { Return(nil, &model.Response{}, errors.New("mock error")). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - err := botAssignCmdF(s.client, &cobra.Command{}, []string{botArg, userArg}) s.Require().NotNil(err) s.Require().Len(printer.GetLines(), 0) @@ -734,24 +644,12 @@ func (s *MmctlUnitTestSuite) TestBotAssignCmd() { mockBotUser := model.User{Id: model.NewId()} mockNewOwner := model.User{Id: model.NewId()} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), botArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), botArg, ""). Return(&mockBotUser, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). diff --git a/server/cmd/mmctl/commands/channel_users_test.go b/server/cmd/mmctl/commands/channel_users_test.go index 2e1e338b64..30b208195c 100644 --- a/server/cmd/mmctl/commands/channel_users_test.go +++ b/server/cmd/mmctl/commands/channel_users_test.go @@ -57,13 +57,13 @@ func (s *MmctlUnitTestSuite) TestChannelUsersAddCmdF() { EXPECT(). GetUserByEmail(context.TODO(), userEmail, ""). Return(&mockUser, &model.Response{}, nil). - Times(1) + Times(3) s.client. EXPECT(). AddChannelMember(context.TODO(), channelID, userID). Return(&model.ChannelMember{}, &model.Response{}, nil). - Times(1) + Times(2) err := channelUsersAddCmdF(s.client, cmd, []string{channelArg, userEmail}) s.Require().Nil(err) s.Len(printer.GetLines(), 0) @@ -133,11 +133,6 @@ func (s *MmctlUnitTestSuite) TestChannelUsersAddCmdF() { GetChannelByNameIncludeDeleted(context.TODO(), channelName, teamID, ""). Return(&mockChannel, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), nilUserArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) s.client. EXPECT(). GetUserByUsername(context.TODO(), nilUserArg, ""). @@ -148,16 +143,6 @@ func (s *MmctlUnitTestSuite) TestChannelUsersAddCmdF() { GetUser(context.TODO(), nilUserArg, ""). Return(nil, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userEmail, ""). - Return(&mockUser, &model.Response{}, nil). - Times(1) - s.client. - EXPECT(). - AddChannelMember(context.TODO(), channelID, userID). - Return(&model.ChannelMember{}, &model.Response{}, nil). - Times(1) err := channelUsersAddCmdF(s.client, cmd, []string{channelArg, nilUserArg, userEmail}) s.Require().ErrorContains(err, "unable to find user") s.Require().ErrorContains(err, nilUserArg) @@ -179,11 +164,6 @@ func (s *MmctlUnitTestSuite) TestChannelUsersAddCmdF() { GetChannelByNameIncludeDeleted(context.TODO(), channelName, teamID, ""). Return(&mockChannel, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userEmail, ""). - Return(&mockUser, &model.Response{}, nil). - Times(1) s.client. EXPECT(). @@ -293,6 +273,12 @@ func (s *MmctlUnitTestSuite) TestChannelUsersRemoveCmd() { Return(foundTeam, &model.Response{}, nil). Times(1) + s.client. + EXPECT(). + GetUserByEmail(context.TODO(), userEmail, ""). + Return(&mockUser, &model.Response{}, nil). + Times(1) + s.client. EXPECT(). GetChannelByNameIncludeDeleted(context.TODO(), channelName, foundTeam.Id, ""). @@ -367,7 +353,7 @@ func (s *MmctlUnitTestSuite) TestChannelUsersRemoveCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), mockUser2.Email, ""). + GetUserByUsername(context.TODO(), mockUser2.Email, ""). Return(&mockUser2, &model.Response{}, nil). Times(1) @@ -470,12 +456,6 @@ func (s *MmctlUnitTestSuite) TestChannelUsersRemoveCmd() { Return(foundChannel, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userEmail, ""). - Return(&mockUser, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). RemoveUserFromChannel(context.TODO(), foundChannel.Id, mockUser.Id). diff --git a/server/cmd/mmctl/commands/command_test.go b/server/cmd/mmctl/commands/command_test.go index 3956111517..109ead94a4 100644 --- a/server/cmd/mmctl/commands/command_test.go +++ b/server/cmd/mmctl/commands/command_test.go @@ -66,7 +66,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { cmd.Flags().String("autocompleteDesc", autocompleteDesc, "") cmd.Flags().String("autocompleteHint", autocompleteHint, "") - // createCommandCmdF will call getTeamFromTeamArg, getUserFromUserArg which then calls GetUserByEmail + // createCommandCmdF will call getTeamFromTeamArg, getUserFromUserArg which then calls GetUserByUsername s.client. EXPECT(). GetTeam(context.TODO(), teamArg, ""). @@ -74,7 +74,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), creatorIDArg, ""). + GetUserByUsername(context.TODO(), creatorIDArg, ""). Return(&mockUser, &model.Response{}, nil). Times(1) s.client. @@ -122,7 +122,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), creatorIDArg, ""). + GetUserByUsername(context.TODO(), creatorIDArg, ""). Return(&mockUser, &model.Response{}, nil). Times(1) s.client. @@ -202,7 +202,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), creatorIDArg, ""). + GetUserByUsername(context.TODO(), creatorIDArg, ""). Return(&mockUser, &model.Response{}, nil). Times(1) @@ -253,7 +253,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), creatorIDArg, ""). + GetUserByUsername(context.TODO(), creatorIDArg, ""). Return(&mockUser, &model.Response{}, nil). Times(1) @@ -318,7 +318,7 @@ func (s *MmctlUnitTestSuite) TestCommandCreateCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), creatorIDArg, ""). + GetUserByUsername(context.TODO(), creatorIDArg, ""). Return(&mockUser, &model.Response{}, nil). Times(1) mockError := errors.New("mock error, simulated error for CreateCommand") @@ -540,7 +540,7 @@ func (s *MmctlUnitTestSuite) TestCommandModifyCmd() { "--post=" + strconv.FormatBool(method2Bool(mockCommandModified.Method)), } - // modifyCommandCmdF will call getCommandById, GetUserByEmail and UpdateCommand + // modifyCommandCmdF will call getCommandById, GetUserByUsername and UpdateCommand s.client. EXPECT(). GetCommandById(context.TODO(), arg). @@ -548,7 +548,7 @@ func (s *MmctlUnitTestSuite) TestCommandModifyCmd() { Times(1) s.client. EXPECT(). - GetUserByEmail(context.TODO(), mockCommandModified.CreatorId, ""). + GetUserByUsername(context.TODO(), mockCommandModified.CreatorId, ""). Return(&model.User{Id: mockCommandModified.CreatorId}, &model.Response{}, nil). Times(1) s.client. @@ -620,11 +620,6 @@ func (s *MmctlUnitTestSuite) TestCommandModifyCmd() { GetCommandById(context.TODO(), arg). Return(&mockCommand, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), bogusUsername, ""). - Return(nil, &model.Response{}, nil). - Times(1) s.client. EXPECT(). GetUserByUsername(context.TODO(), bogusUsername, ""). diff --git a/server/cmd/mmctl/commands/permission_role_test.go b/server/cmd/mmctl/commands/permission_role_test.go index 8674e8402f..7f8ae2e4bb 100644 --- a/server/cmd/mmctl/commands/permission_role_test.go +++ b/server/cmd/mmctl/commands/permission_role_test.go @@ -38,12 +38,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() { Return(mockRole, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Username, ""). @@ -91,12 +85,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() { Times(1) for _, user := range []*model.User{mockUser1, mockUser2} { - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), user.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), user.Username, ""). @@ -110,12 +98,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() { Times(1) } - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), notFoundUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), notFoundUser.Username, ""). @@ -171,12 +153,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() { Return(mockRole, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Username, ""). @@ -203,12 +179,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() { Return(mockRole, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), requestedUser, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), requestedUser, ""). @@ -241,12 +211,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() { Roles: fmt.Sprintf("system_user %s team_admin", roleName), } - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Username, ""). @@ -284,12 +248,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() { } for _, user := range []*model.User{mockUser1, mockUser2} { - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), user.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), user.Username, ""). @@ -303,12 +261,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() { Times(1) } - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), notFoundUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), notFoundUser.Username, ""). @@ -335,12 +287,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() { Roles: "system_user", } - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Username, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Username, ""). @@ -355,12 +301,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() { s.Run("Unassigning a user that is not found", func() { requestedUser := "user99" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), requestedUser, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), requestedUser, ""). diff --git a/server/cmd/mmctl/commands/team_users_test.go b/server/cmd/mmctl/commands/team_users_test.go index 9bd0b3acf0..803dfd0535 100644 --- a/server/cmd/mmctl/commands/team_users_test.go +++ b/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) diff --git a/server/cmd/mmctl/commands/token_test.go b/server/cmd/mmctl/commands/token_test.go index 8a97de1ebc..1778ae60f8 100644 --- a/server/cmd/mmctl/commands/token_test.go +++ b/server/cmd/mmctl/commands/token_test.go @@ -24,12 +24,6 @@ func (s *MmctlUnitTestSuite) TestGenerateTokenForAUserCmd() { mockUser := model.User{Id: "userId1", Email: "user1@example.com", Username: "user1"} mockToken := model.UserAccessToken{Token: "token-id", Description: "token-desc"} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -58,12 +52,6 @@ func (s *MmctlUnitTestSuite) TestGenerateTokenForAUserCmd() { printer.Clean() userArg := "some-text" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -87,12 +75,6 @@ func (s *MmctlUnitTestSuite) TestGenerateTokenForAUserCmd() { userArg := "user1" mockUser := model.User{Id: "userId1", Email: "user1@example.com", Username: "user1"} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -126,12 +108,6 @@ func (s *MmctlUnitTestSuite) TestListTokensOfAUserCmdF() { mockToken1 := model.UserAccessToken{IsActive: true, Id: "token-1-id", Description: "token-1-desc"} mockToken2 := model.UserAccessToken{IsActive: false, Id: "token-2-id", Description: "token-2-desc"} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Id, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Id, ""). @@ -204,12 +180,6 @@ func (s *MmctlUnitTestSuite) TestListTokensOfAUserCmdF() { command.Flags().Bool("active", false, "") command.Flags().Bool("inactive", false, "") - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). diff --git a/server/cmd/mmctl/commands/user_test.go b/server/cmd/mmctl/commands/user_test.go index 27d7238e3a..49c8c6d3a4 100644 --- a/server/cmd/mmctl/commands/user_test.go +++ b/server/cmd/mmctl/commands/user_test.go @@ -111,12 +111,6 @@ func (s *MmctlUnitTestSuite) TestUserActivateCmd() { Return(&mockUser0, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), emailArgs[1], ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), emailArgs[1], ""). @@ -327,12 +321,6 @@ func (s *MmctlUnitTestSuite) TestDeactivateUserCmd() { Return(&mockUser0, &model.Response{}, nil). Times(1) - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), emailArgs[1], ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("mock error")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), emailArgs[1], ""). @@ -680,12 +668,6 @@ func (s *MmctlUnitTestSuite) TestSearchUserCmd() { printer.Clean() usernameArg := "exampleUser" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), usernameArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), usernameArg, ""). @@ -703,12 +685,6 @@ func (s *MmctlUnitTestSuite) TestSearchUserCmd() { printer.Clean() userArg := "exampleUser" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -1549,12 +1525,6 @@ func (s *MmctlUnitTestSuite) TestUpdateUserEmailCmd() { userArg := "testUser" emailArg := "example@example.com" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -1581,12 +1551,6 @@ func (s *MmctlUnitTestSuite) TestUpdateUserEmailCmd() { currentUser := model.User{Username: "testUser", Password: "password", Email: "email"} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -1614,12 +1578,6 @@ func (s *MmctlUnitTestSuite) TestUpdateUserEmailCmd() { currentUser := model.User{Username: "testUser", Password: "password", Email: "email"} updatedUser := model.User{Username: "testUser", Password: "password", Email: emailArg} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -1678,12 +1636,6 @@ func (s *MmctlUnitTestSuite) TestUpdateUserEmailCmd() { currentUser := model.User{Username: "testUser", Password: "password", Email: "email"} updatedUser := model.User{Username: "testUser", Password: "password", Email: emailArg} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("no user found with the given email")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -1716,7 +1668,7 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), "userId", ""). + GetUserByUsername(context.TODO(), "userId", ""). Return(&model.User{Id: "userId"}, nil, nil). Times(1) @@ -1735,12 +1687,6 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() { s.Run("Cannot find one user", func() { printer.Clean() - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), "userId", ""). - Return(nil, nil, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), "userId", ""). @@ -1774,7 +1720,7 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), "userId", ""). + GetUserByUsername(context.TODO(), "userId", ""). Return(&model.User{Id: "userId"}, nil, nil). Times(1) @@ -1803,12 +1749,6 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() { for _, user := range users { if user == "notfounduser" { - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), user, ""). - Return(nil, nil, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), user, ""). @@ -1823,7 +1763,7 @@ func (s *MmctlUnitTestSuite) TestResetUserMfaCmd() { } else { s.client. EXPECT(). - GetUserByEmail(context.TODO(), user, ""). + GetUserByUsername(context.TODO(), user, ""). Return(&model.User{Id: user}, nil, nil). Times(1) } @@ -2230,12 +2170,6 @@ func (s *MmctlUnitTestSuite) TestUserDeactivateCmd() { usernameArg := "ExampleUser" mockUser := model.User{Username: usernameArg, Email: emailArg} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), usernameArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), usernameArg, ""). @@ -2258,12 +2192,6 @@ func (s *MmctlUnitTestSuite) TestUserDeactivateCmd() { printer.Clean() mockUser := model.User{Id: "userId1", Username: "ExampleUser", Email: "example@exam.com"} - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), mockUser.Id, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), mockUser.Id, ""). @@ -2382,12 +2310,6 @@ func (s *MmctlUnitTestSuite) TestUserDeactivateCmd() { argUsers := []model.User{mockUser1, mockUser2, mockUser3} // mockUser1 - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), argsDelete[0], ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), argsDelete[0], ""). @@ -2408,11 +2330,6 @@ func (s *MmctlUnitTestSuite) TestUserDeactivateCmd() { Times(1) // mockUser3 - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), argsDelete[2], ""). - Return(nil, &model.Response{}, nil). - Times(1) s.client. EXPECT(). GetUserByUsername(context.TODO(), argsDelete[2], ""). @@ -2507,12 +2424,6 @@ func (s *MmctlUnitTestSuite) TestVerifyUserEmailWithoutTokenCmd() { printer.Clean() userArg := "bad-user-id" - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userArg, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, errors.New("")). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userArg, ""). @@ -2618,12 +2529,6 @@ func (s *MmctlUnitTestSuite) TestUserConvertCmd() { cmd.Flags().String("email", "example@example.com", "") cmd.Flags().String("username", "example-user", "") - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userNameArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userNameArg, ""). @@ -2698,12 +2603,6 @@ func (s *MmctlUnitTestSuite) TestUserConvertCmd() { cmd.Flags().String("email", "example@example.com", "") cmd.Flags().String("username", "example-user", "") - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), userNameArg, ""). - Return(nil, &model.Response{}, nil). - Times(1) - s.client. EXPECT(). GetUserByUsername(context.TODO(), userNameArg, ""). diff --git a/server/cmd/mmctl/commands/userargs.go b/server/cmd/mmctl/commands/userargs.go index f899faaff1..7fec516c63 100644 --- a/server/cmd/mmctl/commands/userargs.go +++ b/server/cmd/mmctl/commands/userargs.go @@ -26,7 +26,7 @@ func getUsersFromUserArgs(c client.Client, userArgs []string) []*model.User { func getUserFromUserArg(c client.Client, userArg string) *model.User { var user *model.User - if !checkDots(userArg) { + if !checkDots(userArg) && model.IsValidEmail(userArg) { user, _, _ = c.GetUserByEmail(context.TODO(), userArg, "") } @@ -75,7 +75,7 @@ func getUserFromArg(c client.Client, userArg string) (*model.User, error) { var user *model.User var response *model.Response var err error - if !checkDots(userArg) { + if !checkDots(userArg) && model.IsValidEmail(userArg) { user, response, err = c.GetUserByEmail(context.TODO(), userArg, "") if err != nil { nErr := ExtractErrorFromResponse(response, err) diff --git a/server/cmd/mmctl/commands/userargs_test.go b/server/cmd/mmctl/commands/userargs_test.go index d732564e21..70c4c22532 100644 --- a/server/cmd/mmctl/commands/userargs_test.go +++ b/server/cmd/mmctl/commands/userargs_test.go @@ -18,11 +18,6 @@ func (s *MmctlUnitTestSuite) TestGetUserFromArgs() { notFoundEmail := "emailNotfound@notfound.com" notFoundErr := errors.New("user not found") printer.Clean() - s.client. - EXPECT(). - GetUserByEmail(context.TODO(), notFoundEmail, ""). - Return(nil, &model.Response{StatusCode: http.StatusNotFound}, notFoundErr). - Times(1) s.client. EXPECT(). GetUserByUsername(context.TODO(), notFoundEmail, ""). diff --git a/server/cmd/mmctl/commands/webhook_test.go b/server/cmd/mmctl/commands/webhook_test.go index 677de3db71..27172bb784 100644 --- a/server/cmd/mmctl/commands/webhook_test.go +++ b/server/cmd/mmctl/commands/webhook_test.go @@ -271,7 +271,7 @@ func (s *MmctlUnitTestSuite) TestCreateIncomingWebhookCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), emailID, ""). + GetUserByUsername(context.TODO(), emailID, ""). Return(&mockUser, &model.Response{}, nil). Times(1) @@ -315,7 +315,7 @@ func (s *MmctlUnitTestSuite) TestCreateIncomingWebhookCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), emailID, ""). + GetUserByUsername(context.TODO(), emailID, ""). Return(&mockUser, &model.Response{}, nil). Times(1) @@ -460,7 +460,7 @@ func (s *MmctlUnitTestSuite) TestCreateOutgoingWebhookCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), emailID, ""). + GetUserByUsername(context.TODO(), emailID, ""). Return(&mockUser, &model.Response{}, nil). Times(1) @@ -506,7 +506,7 @@ func (s *MmctlUnitTestSuite) TestCreateOutgoingWebhookCmd() { s.client. EXPECT(). - GetUserByEmail(context.TODO(), emailID, ""). + GetUserByUsername(context.TODO(), emailID, ""). Return(&mockUser, &model.Response{}, nil). Times(1)