Commit cb0e70cb authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Merge branch 'malowe/dev/access-fix' into 'dev'

Fix access check to ignore emp history table

See merge request !563
parents 4de017a2 f6c1dd39
Pipeline #3110 passed with stage
in 0 seconds
......@@ -382,8 +382,10 @@ public class FoundationDBOrganizationService implements OrganizationsService {
params.add(MembershipFormAPIParameterNames.USER_ID.getName(), userName);
return cache
.get(orgID + "-access", params, OrganizationContactData.class,
() -> middleware.getAll(i -> orgAPI.getOrganizationContact(orgID, userName, i,
OrganizationRequestParams.builder().build()), OrganizationContactData.class))
() -> middleware.getAll(
i -> orgAPI.getOrganizationContact(orgID, userName, i,
OrganizationRequestParams.builder().setIsNotExpired(false).build()),
OrganizationContactData.class))
.orElse(Collections.emptyList()).stream()
.map(c -> OrganizationalUserType.valueOfChecked(c.getRelation())).collect(Collectors.toList());
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment