Migrate to non-deprecated method (#205)

bimberlabinternal · May 24, 2024 · 9a2777a · 9a2777a
1 parent 417dcb0
commit 9a2777a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/mGAP/src/org/labkey/mgap/mGAPController.java b/mGAP/src/org/labkey/mgap/mGAPController.java
@@ -477,7 +477,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
             Container mGapContainer = mGAPManager.get().getMGapContainer();
             for (User u : existingUsersGivenAccess)
             {
-                boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));
+                boolean isLDAP = AuthenticationManager.isLdapOrSsoEmail(new ValidEmail(u.getEmail()));
 
                 MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
                 mail.setEncodedHtmlContent("Your account request has been approved for mGAP!  " + "<a href=\"" + AppProps.getInstance().getBaseServerUrl() + mGapContainer.getStartURL(getUser()) + "\">Click here to access the site.</a>" + (isLDAP ? "  Use your normal OHSU email/password to login." : ""));

diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java
@@ -406,7 +406,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
             Container mccContainer = MccManager.get().getMCCContainer(getContainer());
             for (User u : existingUsersGivenAccess)
             {
-                boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));
+                boolean isLDAP = AuthenticationManager.isLdapOrSsoEmail(new ValidEmail(u.getEmail()));
 
                 MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
                 mail.setEncodedHtmlContent("Your account request has been approved for MCC!  " + "<a href=\"" + AppProps.getInstance().getBaseServerUrl() + mccContainer.getStartURL(getUser()) + "\">Click here to access the site.</a>" + (isLDAP ? "  Use your normal OHSU email/password to login." : ""));