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.

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

Fix: ProductGrantedAuthority map when user has more productRole on productId #416

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Fix: ProductGrantedAuthority map when user has more productRole on productId #416

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
16 changes: 11 additions & 5 deletions web/src/main/java/it/pagopa/selfcare/dashboard/web/security/ExchangeTokenServiceV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import it.pagopa.selfcare.dashboard.connector.api.UserApiConnector;
import it.pagopa.selfcare.dashboard.connector.model.groups.UserGroupInfo;
import it.pagopa.selfcare.dashboard.connector.model.product.Product;
import it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct;
import it.pagopa.selfcare.dashboard.connector.model.user.User;
import it.pagopa.selfcare.dashboard.connector.model.user.UserInstitution;
import it.pagopa.selfcare.dashboard.core.InstitutionService;
Expand Down Expand Up @@ -42,9 +43,10 @@
import java.security.spec.RSAPrivateCrtKeySpec;
import java.time.Duration;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static java.util.stream.Collectors.groupingBy;

@Slf4j
@Service
public class ExchangeTokenServiceV2 {
Expand Down Expand Up @@ -207,12 +209,16 @@ private TokenExchangeClaims retrieveAndSetClaims(String credential, Institution


private Map<String, ProductGrantedAuthority> retrieveProductsFromInstitutionAndUser(UserInstitution userInstitution) {
return userInstitution
Map<String, ProductGrantedAuthority> map = new HashMap<>();
userInstitution
.getProducts()
.stream()
.collect(Collectors.toMap(
it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct::getProductId,
product -> new ProductGrantedAuthority(product.getRole(), List.of(product.getProductRole()), product.getProductId())));
.collect(groupingBy(OnboardedProduct::getProductId))
.forEach((key, value) -> map.put(key, new ProductGrantedAuthority(
value.get(0).getRole(),
value.stream().map(OnboardedProduct::getProductRole).toList(),
key)));
return map;
}


Expand Down
10 changes: 8 additions & 2 deletions web/src/test/java/it/pagopa/selfcare/dashboard/web/security/ExchangeTokenServiceV2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,14 @@ void exchange_ok(PrivateKey privateKey) throws Exception {
onboardedProduct.setProductId(productId);
onboardedProduct.setProductRole(productRole);


OnboardedProduct onboardedProduct2 = new OnboardedProduct();
onboardedProduct2.setRole(MANAGER);
onboardedProduct2.setProductId(productId);
onboardedProduct2.setProductRole("admin2");

UserInstitution userInstitution = new UserInstitution();
userInstitution.setProducts(List.of(onboardedProduct));
userInstitution.setProducts(List.of(onboardedProduct, onboardedProduct2));
Institution institutionMock = mockInstance(new Institution());
institutionMock.setId(institutionId);
when( institutionServiceMock.getInstitutionById(any())).thenReturn(institutionMock);
Expand Down Expand Up @@ -559,7 +565,7 @@ void exchange_ok(PrivateKey privateKey) throws Exception {
assertEquals(institutionInfo.getDescription(), institution.getName());
assertEquals(institutionId, institution.getId());
checkNotNullFields(institution, "parentDescription", "rootParent");
assertEquals(1, institution.getRoles().size());
assertEquals(2, institution.getRoles().size());
List<String> groups = institution.getGroups();
assertEquals(pageable.getPageSize(), groups.size());
assertTrue(groups.stream().allMatch(groupId -> groupId.equals(groupInfo.getId())));
Expand Down
Loading