Skip to content
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.

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

Fetch OrganizationRoleClaims from DB when feature flag enabled #8030

Merged
merged 4 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package gov.cdc.usds.simplereport.config.authorization;

import gov.cdc.usds.simplereport.config.BeanProfiles;
import gov.cdc.usds.simplereport.config.FeatureFlagsConfig;
import gov.cdc.usds.simplereport.config.simplereport.DemoUserConfiguration;
import gov.cdc.usds.simplereport.config.simplereport.DemoUserConfiguration.DemoUser;
import gov.cdc.usds.simplereport.idp.repository.OktaRepository;
import gov.cdc.usds.simplereport.service.AuthorizationService;
import gov.cdc.usds.simplereport.service.DbOrgRoleClaimsService;
import gov.cdc.usds.simplereport.service.model.IdentityAttributes;
import gov.cdc.usds.simplereport.service.model.IdentitySupplier;
import jakarta.servlet.Filter;
Expand Down Expand Up @@ -86,8 +88,11 @@ public FilterRegistrationBean<Filter> identityFilter() {
public AuthorizationService getDemoAuthorizationService(
OktaRepository oktaRepo,
IdentitySupplier supplier,
DemoUserConfiguration demoUserConfiguration) {
return new DemoAuthorizationService(oktaRepo, supplier, demoUserConfiguration);
DemoUserConfiguration demoUserConfiguration,
DbOrgRoleClaimsService dbOrgRoleClaimsService,
FeatureFlagsConfig featureFlagsConfig) {
return new DemoAuthorizationService(
oktaRepo, supplier, demoUserConfiguration, dbOrgRoleClaimsService, featureFlagsConfig);
}

@Bean
Expand Down Expand Up @@ -149,14 +154,20 @@ public static class DemoAuthorizationService implements AuthorizationService {
private final IdentitySupplier _getCurrentUser;
private final OktaRepository _oktaRepo;
private final Set<String> _adminGroupMemberSet;
private final DbOrgRoleClaimsService _dbOrgRoleClaimsService;
private final FeatureFlagsConfig _featureFlagsConfig;

public DemoAuthorizationService(
OktaRepository oktaRepo,
IdentitySupplier getCurrent,
DemoUserConfiguration demoUserConfiguration) {
DemoUserConfiguration demoUserConfiguration,
DbOrgRoleClaimsService dbOrgRoleClaimsService,
FeatureFlagsConfig featureFlagsConfig) {
super();
this._getCurrentUser = getCurrent;
this._oktaRepo = oktaRepo;
this._dbOrgRoleClaimsService = dbOrgRoleClaimsService;
this._featureFlagsConfig = featureFlagsConfig;

_adminGroupMemberSet =
demoUserConfiguration.getSiteAdminEmails().stream()
Expand All @@ -168,7 +179,16 @@ public List<OrganizationRoleClaims> findAllOrganizationRoles() {
String username = Optional.ofNullable(_getCurrentUser.get()).orElseThrow().getUsername();
Optional<OrganizationRoleClaims> claims =
_oktaRepo.getOrganizationRoleClaimsForUser(username);
return claims.isEmpty() ? List.of() : List.of(claims.get());
List<OrganizationRoleClaims> oktaOrgRoleClaims =
claims.isEmpty() ? List.of() : List.of(claims.get());
if (!isSiteAdmin()) {
if (_featureFlagsConfig.isOktaMigrationEnabled()) {
emyl3 marked this conversation as resolved.
Show resolved Hide resolved
List<OrganizationRoleClaims> dbOrgRoleClaims =
_dbOrgRoleClaimsService.getOrganizationRoleClaims(username);
return dbOrgRoleClaims;
}
}
return oktaOrgRoleClaims;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ public void setRoles(Set<OrganizationRole> newOrgRoles, Organization org) {
}
}

public Set<Organization> getOrganizations() {
return this.roleAssignments.stream()
.map(ApiUserRole::getOrganization)
.collect(Collectors.toSet());
}

public ApiUser clearRolesAndFacilities() {
this.roleAssignments.clear();
this.facilityAssignments.clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class ApiUserRole extends AuditedEntity {

@ManyToOne
@JoinColumn(name = "organization_id", nullable = false)
@Getter
private Organization organization;

@Column(nullable = false, columnDefinition = "organization_role")
Expand Down
Loading
Loading