From 359d62fbd34ff42e5d25276ee5b45d773b2fa3c8 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 5 Nov 2024 11:30:02 -0800 Subject: [PATCH 1/4] Migrate core.Logins and operations away from email address --- src/org/labkey/cds/CDSController.java | 35 --------------------------- 1 file changed, 35 deletions(-) diff --git a/src/org/labkey/cds/CDSController.java b/src/org/labkey/cds/CDSController.java index a4a89397f..f2c8d74be 100644 --- 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 - { - @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("
" + csrf + "
"); - } - 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 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 From 2607397a0d736cb5ca021d7cc5ffa37fe744ee73 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 5 Nov 2024 17:26:44 -0800 Subject: [PATCH 2/4] Spelling --- webapp/Connector/src/controller/Router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/Connector/src/controller/Router.js b/webapp/Connector/src/controller/Router.js index 0c32fcfcc..1baa99df5 100644 --- 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(); From 874dbc57147c0bb55e12b942340848f69b09cffb Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 6 Nov 2024 14:11:33 -0800 Subject: [PATCH 3/4] Pass userId to setPassword actions --- test/src/org/labkey/test/tests/cds/CDSLoginTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java index bf4b048d9..2db72777d 100644 --- 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"); From b5c9e3f105d3b9d41fe4e014debd2ed3de803f2c Mon Sep 17 00:00:00 2001 From: Lum Date: Thu, 7 Nov 2024 11:38:08 -0800 Subject: [PATCH 4/4] handle change password API updates --- webapp/frontPage/js/modal.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/frontPage/js/modal.js b/webapp/frontPage/js/modal.js index f63ccda74..6bc3b128a 100644 --- 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() {