From 8073bfb019944011956d0ef6bd8f7975f307a265 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Fri, 24 May 2024 10:30:37 -0700
Subject: [PATCH] Migrate to non-deprecated method

---
 mGAP/src/org/labkey/mgap/mGAPController.java | 2 +-
 mcc/src/org/labkey/mcc/MccController.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mGAP/src/org/labkey/mgap/mGAPController.java b/mGAP/src/org/labkey/mgap/mGAPController.java
index 62d135e98..c51815b47 100644
--- 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
index ef8bbe26b..782fe0274 100644
--- 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." : ""));