SAK-46648 - Regression: Accounts: the same email address can be assigned to 2 different users (sakaiproject#10125)

jonespm · web-flow · commit 122a0a8336c7 · 2022-01-10T11:54:22.000-05:00
diff --git a/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java b/admin-tools/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -1397,7 +1397,7 @@ else if ((mode != null) && (mode.equalsIgnoreCase("edit")) && (!singleUser))
 			}
 
 			// if we validate through email, passwords will be handled in AccountValidator
-			TempUser tempUser = new TempUser(eid, null, null, null, eid, pw, null);
+			TempUser tempUser = new TempUser(eid, email, null, null, eid, pw, null);
 			if (!validateWithAccountValidator)
 			{
 				// if in create mode, make sure we have a password

Original file line number	Diff line number	Diff line change
`@@ -1397,7 +1397,7 @@ else if ((mode != null) && (mode.equalsIgnoreCase("edit")) && (!singleUser))`
`1397`	`1397`	`}`
`1398`	`1398`
`1399`	`1399`	`// if we validate through email, passwords will be handled in AccountValidator`
`1400`		`- TempUser tempUser = new TempUser(eid, null, null, null, eid, pw, null);`
	`1400`	`+ TempUser tempUser = new TempUser(eid, email, null, null, eid, pw, null);`
`1401`	`1401`	`if (!validateWithAccountValidator)`
`1402`	`1402`	`{`
`1403`	`1403`	`// if in create mode, make sure we have a password`