feat(nodo): CHK-1930 add apy-key for auth nodo ws

.env.example

@@ -15,6 +15,8 @@ NODO_CONNECTION_TIMEOUT=10000
 NODO_CONNECTION_STRING="{\"idPSP\":\"idPsp\",\"idChannel\":\"idChannel\",\"idBrokerPSP\":\"12345678912\",\"password\":\"password\"}"
 NODO_PARALLEL_REQUESTS=5
 NODO_ALL_CCP_ON_TRANSFER_IBAN_ENABLED=false
+NODO_NODEFORPSP_API_KEY=KEY
+NODO_CLOSEPAYMENT_API_KEY=KEY
 
 PAYMENT_TRANSACTIONS_GATEWAY_URI="http://pagopa-ecommerce-traefik/transactions-gateway"
 PAYMENT_TRANSACTIONS_GATEWAY_READ_TIMEOUT=10000

.env.intellij.example

@@ -1 +1 @@
-AFM_CONNECTION_TIMEOUT=10000;AFM_KEY=key;AFM_READ_TIMEOUT=10000;AFM_URI=http://pagopa-gec-mock:3000/afm/node/calculator-service/v1/fees;CLOSURE_RETRY_INTERVAL=30;ECOMMERCE_PAYMENT_INSTRUMENTS_CONNECTION_TIMEOUT=10000;ECOMMERCE_PAYMENT_INSTRUMENTS_READ_TIMEOUT=10000;ECOMMERCE_PAYMENT_INSTRUMENTS_URI=http://pagopa-ecommerce-payment-methods-service:8083;ECOMMERCE_PAYMENT_METHODS_APY_KEY=payment-methods-key;ECOMMERCE_PAYMENT_METHODS_CONNECTION_TIMEOUT=600;ECOMMERCE_PAYMENT_METHODS_READ_TIMEOUT=600;ECOMMERCE_PAYMENT_METHODS_URI=http://localhost:3000;ECOMMERCE_STORAGE_TRANSIENT_CONNECTION_STRING=DefaultEndpointsProtocol=http\;AccountName=devstoreaccount1\;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==\;QueueEndpoint=http://storage:10001/devstoreaccount1;JWT_SECRET=ODMzNUZBNTZENDg3NTYyREUyNDhGNDdCRUZDNzI3NDMzMzQwNTFEREZGQ0MyQzA5Mjc1RjY2NTQ1NDk5MDMxNzU5NDc0NUVFMTdDMDhGNzk4Q0Q3RENFMEJBODE1NURDREExNEY2Mzk4QzFEMTU0NTExNjUyMEExMzMwMTdDMDk;JWT_TOKEN_VALIDITY_TIME_MILLIS=600000;LOGO_CARD_BRANDING_MAPPING={VISA:'https://dev.checkout.pagopa.it/assets/creditcard/carta_visa.png',MASTERCARD:'https://dev.checkout.pagopa.it/assets/creditcard/carta_mc.png',DINERS:'https://dev.checkout.pagopa.it/assets/creditcard/carta_diners.png',MAESTRO:'https://dev.checkout.pagopa.it/assets/creditcard/carta_maestro.png',AMEX:'https://dev.checkout.pagopa.it/assets/creditcard/carta_amex.png',UNKNOWN:'https://dev.checkout.pagopa.it/assets/creditcard/generic.png'};MONGO_HOST=pagopa-ecommerce-mongo;MONGO_PASSWORD=password;MONGO_PORT=27017;MONGO_USERNAME=admin;NODE_FOR_PSP_URI=/webservices/pof/PagamentiTelematiciPspNodoservice;NODO_CONNECTION_STRING={"idPSP":"idPsp","idChannel":"idChannel","idBrokerPSP":"12345678912","password":"password"};NODO_CONNECTION_TIMEOUT=10000;NODO_HOSTNAME=http://pagopa-node-mock:3002;NODO_PARALLEL_REQUESTS=5;NODO_READ_TIMEOUT=10000;NODOPERPM_CONNECTION_TIMEOUT=10000;NODOPERPM_READ_TIMEOUT=10000;NODOPERPM_URI=/nodo/nodo-per-pm/v1/informazioniPagamento;NOTIFICATIONS_SERVICE_API_KEY=api-key;NOTIFICATIONS_SERVICE_CONNECTION_TIMEOUT=10000;NOTIFICATIONS_SERVICE_READ_TIMEOUT=10000;NOTIFICATIONS_SERVICE_URI=http://pagopa-ecommerce-traefik/notifications-service;PAYMENT_TOKEN_VALIDITY_TIME=120;PAYMENT_TRANSACTIONS_GATEWAY_API_KEY=key;PAYMENT_TRANSACTIONS_GATEWAY_CONNECTION_TIMEOUT=10000;PAYMENT_TRANSACTIONS_GATEWAY_READ_TIMEOUT=10000;PAYMENT_TRANSACTIONS_GATEWAY_URI=http://pagopa-ecommerce-traefik/transactions-gateway;PERSONAL_DATA_VAULT_API_BASE_PATH=http://pagopa-pdv-mock:8092;PERSONAL_DATA_VAULT_API_KEY=personal-data-vault-api-key;QueueEndpoint=http://storage:10001/devstoreaccount1;REDIS_HOST=pagopa-ecommerce-redis;REDIS_PASSWORD=redis_password;REDIS_PORT=6379;REDIS_SSL_ENABLED=false;TRANSACTION_CLOSE_PAYMENT_QUEUE_NAME=pagopa-ecommerce-transactions-close-payment-queue;TRANSACTION_CLOSE_PAYMENT_RETRY_QUEUE_NAME=pagopa-ecommerce-transactions-close-payment-retry-queue;TRANSACTION_EXPIRATION_QUEUE_NAME=pagopa-ecommerce-transactions-expiration-queue;TRANSACTION_NOTIFICATIONS_QUEUE_NAME=pagopa-ecommerce-transactions-notifications-queue;TRANSACTION_REFUND_QUEUE_NAME=pagopa-ecommerce-transactions-refund-queue;TRANSACTIONS_RETRY_OFFSET=60;NODO_ALL_CCP_ON_TRANSFER_IBAN_ENABLED=false
+AFM_CONNECTION_TIMEOUT=10000;AFM_KEY=key;AFM_READ_TIMEOUT=10000;AFM_URI=http://pagopa-gec-mock:3000/afm/node/calculator-service/v1/fees;CLOSURE_RETRY_INTERVAL=30;ECOMMERCE_PAYMENT_INSTRUMENTS_CONNECTION_TIMEOUT=10000;ECOMMERCE_PAYMENT_INSTRUMENTS_READ_TIMEOUT=10000;ECOMMERCE_PAYMENT_INSTRUMENTS_URI=http://pagopa-ecommerce-payment-methods-service:8083;ECOMMERCE_PAYMENT_METHODS_APY_KEY=payment-methods-key;ECOMMERCE_PAYMENT_METHODS_CONNECTION_TIMEOUT=600;ECOMMERCE_PAYMENT_METHODS_READ_TIMEOUT=600;ECOMMERCE_PAYMENT_METHODS_URI=http://localhost:3000;ECOMMERCE_STORAGE_TRANSIENT_CONNECTION_STRING=DefaultEndpointsProtocol=http\;AccountName=devstoreaccount1\;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==\;QueueEndpoint=http://storage:10001/devstoreaccount1;JWT_SECRET=ODMzNUZBNTZENDg3NTYyREUyNDhGNDdCRUZDNzI3NDMzMzQwNTFEREZGQ0MyQzA5Mjc1RjY2NTQ1NDk5MDMxNzU5NDc0NUVFMTdDMDhGNzk4Q0Q3RENFMEJBODE1NURDREExNEY2Mzk4QzFEMTU0NTExNjUyMEExMzMwMTdDMDk;JWT_TOKEN_VALIDITY_TIME_MILLIS=600000;LOGO_CARD_BRANDING_MAPPING={VISA:'https://dev.checkout.pagopa.it/assets/creditcard/carta_visa.png',MASTERCARD:'https://dev.checkout.pagopa.it/assets/creditcard/carta_mc.png',DINERS:'https://dev.checkout.pagopa.it/assets/creditcard/carta_diners.png',MAESTRO:'https://dev.checkout.pagopa.it/assets/creditcard/carta_maestro.png',AMEX:'https://dev.checkout.pagopa.it/assets/creditcard/carta_amex.png',UNKNOWN:'https://dev.checkout.pagopa.it/assets/creditcard/generic.png'};MONGO_HOST=pagopa-ecommerce-mongo;MONGO_PASSWORD=password;MONGO_PORT=27017;MONGO_USERNAME=admin;NODE_FOR_PSP_URI=/webservices/pof/PagamentiTelematiciPspNodoservice;NODO_CONNECTION_STRING={"idPSP":"idPsp","idChannel":"idChannel","idBrokerPSP":"12345678912","password":"password"};NODO_CONNECTION_TIMEOUT=10000;NODO_HOSTNAME=http://pagopa-node-mock:3002;NODO_PARALLEL_REQUESTS=5;NODO_READ_TIMEOUT=10000;NODO_NODEFORPSP_API_KEY=KEY;NODO_CLOSEPAYMENT_API_KEY=KEY;NODOPERPM_CONNECTION_TIMEOUT=10000;NODOPERPM_READ_TIMEOUT=10000;NODOPERPM_URI=/nodo/nodo-per-pm/v1/informazioniPagamento;NOTIFICATIONS_SERVICE_API_KEY=api-key;NOTIFICATIONS_SERVICE_CONNECTION_TIMEOUT=10000;NOTIFICATIONS_SERVICE_READ_TIMEOUT=10000;NOTIFICATIONS_SERVICE_URI=http://pagopa-ecommerce-traefik/notifications-service;PAYMENT_TOKEN_VALIDITY_TIME=120;PAYMENT_TRANSACTIONS_GATEWAY_API_KEY=key;PAYMENT_TRANSACTIONS_GATEWAY_CONNECTION_TIMEOUT=10000;PAYMENT_TRANSACTIONS_GATEWAY_READ_TIMEOUT=10000;PAYMENT_TRANSACTIONS_GATEWAY_URI=http://pagopa-ecommerce-traefik/transactions-gateway;PERSONAL_DATA_VAULT_API_BASE_PATH=http://pagopa-pdv-mock:8092;PERSONAL_DATA_VAULT_API_KEY=personal-data-vault-api-key;QueueEndpoint=http://storage:10001/devstoreaccount1;REDIS_HOST=pagopa-ecommerce-redis;REDIS_PASSWORD=redis_password;REDIS_PORT=6379;REDIS_SSL_ENABLED=false;TRANSACTION_CLOSE_PAYMENT_QUEUE_NAME=pagopa-ecommerce-transactions-close-payment-queue;TRANSACTION_CLOSE_PAYMENT_RETRY_QUEUE_NAME=pagopa-ecommerce-transactions-close-payment-retry-queue;TRANSACTION_EXPIRATION_QUEUE_NAME=pagopa-ecommerce-transactions-expiration-queue;TRANSACTION_NOTIFICATIONS_QUEUE_NAME=pagopa-ecommerce-transactions-notifications-queue;TRANSACTION_REFUND_QUEUE_NAME=pagopa-ecommerce-transactions-refund-queue;TRANSACTIONS_RETRY_OFFSET=60;NODO_ALL_CCP_ON_TRANSFER_IBAN_ENABLED=false

README.md

@@ -22,6 +22,8 @@ These are all environment variables needed by the application:
 | NODO_READ_TIMEOUT                              |     | Timeout for requests towards Nodo                                                                                                     | number  |         |
 | NODO_CONNECTION_TIMEOUT                        |     | Timeout for establishing connections towards Nodo                                                                                     | number  |         |
 | NODO_ALL_CCP_ON_TRANSFER_IBAN_ENABLED          |     | Flag to enable light check for allCCP. If true it checks only all transfers' iban. If false, it checks also metadata                  | boolean |         |
+| NODO_NODEFORPSP_API_KEY                        |     | API Key for NODE FOR PSP WS                                                                                                           | string  |         |
+| NODO_CLOSEPAYMENT_API_KEY                      |     | API Key for Nodo closePayment API                                                                                                     | string  |         |
 | ECOMMERCE_PAYMENT_METHODS_URI                  |     | eCommerce payment methods service connection URI                                                                                      | string  |         |
 | ECOMMERCE_PAYMENT_METHODS_READ_TIMEOUT         |     | Timeout for requests towards eCommerce payment methods service                                                                        | number  |         |
 | ECOMMERCE_PAYMENT_METHODS_CONNECTION_TIMEOUT   |     | Timeout for establishing connections towards eCommerce payment methods  service                                                       | number  |         |

helm/values-dev.yaml

@@ -76,7 +76,7 @@ microservice-chart:
     REDIS_PORT: "6380"
     REDIS_SSL_ENABLED: "true"
     NODO_HOSTNAME: https://api.dev.platform.pagopa.it
-    NODE_FOR_PSP_URI: /nodo/node-for-psp/v1
+    NODE_FOR_PSP_URI: /nodo-auth/node-for-psp/v1
     NODO_READ_TIMEOUT: "10000"
     NODO_CONNECTION_TIMEOUT: "10000"
     NODO_PARALLEL_REQUESTS: "5"
@@ -123,6 +123,8 @@ microservice-chart:
     MONGO_PASSWORD: mongo-ecommerce-password
     REDIS_PASSWORD: redis-ecommerce-password
     NODO_CONNECTION_STRING: nodo-connection-string
+    NODO_CLOSEPAYMENT_API_KEY: nodo-nodeforpm-api-key
+    NODO_NODEFORPSP_API_KEY: nodo-nodeforpsp-api-key
     NOTIFICATIONS_SERVICE_API_KEY: notifications-service-api-key
     ECOMMERCE_STORAGE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
     PAYMENT_TRANSACTIONS_GATEWAY_API_KEY: payment-transactions-gateway-api-key

helm/values-prod.yaml

@@ -25,7 +25,7 @@ microservice-chart:
       REDIS_PORT: "6380"
       REDIS_SSL_ENABLED: "true"
       NODO_HOSTNAME: https://api.platform.pagopa.it
-      NODE_FOR_PSP_URI: /nodo/node-for-psp/v1
+      NODE_FOR_PSP_URI: /nodo-auth/node-for-psp/v1
       NODO_READ_TIMEOUT: "10000"
       NODO_CONNECTION_TIMEOUT: "10000"
       NODO_PARALLEL_REQUESTS: "5"
@@ -74,6 +74,8 @@ microservice-chart:
       MONGO_PASSWORD: mongo-ecommerce-password
       REDIS_PASSWORD: redis-ecommerce-password
       NODO_CONNECTION_STRING: nodo-connection-string
+      NODO_CLOSEPAYMENT_API_KEY: nodo-nodeforpm-api-key
+      NODO_NODEFORPSP_API_KEY: nodo-nodeforpsp-api-key
       PAYMENT_TRANSACTIONS_GATEWAY_API_KEY: payment-transactions-gateway-api-key
       JWT_SECRET: sessions-jwt-secret
       PERSONAL_DATA_VAULT_API_KEY: personal-data-vault-api-key
@@ -147,7 +149,7 @@ microservice-chart:
     REDIS_PORT: "6380"
     REDIS_SSL_ENABLED: "true"
     NODO_HOSTNAME: https://api.platform.pagopa.it
-    NODE_FOR_PSP_URI: /nodo/node-for-psp/v1
+    NODE_FOR_PSP_URI: /nodo-auth/node-for-psp/v1
     NODO_READ_TIMEOUT: "10000"
     NODO_CONNECTION_TIMEOUT: "10000"
     NODO_PARALLEL_REQUESTS: "5"
@@ -196,6 +198,8 @@ microservice-chart:
     MONGO_PASSWORD: mongo-ecommerce-password
     REDIS_PASSWORD: redis-ecommerce-password
     NODO_CONNECTION_STRING: nodo-connection-string
+    NODO_CLOSEPAYMENT_API_KEY: nodo-nodeforpm-api-key
+    NODO_NODEFORPSP_API_KEY: nodo-nodeforpsp-api-key
     NOTIFICATIONS_SERVICE_API_KEY: notifications-service-api-key
     ECOMMERCE_STORAGE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
     PAYMENT_TRANSACTIONS_GATEWAY_API_KEY: payment-transactions-gateway-api-key

helm/values-uat.yaml

@@ -25,7 +25,7 @@ microservice-chart:
       REDIS_PORT: "6380"
       REDIS_SSL_ENABLED: "true"
       NODO_HOSTNAME: https://api.uat.platform.pagopa.it
-      NODE_FOR_PSP_URI: /nodo/node-for-psp/v1
+      NODE_FOR_PSP_URI: /nodo-auth/node-for-psp/v1
       NODO_READ_TIMEOUT: "10000"
       NODO_CONNECTION_TIMEOUT: "10000"
       NODO_PARALLEL_REQUESTS: "5"
@@ -73,6 +73,8 @@ microservice-chart:
       MONGO_PASSWORD: mongo-ecommerce-password
       REDIS_PASSWORD: redis-ecommerce-password
       NODO_CONNECTION_STRING: nodo-connection-string
+      NODO_CLOSEPAYMENT_API_KEY: nodo-nodeforpm-api-key
+      NODO_NODEFORPSP_API_KEY: nodo-nodeforpsp-api-key
       PAYMENT_TRANSACTIONS_GATEWAY_API_KEY: payment-transactions-gateway-api-key
       JWT_SECRET: sessions-jwt-secret
       PERSONAL_DATA_VAULT_API_KEY: personal-data-vault-api-key
@@ -146,7 +148,7 @@ microservice-chart:
     REDIS_PORT: "6380"
     REDIS_SSL_ENABLED: "true"
     NODO_HOSTNAME: https://api.uat.platform.pagopa.it
-    NODE_FOR_PSP_URI: /nodo/node-for-psp/v1
+    NODE_FOR_PSP_URI: /nodo-auth/node-for-psp/v1
     NODO_READ_TIMEOUT: "10000"
     NODO_CONNECTION_TIMEOUT: "10000"
     NODO_PARALLEL_REQUESTS: "5"
@@ -194,6 +196,8 @@ microservice-chart:
     MONGO_PASSWORD: mongo-ecommerce-password
     REDIS_PASSWORD: redis-ecommerce-password
     NODO_CONNECTION_STRING: nodo-connection-string
+    NODO_CLOSEPAYMENT_API_KEY: nodo-nodeforpm-api-key
+    NODO_NODEFORPSP_API_KEY: nodo-nodeforpsp-api-key
     NOTIFICATIONS_SERVICE_API_KEY: notifications-service-api-key
     ECOMMERCE_STORAGE_TRANSIENT_CONNECTION_STRING: ecommerce-storage-transient-connection-string
     PAYMENT_TRANSACTIONS_GATEWAY_API_KEY: payment-transactions-gateway-api-key

src/main/java/it/pagopa/transactions/client/NodeForPspClient.java

@@ -32,6 +32,12 @@ public class NodeForPspClient {
     @Value("${nodo.nodeforpsp.uri}")
     private String nodoPerPspUri;
 
+    @Value("${nodo.nodeforpsp.apikey}")
+    private String nodoPerPspApiKey;
+
+    @Value("${nodo.closepayment.apikey}")
+    private String nodoClosePaymentApiKey;
+
     public Mono<ActivatePaymentNoticeV2Response> activatePaymentNoticeV2(
                                                                          JAXBElement<ActivatePaymentNoticeV2Request> request
     ) {
@@ -41,6 +47,7 @@ public Mono<ActivatePaymentNoticeV2Response> activatePaymentNoticeV2(
                 .uri(nodoPerPspUri)
                 .header("Content-Type", MediaType.TEXT_XML_VALUE)
                 .header("SOAPAction", "activatePaymentNoticeV2")
+                .header("ocp-apim-subscription-key", nodoPerPspApiKey)
                 .body(Mono.just(new SoapEnvelope("", request)), SoapEnvelope.class)
                 .retrieve()
                 .onStatus(
@@ -81,10 +88,11 @@ public Mono<ClosePaymentResponseDto> closePaymentV2(ClosePaymentRequestV2Dto req
         );
         return nodoWebClient.post()
                 .uri(
-                        uriBuilder -> uriBuilder.path("/nodo/nodo-per-pm/v2/closepayment")
+                        uriBuilder -> uriBuilder.path("/nodo-auth/nodo-per-pm/v2/closepayment")
                                 .queryParam("clientId", CLOSE_PAYMENT_CLIENT_ID).build()
                 )
                 .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .header("ocp-apim-subscription-key", nodoClosePaymentApiKey)
                 .body(Mono.just(request), ClosePaymentRequestV2Dto.class)
                 .retrieve()
                 .onStatus(

src/main/resources/application.properties

@@ -16,7 +16,8 @@ nodo.connectionTimeout=${NODO_CONNECTION_TIMEOUT}
 nodo.connection.string=${NODO_CONNECTION_STRING}
 nodo.parallelRequests=${NODO_PARALLEL_REQUESTS}
 nodo.allCCPOnTransferIbanEnabled=${NODO_ALL_CCP_ON_TRANSFER_IBAN_ENABLED}
-
+nodo.nodeforpsp.apikey=${NODO_NODEFORPSP_API_KEY}
+nodo.closepayment.apikey=${NODO_CLOSEPAYMENT_API_KEY}
 paymentTransactionsGateway.uri=${PAYMENT_TRANSACTIONS_GATEWAY_URI}/
 paymentTransactionsGateway.readTimeout=${PAYMENT_TRANSACTIONS_GATEWAY_READ_TIMEOUT}
 paymentTransactionsGateway.connectionTimeout=${PAYMENT_TRANSACTIONS_GATEWAY_CONNECTION_TIMEOUT}