Skip to content

Refactored isLdapEmail()#65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 1 commit into from
Apr 1, 2021
Merged

Refactored isLdapEmail() #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mGAP/src/org/labkey/mgap/mGAPController.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@
import org.labkey.api.query.QueryService;
import org.labkey.api.query.QueryUpdateService;
import org.labkey.api.query.UserSchema;
import org.labkey.api.security.AuthenticationManager;
import org.labkey.api.security.IgnoresTermsOfUse;
import org.labkey.api.security.MutableSecurityPolicy;
import org.labkey.api.security.RequiresNoPermission;
Expand DownExpand Up@@ -434,7 +435,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
for (User u : existingUsersGivenAccess)
{
Container mGapContainer = mGAPManager.get().getMGapContainer();
boolean isLDAP = SecurityManager.isLdapEmail(new ValidEmail(u.getEmail()));
boolean isLDAP = AuthenticationManager.isLdapEmail(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()).toString() + "\">Click here to access the site.</a>" + (isLDAP ? " Use your normal OHSU email/password to login." : ""));
Expand Down
3 changes: 2 additions & 1 deletion mcc/src/org/labkey/mcc/MccController.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@
import org.labkey.api.module.AllowedDuringUpgrade;
import org.labkey.api.query.DetailsURL;
import org.labkey.api.query.FieldKey;
import org.labkey.api.security.AuthenticationManager;
import org.labkey.api.security.IgnoresTermsOfUse;
import org.labkey.api.security.MutableSecurityPolicy;
import org.labkey.api.security.RequiresNoPermission;
Expand DownExpand Up@@ -382,7 +383,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
for (User u : existingUsersGivenAccess)
{
Container mccContainer = MccManager.get().getMCCContainer();
boolean isLDAP = SecurityManager.isLdapEmail(new ValidEmail(u.getEmail()));
boolean isLDAP = AuthenticationManager.isLdapEmail(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()).toString() + "\">Click here to access the site.</a>" + (isLDAP ? " Use your normal OHSU email/password to login." : ""));
Expand Down