Migrating User Store VerifyEmail, GetByAuth and GetByEmail functions to sync by default (#10941)

cmd/mattermost/commands/roles_test.go

@@ -5,8 +5,6 @@ package commands
 
 import (
 	"testing"
-
-	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestAssignRole(t *testing.T) {
@@ -15,10 +13,9 @@ func TestAssignRole(t *testing.T) {
 
 	th.CheckCommand(t, "roles", "system_admin", th.BasicUser.Email)
 
-	if result := <-th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err != nil {
-		t.Fatal(result.Err)
+	if user, err := th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); err != nil {
+		t.Fatal(err)
 	} else {
-		user := result.Data.(*model.User)
 		if user.Roles != "system_user system_admin" {
 			t.Fatal("Got wrong roles:", user.Roles)
 		}
@@ -26,10 +23,9 @@ func TestAssignRole(t *testing.T) {
 
 	th.CheckCommand(t, "roles", "member", th.BasicUser.Email)
 
-	if result := <-th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err != nil {
-		t.Fatal(result.Err)
+	if user, err := th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); err != nil {
+		t.Fatal(err)
 	} else {
-		user := result.Data.(*model.User)
 		if user.Roles != "system_user" {
 			t.Fatal("Got wrong roles:", user.Roles, user.Id)
 		}

cmd/mattermost/commands/user.go

@@ -886,8 +886,8 @@ func verifyUserCmdF(command *cobra.Command, args []string) error {
 			CommandPrintErrorln("Unable to find user '" + args[i] + "'")
 			continue
 		}
-		if cresult := <-a.Srv.Store.User().VerifyEmail(user.Id, user.Email); cresult.Err != nil {
-			CommandPrintErrorln("Unable to verify '" + args[i] + "' email. Error: " + cresult.Err.Error())
+		if _, err := a.Srv.Store.User().VerifyEmail(user.Id, user.Email); err != nil {
+			CommandPrintErrorln("Unable to verify '" + args[i] + "' email. Error: " + err.Error())
 		}
 	}
 

cmd/mattermost/commands/user_test.go

@@ -48,10 +48,9 @@ func TestCreateUserWithoutTeam(t *testing.T) {
 
 	th.CheckCommand(t, "user", "create", "--email", email, "--password", "mypassword1", "--username", username)
 
-	if result := <-th.App.Srv.Store.User().GetByEmail(email); result.Err != nil {
-		t.Fatal(result.Err)
+	if user, err := th.App.Srv.Store.User().GetByEmail(email); err != nil {
+		t.Fatal(err)
 	} else {
-		user := result.Data.(*model.User)
 		require.Equal(t, email, user.Email)
 	}
 }
@@ -85,13 +84,12 @@ func TestChangeUserEmail(t *testing.T) {
 	newEmail := model.NewId() + "@mattermost-test.com"
 
 	th.CheckCommand(t, "user", "email", th.BasicUser.Username, newEmail)
-	if result := <-th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); result.Err == nil {
+	if _, err := th.App.Srv.Store.User().GetByEmail(th.BasicUser.Email); err == nil {
 		t.Fatal("should've updated to the new email")
 	}
-	if result := <-th.App.Srv.Store.User().GetByEmail(newEmail); result.Err != nil {
-		t.Fatal(result.Err)
+	if user, err := th.App.Srv.Store.User().GetByEmail(newEmail); err != nil {
+		t.Fatal(err)
 	} else {
-		user := result.Data.(*model.User)
 		if user.Email != newEmail {
 			t.Fatal("should've updated to the new email")
 		}

cmd/mattermost/commands/userargs.go

@@ -18,10 +18,7 @@ func getUsersFromUserArgs(a *app.App, userArgs []string) []*model.User {
 }
 
 func getUserFromUserArg(a *app.App, userArg string) *model.User {
-	var user *model.User
-	if result := <-a.Srv.Store.User().GetByEmail(userArg); result.Err == nil {
-		user = result.Data.(*model.User)
-	}
+	user, _ := a.Srv.Store.User().GetByEmail(userArg)
 
 	if user == nil {
 		if result := <-a.Srv.Store.User().GetByUsername(userArg); result.Err == nil {