Skip to content

Migrate away from deprecated methods #206

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
Jun 10, 2024
Merged

Migrate away from deprecated methods #206

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
14 changes: 7 additions & 7 deletions mGAP/src/org/labkey/mgap/mGAPController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ public void validateForm(ApproveUserRequestsForm form, Errors errors)
public Object execute(ApproveUserRequestsForm form, BindException errors) throws Exception
{
ApiSimpleResponse response = new ApiSimpleResponse();
MutableSecurityPolicy policy = new MutableSecurityPolicy(mGAPManager.get().getMGapContainer().getPolicy());
List<SecurityManager.NewUserStatus> newUserStatusList = new ArrayList<>();
List<User> existingUsersGivenAccess = new ArrayList<>();
try (DbScope.Transaction transaction = CoreSchema.getInstance().getScope().ensureTransaction())
Expand Down Expand Up @@ -433,7 +432,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
u.setLastName((String)map.get("lastName"));
UserManager.updateUser(getUser(), u);

if (st.isLdapEmail())
if (st.isLdapOrSsoEmail())
{
existingUsersGivenAccess.add(st.getUser());
}
Expand All @@ -449,23 +448,24 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
row.put("userId", u.getUserId());
Table.update(getUser(), ti, row, requestId);

if (!policy.hasPermission(u, ReadPermission.class))
Container mGapContainer = mGAPManager.get().getMGapContainer();

if (!mGapContainer.hasPermission(u, ReadPermission.class))
{
MutableSecurityPolicy policy = new MutableSecurityPolicy(mGapContainer.getPolicy());
policy.addRoleAssignment(u, ReaderRole.class);
SecurityPolicyManager.savePolicy(policy, getUser());
}
else
{
_log.info("user already has read permission on mGAP container: " + u.getDisplayName(getUser()));
}
}

SecurityPolicyManager.savePolicy(policy, getUser());

transaction.commit();
}

Set<User> allUsers = new HashSet<>();
allUsers.addAll(existingUsersGivenAccess);
Set<User> allUsers = new HashSet<>(existingUsersGivenAccess);

//send emails:
for (SecurityManager.NewUserStatus st : newUserStatusList)
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/org/labkey/mcc/MccController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
u.setLastName((String)map.get("lastName"));
UserManager.updateUser(getUser(), u);

if (st.isLdapEmail())
if (st.isLdapOrSsoEmail())
{
existingUsersGivenAccess.add(st.getUser());
}
Expand Down