From 5d6d4502992af4120fed19a9db43960d6269b871 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 18 Oct 2018 14:32:36 +0100 Subject: MM-12670: Accept and use "" for user/pass AuthService in import/export. (#9689) --- app/export_converters.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'app/export_converters.go') diff --git a/app/export_converters.go b/app/export_converters.go index 3b536c6e3..b73536c7f 100644 --- a/app/export_converters.go +++ b/app/export_converters.go @@ -38,18 +38,12 @@ func ImportLineFromChannel(channel *model.ChannelForExport) *LineImportData { } func ImportLineFromUser(user *model.User) *LineImportData { - // Bulk Importer doesn't accept "empty string" for AuthService. - var authService *string - if user.AuthService != "" { - authService = &user.AuthService - } - return &LineImportData{ Type: "user", User: &UserImportData{ Username: &user.Username, Email: &user.Email, - AuthService: authService, + AuthService: &user.AuthService, AuthData: user.AuthData, Nickname: &user.Nickname, FirstName: &user.FirstName, -- cgit v1.2.3-1-g7c22