Skip to content

Commit

Permalink
hotfix: set authorization based on ACTIVE products (#425)
Browse files Browse the repository at this point in the history
  • Loading branch information
@manuraf
manuraf authored Apr 29, 2024
1 parent 156a0c1 commit b65324d
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 31 deletions.
35 changes: 22 additions & 13 deletions core/src/main/java/it/pagopa/selfcare/dashboard/core/InstitutionV2ServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
Expand Down Expand Up @@ -76,21 +77,29 @@ public Institution findInstitutionById(String institutionId) {

String userId = ((SelfCareUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId();
UserInstitution userInstitution = userApiConnector.getProducts(institutionId, userId);
Institution institution = msCoreConnector.getInstitution(institutionId);
if (Objects.isNull(userInstitution))
throw new AccessDeniedException(String.format("User %s has not associations with institution %s", userId, institutionId));

if (userInstitution != null) {
boolean limited = userInstitution.getProducts().stream().noneMatch(prod -> SelfCareAuthority.ADMIN.equals(prod.getRole().getSelfCareAuthority()));
if (limited) {
institution.getOnboarding().stream()
.filter(product -> userInstitution.getProducts().stream().anyMatch(prodUser -> product.getProductId().equals(prodUser.getProductId())))
.forEach(product -> {product.setAuthorized(true); product.setUserRole(LIMITED.name());});
} else {
institution.getOnboarding().forEach(product -> {
product.setAuthorized(userInstitution.getProducts().stream().anyMatch(prodUser -> product.getProductId().equals(prodUser.getProductId())));
userInstitution.getProducts().stream().filter(prodUser -> product.getProductId().equals(prodUser.getProductId())).findAny().ifPresentOrElse(userProd -> product.setUserRole(userProd.getRole().getSelfCareAuthority().name()), () -> product.setUserRole(null));
});
}
Institution institution = msCoreConnector.getInstitution(institutionId);
if (Objects.isNull(institution) || Objects.isNull(institution.getOnboarding()))
throw new ResourceNotFoundException(String.format("Institution %s not found or onboarding is empty!", institutionId));

userInstitution.setProducts(userInstitution.getProducts().stream()
.filter(onboardedProduct -> RelationshipState.ACTIVE.equals(onboardedProduct.getStatus()))
.toList());

boolean limited = userInstitution.getProducts().stream().noneMatch(prod -> SelfCareAuthority.ADMIN.equals(prod.getRole().getSelfCareAuthority()));
if (limited) {
institution.getOnboarding().stream()
.filter(product -> userInstitution.getProducts().stream().anyMatch(prodUser -> product.getProductId().equals(prodUser.getProductId())))
.forEach(product -> {product.setAuthorized(true); product.setUserRole(LIMITED.name());});
} else {
institution.getOnboarding().forEach(product -> {
product.setAuthorized(userInstitution.getProducts().stream().anyMatch(prodUser -> product.getProductId().equals(prodUser.getProductId())));
userInstitution.getProducts().stream().filter(prodUser -> product.getProductId().equals(prodUser.getProductId())).findAny().ifPresentOrElse(userProd -> product.setUserRole(userProd.getRole().getSelfCareAuthority().name()), () -> product.setUserRole(null));
});
}

log.debug("findInstitutionById result = {}", institution);
log.trace("findInstitutionById end");
return institution;
Expand Down
60 changes: 42 additions & 18 deletions core/src/test/java/it/pagopa/selfcare/dashboard/core/InstitutionV2ServiceImplTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import it.pagopa.selfcare.dashboard.connector.exception.ResourceNotFoundException;
import it.pagopa.selfcare.dashboard.connector.model.institution.Institution;
import it.pagopa.selfcare.dashboard.connector.model.institution.OnboardedProduct;
import it.pagopa.selfcare.dashboard.connector.model.institution.RelationshipState;
import it.pagopa.selfcare.dashboard.connector.model.user.*;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
Expand All @@ -19,12 +20,14 @@
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;

import java.rmi.AccessException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand All @@ -33,8 +36,7 @@
import static it.pagopa.selfcare.commons.base.security.PartyRole.MANAGER;
import static it.pagopa.selfcare.commons.base.security.PartyRole.OPERATOR;
import static it.pagopa.selfcare.commons.utils.TestUtils.mockInstance;
import static it.pagopa.selfcare.dashboard.connector.model.institution.RelationshipState.ACTIVE;
import static it.pagopa.selfcare.dashboard.connector.model.institution.RelationshipState.SUSPENDED;
import static it.pagopa.selfcare.dashboard.connector.model.institution.RelationshipState.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;

Expand Down Expand Up @@ -173,7 +175,7 @@ void findInstitutionByIdTest2(){
}

@Test
void findInstitutionByIdTest3(){
void findInstitutionById(){
ProductGrantedAuthority productGrantedAuthority = new ProductGrantedAuthority(MANAGER, "productRole", "productId");
SelfCareUser principal = Mockito.mock(SelfCareUser.class);
when(principal.getId()).thenReturn("UserId");
Expand All @@ -186,25 +188,35 @@ void findInstitutionByIdTest3(){
Institution institution = new Institution();
institution.setExternalId("externalId");
institution.setDescription("description");
OnboardedProduct onboardedProduct = new OnboardedProduct();
onboardedProduct.setProductId("productId");
institution.setOnboarding(Collections.singletonList(onboardedProduct));
OnboardedProduct onboardedInstitutionProduct = new OnboardedProduct();
onboardedInstitutionProduct.setProductId("productId");
OnboardedProduct onboardedInstitutionProduct2 = new OnboardedProduct();
onboardedInstitutionProduct2.setProductId("productId2");
institution.setOnboarding(List.of(onboardedInstitutionProduct, onboardedInstitutionProduct2));
when(msCoreConnectorMock.getInstitution("institutionId")).thenReturn(institution);

it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct onboardedProduct1 = new it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct();
onboardedProduct1.setRole(MANAGER);
onboardedProduct1.setProductId("productId");
onboardedProduct1.setStatus(ACTIVE);
it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct onboardedProduct2 = new it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct();
onboardedProduct2.setRole(MANAGER);
onboardedProduct2.setProductId("productId2");
onboardedProduct2.setStatus(DELETED);
UserInstitution userInstitution = new UserInstitution();
userInstitution.setProducts(List.of(onboardedProduct1));
userInstitution.setProducts(List.of(onboardedProduct1, onboardedProduct2));
when(userApiConnectorMock.getProducts("institutionId", "UserId")).thenReturn(userInstitution);

Institution institutionResponse = institutionV2Service.findInstitutionById("institutionId");
Assertions.assertEquals("description", institutionResponse.getDescription());
Assertions.assertEquals("externalId", institutionResponse.getExternalId());
assertEquals(2, institution.getOnboarding().size());
assertTrue(institution.getOnboarding().get(0).isAuthorized());
assertFalse(institution.getOnboarding().get(1).isAuthorized());
}

@Test
void findInstitutionByIdTest(){
void findInstitutionById_shouldThrowAccessDeniedException(){
ProductGrantedAuthority productGrantedAuthority = new ProductGrantedAuthority(OPERATOR, "productRole", "productId");
SelfCareUser principal = Mockito.mock(SelfCareUser.class);
when(principal.getId()).thenReturn("UserId");
Expand All @@ -214,16 +226,28 @@ void findInstitutionByIdTest(){
Collections.singletonList(new SelfCareGrantedAuthority("institutionId", Collections.singleton(productGrantedAuthority))));
SecurityContextHolder.getContext().setAuthentication(authentication);

Institution institution = new Institution();
institution.setExternalId("externalId");
institution.setDescription("description");
OnboardedProduct onboardedProduct = new OnboardedProduct();
onboardedProduct.setProductId("productId");
institution.setOnboarding(Collections.singletonList(onboardedProduct));
when(msCoreConnectorMock.getInstitution("institutionId")).thenReturn(institution);
Institution institutionResponse = institutionV2Service.findInstitutionById("institutionId");
Assertions.assertEquals("description", institutionResponse.getDescription());
Assertions.assertEquals("externalId", institutionResponse.getExternalId());
Assertions.assertThrows(AccessDeniedException.class, () -> institutionV2Service.findInstitutionById("institutionId"));
}

@Test
void findInstitutionById_shouldThrowInstitutionNotFoundException(){
ProductGrantedAuthority productGrantedAuthority = new ProductGrantedAuthority(OPERATOR, "productRole", "productId");
SelfCareUser principal = Mockito.mock(SelfCareUser.class);
when(principal.getId()).thenReturn("UserId");
TestingAuthenticationToken authentication = new TestingAuthenticationToken(
principal,
null,
Collections.singletonList(new SelfCareGrantedAuthority("institutionId", Collections.singleton(productGrantedAuthority))));
SecurityContextHolder.getContext().setAuthentication(authentication);

it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct onboardedProduct1 = new it.pagopa.selfcare.dashboard.connector.model.user.OnboardedProduct();
onboardedProduct1.setRole(MANAGER);
onboardedProduct1.setProductId("productId");
UserInstitution userInstitution = new UserInstitution();
userInstitution.setProducts(List.of(onboardedProduct1));
when(userApiConnectorMock.getProducts("institutionId", "UserId")).thenReturn(userInstitution);

Assertions.assertThrows(ResourceNotFoundException.class, () -> institutionV2Service.findInstitutionById("institutionId"));
}

}

0 comments on commit b65324d

Please sign in to comment.