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: fixed retrieve token for back-office #415

Merged
merged 4 commits into from
Apr 17, 2024
Merged

Fix: fixed retrieve token for back-office #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26fc5a4
Fix ExchangeTokenServiceV2 when retrieve institution data
flaminiaScarciofolo Apr 17, 2024
a96a5cd
fix: retrieve email from workContacts
empassaro Apr 17, 2024
730209b
fix tests in ExchangeTokenServiceV2Test
flaminiaScarciofolo Apr 17, 2024
c91d2a2
add tests for getInstituionById
flaminiaScarciofolo Apr 17, 2024
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
2 changes: 2 additions & 0 deletions core/src/main/java/it/pagopa/selfcare/dashboard/core/InstitutionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public interface InstitutionService {

InstitutionInfo getInstitution(String institutionId);

Institution getInstitutionById(String institutionId);

Collection<InstitutionInfo> getInstitutions(String userId);

void updateInstitutionGeographicTaxonomy(String institutionId, GeographicTaxonomyList geographicTaxonomies);
Expand Down
14 changes: 12 additions & 2 deletions core/src/main/java/it/pagopa/selfcare/dashboard/core/InstitutionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public InstitutionServiceImpl(@Value("${dashboard.institution.getUsers.filter.st
? Optional.empty()
: Optional.of(EnumSet.copyOf(Arrays.stream(allowedStates)
.map(RelationshipState::valueOf)
.collect(Collectors.toList())));
.toList()));
this.userRegistryConnector = userRegistryConnector;
this.productsConnector = productsConnector;
this.msCoreConnector = msCoreConnector;
Expand All @@ -85,6 +85,16 @@ public InstitutionInfo getInstitution(String institutionId) {
return result;
}


@Override
public Institution getInstitutionById(String institutionId) {
log.trace("getInstitution start");
Institution result = msCoreConnector.getInstitution(institutionId);
log.debug(LogUtils.CONFIDENTIAL_MARKER, "getInstitution result = {}", result);
log.trace("getInstitution end");
return result;
}

@Override
public void updateInstitutionGeographicTaxonomy(String institutionId, GeographicTaxonomyList geographicTaxonomies) {
log.trace("updateInstitutionGeographicTaxonomy start");
Expand Down Expand Up @@ -352,7 +362,7 @@ public Institution findInstitutionById(String institutionId) {
.filter(product -> userAuthProducts.containsKey(product.getProductId()))
.peek(product -> product.setAuthorized(true))
.peek(product -> product.setUserRole(LIMITED.name()))
.collect(Collectors.toList()));
.toList());
} else {
institution.getOnboarding().forEach(product -> {
product.setAuthorized(userAuthProducts.containsKey(product.getProductId()));
Expand Down
28 changes: 22 additions & 6 deletions core/src/test/java/it/pagopa/selfcare/dashboard/core/InstitutionServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ void beforeEach() {
SecurityContextHolder.clearContext();
}

@Test
void getInstitutionById() {
// Given
String institutionId = "institutionId";
Institution institution = new Institution();
when(msCoreConnectorMock.getInstitution(institutionId)).thenReturn(institution);

// When
Institution result = institutionService.getInstitutionById(institutionId);

// Then
verify(msCoreConnectorMock, times(1)).getInstitution(institutionId);
assertEquals(institution, result);
}


@Test
void getInstitution() {
// given
Expand Down Expand Up @@ -370,7 +386,7 @@ void getInstitutionProductUsers_nullAllowedStates() {
assertNull(capturedFilter.getRole());
assertEquals(productId, capturedFilter.getProductId());
assertNull(capturedFilter.getProductRoles());
assertNull( capturedFilter.getUserId());
assertNull(capturedFilter.getUserId());
assertNull(capturedFilter.getAllowedStates());
ArgumentCaptor<EnumSet<Fields>> filedsCaptor = ArgumentCaptor.forClass(EnumSet.class);
verify(userRegistryConnector, times(1))
Expand Down Expand Up @@ -1079,7 +1095,7 @@ void addUserProductRoles(PartyRole partyRole) {
assertDoesNotThrow(executable);
verify(msCoreConnectorMock, times(1))
.createUsers(Mockito.eq(institutionId), Mockito.eq(productId), Mockito.eq(userId), createUserDtoCaptor.capture(), eq("setTitle"));
createUserDtoCaptor.getValue().getRoles().forEach(role1 -> {
createUserDtoCaptor.getValue().getRoles().forEach(role1 -> {
createUserDto.getRoles().forEach(role -> {
if (role.getLabel().equals(role1.getLabel())) {
Assertions.assertEquals(role.getPartyRole(), role1.getPartyRole());
Expand Down Expand Up @@ -1173,7 +1189,7 @@ void approveOnboardingRequest_hasNullToken() {
}

@Test
void rejectOnboardingRequest(){
void rejectOnboardingRequest() {
// given
String tokenId = UUID.randomUUID().toString();
Mockito.doNothing()
Expand All @@ -1186,7 +1202,7 @@ void rejectOnboardingRequest(){
}

@Test
void rejectOnboardingRequest_hasNullToken(){
void rejectOnboardingRequest_hasNullToken() {
// given
String tokenId = null;
// when
Expand Down Expand Up @@ -1243,7 +1259,7 @@ void updateInstitutionDescription_hasNullDescription() {
}

@Test
void findInstitutionByIdTest2(){
void findInstitutionByIdTest2() {
ProductGrantedAuthority productGrantedAuthority = new ProductGrantedAuthority(MANAGER, "productRole", "productId");
TestingAuthenticationToken authentication = new TestingAuthenticationToken(null,
null,
Expand All @@ -1262,7 +1278,7 @@ void findInstitutionByIdTest2(){
}

@Test
void findInstitutionByIdTest(){
void findInstitutionByIdTest() {
ProductGrantedAuthority productGrantedAuthority = new ProductGrantedAuthority(OPERATOR, "productRole", "productId");
TestingAuthenticationToken authentication = new TestingAuthenticationToken(null,
null,
Expand Down
14 changes: 7 additions & 7 deletions ...rc/main/java/it/pagopa/selfcare/dashboard/web/model/mapper/InstitutionResourceMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@ default String toUserRole(String userRole) {
return null;
}

@Mapping(target = "name", source = "institutionInfo.description")
@Mapping(target = "aooParent", source = "institutionInfo.aooParentCode")
@Mapping(target = "subUnitType", source = "institutionInfo.subunitType")
@Mapping(target = "subUnitCode", source = "institutionInfo.subunitCode")
@Mapping(target = "rootParent", expression = "java(toRootParent(institutionInfo))")
@Mapping(target = "name", source = "institution.description")
@Mapping(target = "aooParent", source = "institution.aooParentCode")
@Mapping(target = "subUnitType", source = "institution.subunitType")
@Mapping(target = "subUnitCode", source = "institution.subunitCode")
@Mapping(target = "rootParent", expression = "java(toRootParent(institution))")
@Mapping(target = "roles", expression = "java(toRoles(productGrantedAuthorities, isBillingToken))")
ExchangeTokenServiceV2.Institution toInstitution(InstitutionInfo institutionInfo, List<ProductGrantedAuthority> productGrantedAuthorities, boolean isBillingToken);
ExchangeTokenServiceV2.Institution toInstitution(it.pagopa.selfcare.dashboard.connector.model.institution.Institution institution, List<ProductGrantedAuthority> productGrantedAuthorities, boolean isBillingToken);

@Named("toRootParent")
default ExchangeTokenServiceV2.RootParent toRootParent(InstitutionInfo institutionInfo) {
default ExchangeTokenServiceV2.RootParent toRootParent(it.pagopa.selfcare.dashboard.connector.model.institution.Institution institutionInfo) {
ExchangeTokenServiceV2.RootParent rootParent = new ExchangeTokenServiceV2.RootParent();
if(institutionInfo != null) {
rootParent.setId(institutionInfo.getId());
Expand Down
35 changes: 20 additions & 15 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 @@ -12,9 +12,9 @@
import it.pagopa.selfcare.dashboard.connector.api.ProductsConnector;
import it.pagopa.selfcare.dashboard.connector.api.UserApiConnector;
import it.pagopa.selfcare.dashboard.connector.model.groups.UserGroupInfo;
import it.pagopa.selfcare.dashboard.connector.model.institution.InstitutionInfo;
import it.pagopa.selfcare.dashboard.connector.model.product.Product;
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;
import it.pagopa.selfcare.dashboard.core.UserGroupService;
import it.pagopa.selfcare.dashboard.core.UserService;
Expand Down Expand Up @@ -102,15 +102,18 @@ public ExchangedToken exchange(String institutionId, String productId, Optional<
}
SelfCareUser selfCareUser = (SelfCareUser) authentication.getPrincipal();
String userId = selfCareUser.getId();
Map<String, ProductGrantedAuthority> productGrantedAuthorityMap = retrieveProductsFromInstitutionAndUser(institutionId, userId);
UserInstitution userInstitution = userApiConnector.getProducts(institutionId, userId);

Map<String, ProductGrantedAuthority> productGrantedAuthorityMap = retrieveProductsFromInstitutionAndUser(userInstitution);
final ProductGrantedAuthority productGrantedAuthority = Optional.ofNullable(productGrantedAuthorityMap.get(productId))
.orElseThrow(() -> new IllegalArgumentException(String.format("A Product Granted SelfCareAuthority is required for product '%s' and institution '%s'", productId, institutionId)));

InstitutionInfo institutionInfo = institutionService.getInstitution(institutionId);
Assert.notNull(institutionInfo, "Institution info is required");
Institution institution = institutionResourceMapper.toInstitution(institutionInfo, List.of(productGrantedAuthority), false);
retrieveAndSetGroups(institution, institutionId, productId, userId);
TokenExchangeClaims claims = retrieveAndSetClaims(authentication.getCredentials().toString(), institution, userId);

it.pagopa.selfcare.dashboard.connector.model.institution.Institution institution = institutionService.getInstitutionById(institutionId);
Assert.notNull(institution, "Institution info is required");
ExchangeTokenServiceV2.Institution institutionExchange = institutionResourceMapper.toInstitution(institution, List.of(productGrantedAuthority), false);
retrieveAndSetGroups(institutionExchange, institutionId, productId, userId);
TokenExchangeClaims claims = retrieveAndSetClaims(authentication.getCredentials().toString(), institutionExchange, userId, userInstitution.getUserMailUuid());

Product product = productsConnector.getProduct(productId);

Expand Down Expand Up @@ -142,15 +145,17 @@ public ExchangedToken retrieveBillingExchangedToken(String institutionId) {

final List<ProductGrantedAuthority> productGrantedAuthorities = new ArrayList<>();

Map<String, ProductGrantedAuthority> productGrantedAuthorityMap = retrieveProductsFromInstitutionAndUser(institutionId, userId);
UserInstitution userInstitution = userApiConnector.getProducts(institutionId, userId);

Map<String, ProductGrantedAuthority> productGrantedAuthorityMap = retrieveProductsFromInstitutionAndUser(userInstitution);
addProductIfIsInvoiceable(productGrantedAuthorityMap, invoiceableProductList, productGrantedAuthorities);
InstitutionInfo institutionInfo = institutionService.getInstitution(institutionId);
it.pagopa.selfcare.dashboard.connector.model.institution.Institution institutionInfo = institutionService.getInstitutionById(institutionId);
Assert.notNull(institutionInfo, "Institution info is required");
Institution institution = institutionResourceMapper.toInstitution(institutionInfo, productGrantedAuthorities, true);
ExchangeTokenServiceV2.Institution institution = institutionResourceMapper.toInstitution(institutionInfo, productGrantedAuthorities, true);

retrieveAndSetGroups(institution, institutionId, null, userId);

TokenExchangeClaims claims = retrieveAndSetClaims(credentials, institution, userId);
TokenExchangeClaims claims = retrieveAndSetClaims(credentials, institution, userId, userInstitution.getUserMailUuid());
claims.setAudience(billingAudience);

log.debug(LogUtils.CONFIDENTIAL_MARKER, "Exchanged claims = {}", claims);
Expand All @@ -176,15 +181,15 @@ private List<String> retrieveInvoiceableProductList() {
.toList();
}

private TokenExchangeClaims retrieveAndSetClaims(String credential, Institution institution, String userId) {
private TokenExchangeClaims retrieveAndSetClaims(String credential, Institution institution, String userId, String userMailUuid) {
Claims selcClaims = jwtService.getClaims(credential);
Assert.notNull(selcClaims, "Session token claims is required");
TokenExchangeClaims claims = new TokenExchangeClaims(selcClaims);
claims.setId(UUID.randomUUID().toString());
claims.setIssuer(issuer);
User user = userService.getUserByInternalId(UUID.fromString(userId));

String email = Optional.ofNullable(user.getWorkContact(institution.getId()))
String email = Optional.ofNullable(user.getWorkContact(userMailUuid))
.map(workContract -> Objects.nonNull(workContract.getEmail())
? workContract.getEmail().getValue()
: ""
Expand All @@ -201,8 +206,8 @@ private TokenExchangeClaims retrieveAndSetClaims(String credential, Institution
}


private Map<String, ProductGrantedAuthority> retrieveProductsFromInstitutionAndUser(String institutionId, String userId) {
return this.userApiConnector.getProducts(institutionId, userId)
private Map<String, ProductGrantedAuthority> retrieveProductsFromInstitutionAndUser(UserInstitution userInstitution) {
return userInstitution
.getProducts()
.stream()
.collect(Collectors.toMap(
Expand Down
Loading
Loading