mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

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

Просмотр исходного кода 
* only GetUserByEmail if arg is an email

* fixing tests

* fix typo
Этот коммит содержится в:
Christopher Poile
2025-01-29 17:45:11 -05:00
коммит произвёл GitHub
родитель 05ca61c784
Коммит 28c561d643
10 изменённых файлов: 31 добавлений и 378 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

107
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, "").