Update user search to match against username, full name, nickname and email (#4421)

store/sql_user_store.go

@@ -19,10 +19,10 @@ const (
 	MISSING_AUTH_ACCOUNT_ERROR        = "store.sql_user.get_by_auth.missing_account.app_error"
 	PROFILES_IN_CHANNEL_CACHE_SIZE    = 5000
 	PROFILES_IN_CHANNEL_CACHE_SEC     = 900 // 15 mins
-	USER_SEARCH_OPTION_USERNAME_ONLY  = "username_only"
+	USER_SEARCH_OPTION_NAMES_ONLY     = "names_only"
 	USER_SEARCH_OPTION_ALLOW_INACTIVE = "allow_inactive"
-	USER_SEARCH_TYPE_ALL              = "Username, FirstName, LastName, Nickname"
-	USER_SEARCH_TYPE_USERNAME         = "Username"
+	USER_SEARCH_TYPE_NAMES            = "Username, FirstName, LastName, Nickname"
+	USER_SEARCH_TYPE_ALL              = "Username, FirstName, LastName, Nickname, Email"
 )
 
 type SqlUserStore struct {
@@ -61,8 +61,8 @@ func (us SqlUserStore) CreateIndexesIfNotExists() {
 	us.CreateIndexIfNotExists("idx_users_create_at", "Users", "CreateAt")
 	us.CreateIndexIfNotExists("idx_users_delete_at", "Users", "DeleteAt")
 
-	us.CreateFullTextIndexIfNotExists("idx_users_username_txt", "Users", USER_SEARCH_TYPE_USERNAME)
-	us.CreateFullTextIndexIfNotExists("idx_users_all_names_txt", "Users", USER_SEARCH_TYPE_ALL)
+	us.CreateFullTextIndexIfNotExists("idx_users_all_txt", "Users", USER_SEARCH_TYPE_ALL)
+	us.CreateFullTextIndexIfNotExists("idx_users_names_txt", "Users", USER_SEARCH_TYPE_NAMES)
 }
 
 func (us SqlUserStore) Save(user *model.User) StoreChannel {
@@ -1212,8 +1212,8 @@ func (us SqlUserStore) performSearch(searchQuery string, term string, options ma
 	}
 
 	searchType := USER_SEARCH_TYPE_ALL
-	if ok := options[USER_SEARCH_OPTION_USERNAME_ONLY]; ok {
-		searchType = USER_SEARCH_TYPE_USERNAME
+	if ok := options[USER_SEARCH_OPTION_NAMES_ONLY]; ok {
+		searchType = USER_SEARCH_TYPE_NAMES
 	}
 
 	if ok := options[USER_SEARCH_OPTION_ALLOW_INACTIVE]; ok {