diff options
| author | George Goldberg <george@gberg.me> | 2018-10-18 14:32:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 14:32:36 +0100 |
| commit | 5d6d4502992af4120fed19a9db43960d6269b871 (patch) | |
| tree | 8666f2630575534b671b501020ea3d9d6e82f1b9 /app/export_converters.go | |
| parent | dc946f85168d6b375e185f53cb1a02636be6d7eb (diff) | |
| download | chat-5d6d4502992af4120fed19a9db43960d6269b871.tar.gz chat-5d6d4502992af4120fed19a9db43960d6269b871.tar.bz2 chat-5d6d4502992af4120fed19a9db43960d6269b871.zip | |
MM-12670: Accept and use "" for user/pass AuthService in import/export. (#9689)
Diffstat (limited to 'app/export_converters.go')
| -rw-r--r-- | app/export_converters.go | 8 |
1 files changed, 1 insertions, 7 deletions
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, |