From 5d6d4502992af4120fed19a9db43960d6269b871 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
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 +-------
 app/import_validators.go      | 4 ----
 app/import_validators_test.go | 5 ++---
 i18n/en.json                  | 4 ----
 4 files changed, 3 insertions(+), 18 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,
diff --git a/app/import_validators.go b/app/import_validators.go
index 2522d709f..e0282666c 100644
--- a/app/import_validators.go
+++ b/app/import_validators.go
@@ -199,10 +199,6 @@ func validateUserImportData(data *UserImportData) *model.AppError {
 		return model.NewAppError("BulkImport", "app.import.validate_user_import_data.email_length.error", nil, "", http.StatusBadRequest)
 	}
 
-	if data.AuthService != nil && len(*data.AuthService) == 0 {
-		return model.NewAppError("BulkImport", "app.import.validate_user_import_data.auth_service_length.error", nil, "", http.StatusBadRequest)
-	}
-
 	if data.AuthData != nil && data.Password != nil {
 		return model.NewAppError("BulkImport", "app.import.validate_user_import_data.auth_data_and_password.error", nil, "", http.StatusBadRequest)
 	}
diff --git a/app/import_validators_test.go b/app/import_validators_test.go
index d54edff21..8ec460778 100644
--- a/app/import_validators_test.go
+++ b/app/import_validators_test.go
@@ -556,10 +556,9 @@ func TestImportValidateUserImportData(t *testing.T) {
 
 	data.Email = ptrStr("bob@example.com")
 
+	// Empty AuthService indicates user/password auth.
 	data.AuthService = ptrStr("")
-	if err := validateUserImportData(&data); err == nil {
-		t.Fatal("Validation should have failed due to 0-length auth service.")
-	}
+	checkNoError(t, validateUserImportData(&data))
 
 	data.AuthService = ptrStr("saml")
 	data.AuthData = ptrStr(strings.Repeat("abcdefghij", 15))
diff --git a/i18n/en.json b/i18n/en.json
index 7f4e8c4a5..b4771306e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2930,10 +2930,6 @@
     "id": "app.import.validate_user_import_data.auth_data_length.error",
     "translation": "User AuthData is too long."
   },
-  {
-    "id": "app.import.validate_user_import_data.auth_service_length.error",
-    "translation": "User AuthService should not be empty if it is provided."
-  },
   {
     "id": "app.import.validate_user_import_data.email_length.error",
     "translation": "User email has an invalid length."
-- 
cgit v1.2.3-1-g7c22