SAK-48251 Users: issue with passwords surrounded by spaces when impor…

…ting users from file (sakaiproject#11154)
stetsche · Jan 24, 2023 · 9b1d999 · 9b1d999
1 parent 4321185
commit 9b1d999
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java b/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -811,10 +811,12 @@ public void doImport(RunData data, Context context)
 						//Try to import the rest
 						continue;
 					}
-
-					User newUser = userDirectoryService.addUser(null, user.getEid(), user.getFirstName(), user.getLastName(), user.getEmail(), user.getPassword(), user.getType(), user.getProperties());
-
-
+					String userPass = user.getPassword();
+					// If the password form the CSV is null, set an empty string.
+					// Else, trim possible spaces surrounding the password, to avoid login problems.
+					userPass = userPass == null ? "" : userPass.trim();
+
+					userDirectoryService.addUser(null, user.getEid(), user.getFirstName(), user.getLastName(), user.getEmail(), userPass, user.getType(), user.getProperties());
 				}
 				catch (UserAlreadyDefinedException e){
 					//ok, just skip