fix: Added TPP secret (#14)

Co-authored-by: stefanodel <[email protected]>
Co-authored-by: DanieleRanaldo <[email protected]>

Author: 3 people

.github/workflows/code-review.yml

@@ -14,10 +14,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0  # Fetch all history for all branches and tags
 
       - name: Set up JDK 17
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 #v4.2.1
+        uses: actions/[email protected]
         with:
           distribution: 'adopt'
           java-version: '17'
@@ -33,17 +35,23 @@ jobs:
       - name: Build and test with Maven
         run: mvn clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent verify org.jacoco:jacoco-maven-plugin:0.8.8:report org.jacoco:jacoco-maven-plugin:0.8.8:report-aggregate -B
 
+      - name: Generate JaCoCo XML Report
+        run: mvn org.jacoco:jacoco-maven-plugin:0.8.8:report -Djacoco.reportFormat=xml -B
+
       - name: SonarCloud Scan
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-         mvn sonar:sonar \
-          -Dsonar.projectKey=${{ vars.SONARCLOUD_PROJECT_KEY }} \
-          -Dsonar.organization=${{ vars.SONARCLOUD_ORG }} \
-          -Dsonar.host.url=https://sonarcloud.io \
-          -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
-          -Dsonar.java.binaries=target/classes \
-          -Dsonar.junit.reportPaths=target/surefire-reports \
-          -Dsonar.jacoco.reportPaths=target/jacoco.exec \
-          -Dsonar.exclusions=**/enums/**,**/model/**,**/stub/**,**/dto/**,**/*Constant*,**/*Config.java,**/*Scheduler.java,**/*Application.java,**/src/test/**,**/Dummy*.java
+          mvn sonar:sonar \
+            -Dsonar.projectKey=${{ vars.SONARCLOUD_PROJECT_KEY }} \
+            -Dsonar.organization=${{ vars.SONARCLOUD_ORG }} \
+            -Dsonar.host.url=https://sonarcloud.io \
+            -Dsonar.token=${{ secrets.SONAR_TOKEN }} \
+            -Dsonar.java.binaries=target/classes \
+            -Dsonar.junit.reportPaths=target/surefire-reports \
+            -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml \
+            -Dsonar.exclusions=**/enums/**,**/model/**,**/stub/**,**/dto/**,**/*Constant*,**/*Config.java,**/*Scheduler.java,**/*Application.java,**/src/test/**,**/Dummy*.java
+
+      - name: Fetch all branches
+        run: git fetch --all

src/main/java/it/gov/pagopa/message/core/service/SendMessageServiceImpl.java

@@ -3,6 +3,7 @@
 import it.gov.pagopa.message.core.dto.MessageDTO;
 import it.gov.pagopa.message.core.dto.TokenDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -17,16 +18,30 @@ public class SendMessageServiceImpl implements SendMessageService {
 
     private final RestTemplate restTemplate;
     private final MessageErrorProducerService errorProducerService;
+
+    private final String client;
+    private final String clientId;
+    private final String grantType;
+
+    private final String tenantId;
     public SendMessageServiceImpl(MessageErrorProducerService errorProducerService,
-                                  RestTemplate restTemplate) {
+                                  RestTemplate restTemplate,
+                                  @Value("${app.token.client}")String client,
+                                  @Value("${app.token.clientId}") String clientId,
+                                  @Value("${app.token.grantType}") String grantType,
+                                  @Value("${app.token.tenantId}") String tenantId) {
         this.restTemplate = restTemplate;
         this.errorProducerService = errorProducerService;
+        this.client = client;
+        this.clientId = clientId;
+        this.grantType = grantType;
+        this.tenantId = tenantId;
     }
 
     @Override
     public void sendMessage(MessageDTO messageDTO, String messageUrl, String authenticationUrl) {
         try {
-            toUrl(messageDTO, messageUrl, getToken(authenticationUrl, messageDTO.getRecipientId()));
+            toUrl(messageDTO, messageUrl, getToken(authenticationUrl));
         }
         catch (Exception e) {
             log.info("[EMD][SEND-MESSAGE] Error while sending message");
@@ -37,32 +52,28 @@ public void sendMessage(MessageDTO messageDTO, String messageUrl, String authent
     @Override
     public void sendMessage(MessageDTO messageDTO, String messageUrl, String authenticationUrl, long retry) {
         try {
-            toUrl(messageDTO, messageUrl, getToken(authenticationUrl, messageDTO.getRecipientId()));
+            toUrl(messageDTO, messageUrl, getToken(authenticationUrl));
         }
         catch (Exception e) {
             log.info("[EMD][SEND-MESSAGE] Error while sending message");
             errorProducerService.sendError(messageDTO,messageUrl,authenticationUrl,retry);
         }
     }
 
-    private TokenDTO getToken(String authenticationUrl, String recipientId) throws Exception{
+    private TokenDTO getToken(String authenticationUrl) throws Exception{
 
         HttpHeaders headers = new HttpHeaders();
-        headers.set("RequestId", "00000000-0000-0000-0000-000000000006");
         headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
 
-        String client = "64b5f14d-56ef-4d14-8b65-ff7bc5d4661e";
-        String clientId = "6010064c-ec73-4fa5-9ed5-5446af8920cf";
-        String grantType = "client_credentials";
         MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
         map.add("client_secret", client);
         map.add("client_id", clientId);
         map.add("grant_type", grantType);
-        map.add("fiscal_code", recipientId);
 
-        HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(map, headers);
+        HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(map,headers);
         TokenDTO token;
 
+        authenticationUrl = authenticationUrl.replace("tenantId",tenantId);
         log.info("[EMD][SEND-MESSAGE] Getting Token");
         token = restTemplate.exchange(
                 authenticationUrl,

src/main/resources/application.yml

@@ -85,6 +85,11 @@ spring:
 
 app:
   retry.max-retry: ${ERROR_MESSAGE_MAX_RETRY:5}
+  token:
+    client: ${HYPE_KEY:}
+    clientId: ${HYPE_CLIENT:}
+    grantType: ${GRANT_TYPE:client_credentials}
+    tenantId: ${HYPE_TENANT:}
 
 management:
   health:

src/test/java/it/gov/pagopa/message/core/controller/CitizenControllerTest.java

@@ -85,17 +85,18 @@ void updateCitizenConsent_Ok() throws Exception {
 
     @Test
     void deleteCitizenConsent_Ok() throws Exception {
+        String userId = "testUserId";
+        String channelId = "testChannelId";
         CitizenConsentDTO citizenConsentDTO = CitizenConsentDTOFaker.mockInstance(false);
-
         Mockito.when(
-            citizenService.deleteCitizenConsent(citizenConsentDTO.getHashedFiscalCode(),citizenConsentDTO.getChannelId()))
+            citizenService.deleteCitizenConsent(userId,channelId))
                     .thenReturn(citizenConsentDTO);
 
         MvcResult result = mockMvc.perform(
                 delete("/emd/onboarding-citizen/citizenConsents")
-                        .contentType(MediaType.APPLICATION_JSON)
+                        .param("userId", userId)
+                        .param("channelId", channelId)
                         .accept(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(citizenConsentDTO))
         ).andExpect(status().isOk()).andReturn();
 
         CitizenConsentDTO resultResponse = objectMapper.readValue(