Migrate User.Save to Sync by default (#11482)

* Migrate User.Save to Sync by default

* Make error testing more explicit

* Factor out else

* Fix some merge-related bugs

* Add some missing nil err test requirements

* Improve function signature

* Remove unused time import

* More test fixups

app/bot.go

@@ -16,11 +16,11 @@ import (
 
 // CreateBot creates the given bot and corresponding user.
 func (a *App) CreateBot(bot *model.Bot) (*model.Bot, *model.AppError) {
-	result := <-a.Srv.Store.User().Save(model.UserFromBot(bot))
-	if result.Err != nil {
-		return nil, result.Err
+	user, err := a.Srv.Store.User().Save(model.UserFromBot(bot))
+	if err != nil {
+		return nil, err
 	}
-	bot.UserId = result.Data.(*model.User).Id
+	bot.UserId = user.Id
 
 	savedBot, err := a.Srv.Store.Bot().Save(bot)
 	if err != nil {

app/slackimport.go

@@ -788,18 +788,17 @@ func (a *App) OldImportUser(team *model.Team, user *model.User) *model.User {
 
 	user.Roles = model.SYSTEM_USER_ROLE_ID
 
-	result := <-a.Srv.Store.User().Save(user)
-	if result.Err != nil {
-		mlog.Error(fmt.Sprintf("Error saving user. err=%v", result.Err))
+	ruser, err := a.Srv.Store.User().Save(user)
+	if err != nil {
+		mlog.Error(fmt.Sprintf("Error saving user. err=%v", err))
 		return nil
 	}
-	ruser := result.Data.(*model.User)
 
-	if _, err := a.Srv.Store.User().VerifyEmail(ruser.Id, ruser.Email); err != nil {
+	if _, err = a.Srv.Store.User().VerifyEmail(ruser.Id, ruser.Email); err != nil {
 		mlog.Error(fmt.Sprintf("Failed to set email verified err=%v", err))
 	}
 
-	if err := a.JoinUserToTeam(team, user, ""); err != nil {
+	if err = a.JoinUserToTeam(team, user, ""); err != nil {
 		mlog.Error(fmt.Sprintf("Failed to join team when importing err=%v", err))
 	}
 

app/user.go

@@ -293,12 +293,11 @@ func (a *App) createUser(user *model.User) (*model.User, *model.AppError) {
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.User().Save(user)
-	if result.Err != nil {
-		mlog.Error(fmt.Sprintf("Couldn't save the user err=%v", result.Err))
-		return nil, result.Err
+	ruser, err := a.Srv.Store.User().Save(user)
+	if err != nil {
+		mlog.Error(fmt.Sprintf("Couldn't save the user err=%v", err))
+		return nil, err
 	}
-	ruser := result.Data.(*model.User)
 
 	if user.EmailVerified {
 		if err := a.VerifyUserEmail(ruser.Id, user.Email); err != nil {