Skip to content

Commit 9a2777a

Browse files
authored
Migrate to non-deprecated method (#205)
1 parent 417dcb0 commit 9a2777a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mGAP/src/org/labkey/mgap/mGAPController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
477477
Container mGapContainer = mGAPManager.get().getMGapContainer();
478478
for (User u : existingUsersGivenAccess)
479479
{
480-
boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));
480+
boolean isLDAP = AuthenticationManager.isLdapOrSsoEmail(new ValidEmail(u.getEmail()));
481481

482482
MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
483483
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." : ""));

mcc/src/org/labkey/mcc/MccController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
406406
Container mccContainer = MccManager.get().getMCCContainer(getContainer());
407407
for (User u : existingUsersGivenAccess)
408408
{
409-
boolean isLDAP = AuthenticationManager.isLdapEmail(new ValidEmail(u.getEmail()));
409+
boolean isLDAP = AuthenticationManager.isLdapOrSsoEmail(new ValidEmail(u.getEmail()));
410410

411411
MailHelper.MultipartMessage mail = MailHelper.createMultipartMessage();
412412
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." : ""));

0 commit comments

Comments
 (0)