Commit 87399b04 authored by George Goldberg's avatar George Goldberg

MM-12670: Accept and use "" for user/pass AuthService in import/export. (#9689)

parent e739cb13
......@@ -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,
......
......@@ -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)
}
......
......@@ -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))
......
......@@ -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."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment