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

app/oauth.go

@@ -594,22 +594,21 @@ func (a *App) CompleteSwitchWithOAuth(service string, userData io.Reader, email
 		return nil, model.NewAppError("CompleteSwitchWithOAuth", "api.user.complete_switch_with_oauth.blank_email.app_error", nil, "", http.StatusBadRequest)
 	}
 
-	result := <-a.Srv.Store.User().GetByEmail(email)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	user := result.Data.(*model.User)
-
-	if err := a.RevokeAllSessions(user.Id); err != nil {
+	user, err := a.Srv.Store.User().GetByEmail(email)
+	if err != nil {
 		return nil, err
 	}
 
-	if result = <-a.Srv.Store.User().UpdateAuthData(user.Id, service, &authData, ssoEmail, true); result.Err != nil {
+	if err = a.RevokeAllSessions(user.Id); err != nil {
+		return nil, err
+	}
+
+	if result := <-a.Srv.Store.User().UpdateAuthData(user.Id, service, &authData, ssoEmail, true); result.Err != nil {
 		return nil, result.Err
 	}
 
 	a.Srv.Go(func() {
-		if err := a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, a.GetSiteURL()); err != nil {
+		if err = a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, a.GetSiteURL()); err != nil {
 			mlog.Error(err.Error())
 		}
 	})