Merge 24.11 to develop (#670)

LabKey · Nov 13, 2024 · 248b541 · 248b541
2 parents c4e0dc2 + 448e3f6
commit 248b541
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/src/org/labkey/cds/CDSController.java b/src/org/labkey/cds/CDSController.java
@@ -1070,41 +1070,6 @@ public void setAntigenQuery(String antigenQuery)
         }
     }
 
-    @RequiresSiteAdmin
-    public static class MailMergeAction extends SimpleViewAction<Object>
-    {
-        @Override
-        public ModelAndView getView(Object o, BindException errors) throws SQLException, IOException
-        {
-            if ("GET".equals(getViewContext().getRequest().getMethod()))
-            {
-                String csrf = new CsrfInput(getViewContext()).toString();
-                return new HtmlView("<form method=POST><input type=submit value=submit>" + csrf + "</form>");
-            }
-            else if ("POST".equals(getViewContext().getRequest().getMethod()))
-            {
-                String sql = "SELECT L.email, U.lastlogin, L.verification, U.displayname, U.firstname, U.lastname FROM core.logins L INNER JOIN core.principals P ON L.email = P.name INNER JOIN core.usersdata U ON P.userid = U.userid";
-                try (StashingResultsFactory factory = new StashingResultsFactory(()->new ResultsImpl(new SqlSelector(CoreSchema.getInstance().getScope(), sql).getResultSet())))
-                {
-                    Results results = factory.get();
-                    List<DisplayColumn> list = new ArrayList<>();
-                    for (String s : Arrays.asList("email", "displayname", "firstname", "lastname", "lastlogin", "verification"))
-                        list.add(new DataColumn(new BaseColumnInfo(s, JdbcType.valueOf(results.getMetaData().getColumnType(results.findColumn(s))))));
-                    ExcelWriter xl = new ExcelWriter(factory, list);
-                    xl.setFilenamePrefix("mailmerge");
-                    xl.setAutoSize(true);
-                    xl.renderWorkbook(getViewContext().getResponse());
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public void addNavTrail(NavTree root)
-        {
-        }
-    }
-
     @RequiresPermission(ReadPermission.class)
     @MethodsAllowed({Method.POST, Method.DELETE})
     public class UserPropertyAction extends MutatingApiAction<SimpleApiJsonForm>

diff --git a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java
@@ -106,8 +106,8 @@ public void testPasswordStrength()
                 DbLoginUtils.PasswordExpiration.Never);
 
         log("Creating a user with password strength as Good");
-        _userHelper.createUser(CDS_LOGIN_TESTUSER);
-        SetPasswordForm.goToInitialPasswordForUser(this, CDS_LOGIN_TESTUSER)
+        int userId = _userHelper.createUser(CDS_LOGIN_TESTUSER).getUserId();
+        SetPasswordForm.goToInitialPasswordForUser(this, userId)
                 .setNewPassword(goodPwd)
                 .clickSubmit();
         log("Make the user as folder admin for CDS");

diff --git a/webapp/Connector/src/controller/Router.js b/webapp/Connector/src/controller/Router.js
@@ -40,7 +40,7 @@ Ext.define('Connector.controller.Router', {
         this.BAD_AUTH = false;
         var me = this;
 
-        /* If the user recieves an unauthorized, return them to login screen */
+        /* If the user receives an unauthorized, return them to login screen */
         this.application.on('httpunauthorized', function(status, text) {
             me.BAD_AUTH = true;
             Ext.Ajax.abortAll();

diff --git a/webapp/frontPage/js/modal.js b/webapp/frontPage/js/modal.js
@@ -298,7 +298,7 @@ define(['jquery', 'magnific', 'util'], function($, magnific, util) {
               var newLocation = LABKEY.ActionURL.buildURL('cds', 'app.view', null, {
                 'change_password': true,
                 'message': params.message,
-                'email': $sign_in_email.val()
+                'userId': params.userId
               });
               window.location = newLocation;
               return;
@@ -429,7 +429,7 @@ define(['jquery', 'magnific', 'util'], function($, magnific, util) {
           return false;
         }
 
-        var emailVal = LABKEY.ActionURL.getParameter('email');
+        var userIdVal = LABKEY.ActionURL.getParameter('userId');
         var prevPassword = document.getElementById('prevPassword');
         $.ajax({
           url: LABKEY.ActionURL.buildURL("login", "changePasswordAPI.api"),
@@ -438,7 +438,7 @@ define(['jquery', 'magnific', 'util'], function($, magnific, util) {
             oldPassword: prevPassword.value,
             password: pw1.value,
             password2: pw2.value,
-            email: emailVal,
+            userId: userIdVal,
             'X-LABKEY-CSRF': LABKEY.CSRF
           },
           success: function() {