Merge 24.11 to develop

LabKey · Nov 13, 2024 · 682c276 · 682c276
2 parents 43868b7 + c8181f8
commit 682c276
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
@@ -97,6 +97,7 @@
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.AdminConsoleAction;
 import org.labkey.api.security.Group;
+import org.labkey.api.security.LoginManager;
 import org.labkey.api.security.MutableSecurityPolicy;
 import org.labkey.api.security.PrincipalType;
 import org.labkey.api.security.RequiresAnyOf;
@@ -889,7 +890,7 @@ public boolean handlePost(PublicDataUseForm form, BindException errors)
                 errors.reject(ERROR_MSG, "User with given email address does not exist");
                 return false;
             }
-            if (!SecurityManager.matchPassword(form.getUserPassword(), SecurityManager.getPasswordHash(validEmail)))
+            if (!LoginManager.matchPassword(form.getUserPassword(), LoginManager.getPasswordHash(user)))
             {
                 errors.reject(ERROR_MSG, "Incorrect password for " + user.getEmail());
                 return false;

diff --git a/panoramapublic/src/org/labkey/panoramapublic/pipeline/CopyExperimentFinalTask.java b/panoramapublic/src/org/labkey/panoramapublic/pipeline/CopyExperimentFinalTask.java
@@ -36,6 +36,7 @@
 import org.labkey.api.query.ValidationException;
 import org.labkey.api.security.Group;
 import org.labkey.api.security.InvalidGroupMembershipException;
+import org.labkey.api.security.LoginManager;
 import org.labkey.api.security.MemberType;
 import org.labkey.api.security.MutableSecurityPolicy;
 import org.labkey.api.security.PasswordRule;
@@ -649,7 +650,7 @@ private ReviewerAndPassword createReviewerAccount(String reviewerEmailPrefix, Us
 
         log.info("Generating password.");
         String password = createPassword(newUser.getUser());
-        SecurityManager.setPassword(email, password);
+        LoginManager.setPassword(newUser.getUser(), password);
         log.info("Set reviewer password successfully.");
 
         return new ReviewerAndPassword(newUser.getUser(), password);

diff --git a/signup/src/org/labkey/signup/SignUpController.java b/signup/src/org/labkey/signup/SignUpController.java
@@ -42,6 +42,7 @@
 import org.labkey.api.security.AuthenticationManager.AuthenticationResult;
 import org.labkey.api.security.DbLoginService;
 import org.labkey.api.security.Group;
+import org.labkey.api.security.LoginManager;
 import org.labkey.api.security.RequiresLogin;
 import org.labkey.api.security.RequiresNoPermission;
 import org.labkey.api.security.RequiresPermission;
@@ -422,7 +423,7 @@ public boolean handlePost(SignupConfirmForm form, BindException errors) throws E
                 newUser.setDescription(StringUtils.isBlank(_tempUser.getOrganization()) ? "" : "Organization: " + _tempUser.getOrganization()); // don't add anything if organization is empty
 
                 // Attempt to set this new user's password and log them in
-                AuthenticationResult result = DbLoginService.get().attemptSetPassword(getContainer(), getUser(), form.getPassword(), form.getPassword2(), getViewContext().getRequest(), _email, PageFlowUtil.urlProvider(ProjectUrls.class).getHomeURL(), "Verified and chose a password.", true, errors);
+                AuthenticationResult result = DbLoginService.get().attemptSetPassword(getContainer(), getUser(), form.getPassword(), form.getPassword2(), getViewContext().getRequest(), newUser, PageFlowUtil.urlProvider(ProjectUrls.class).getHomeURL(), "Verified and chose a password.", true, false, errors);
 
                 if (errors.hasErrors())
                     return false;
@@ -839,7 +840,7 @@ private TempUser getTempUser(SignupForm signupForm, ValidEmail email) throws jav
             tempUser.setFirstName(signupForm.getFirstName());
             tempUser.setLastName(signupForm.getLastName());
             tempUser.setOrganization(signupForm.getOrganization());
-            tempUser.setKey(SecurityManager.createTempPassword());
+            tempUser.setKey(LoginManager.createTempPassword());
             tempUser.setContainer(getContainer());
 
             Table.insert(null, SignUpManager.getTableInfoTempUsers(), tempUser);