release 3.0.10

Author: AK47454453

RELEASE_NOTES.md

@@ -1504,3 +1504,39 @@
 | ➕ dodane    | 3            |
 | 🔧 zmienione | 34           |
 | ➖ usunięte  | 0            |
+
+---
+# Changelog zmian - `## 3.0.10 (2025-12-22)` - `API: 2.0.0 RC6.1`
+
+## 1. ksef-client
+
+### 1.1 api
+- **DefaultKsefClient.java**: 🔧 dodanie pola i obsługi `String suffixURl`
+- **KsefApiProperties.java**: 🔧 dodanie metody `String getSuffixUri()`
+- **Url.java**: 🔧 usunięcie prefixów `/api/v2/` w urlach i przeniesienie do `KsefApiProperties` 
+
+### 1.2 client.model
+- **permission/search/QueryPersonalGrantTargetIdentifier.java**: 🔧 dodanie brakującej wartości enuma `IdentifierType` `INTERNAL_ID("InternalId")`
+
+### 1.3 api.services
+- **DefaultCryptographyService.java**: 🔧 dodanie pola `String secureRandomAlgorithm` wraz z konstruktorem który pozwala w metodach `generateRandom256BitsKey` i `generateRandom16BytesIv` używać wskazanego algorytmu
+
+## 2. demo-web-app
+
+### 2.1 integrationTest
+- **BatchIntegrationTest.java**: 🔧 zmiany w użyciu SecureRandom 
+- **QrCodeOnlineIntegrationTest.java**: 🔧 poprawka związana z błędnym invoicingDate 
+
+### 2.2 api
+- **ExampleApiProperties.java**: 🔧 dodanie konfiguracji pola `String suffixUri` wraz z getterami i setterami 
+
+### 2.3 resources
+- **application.yaml**: 🔧 dodanie konfiguracji `suffix-uri`
+
+## 3. Podsumowanie
+
+| Typ zmiany  | Liczba plików |
+|-------------|---------------|
+| ➕ dodane    | 0             |
+| 🔧 zmienione | 9             |
+| ➖ usunięte  | 0             |

demo-web-app/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "pl.akmf.ksef"
-version = "3.0.9"
+version = "3.0.10"
 
 java {
     toolchain {

demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/BatchIntegrationTest.java

@@ -347,7 +347,7 @@ void shouldThrowWhileSendWithInvalidEncryptedKey() throws JAXBException, IOExcep
         // Klucz musi być zaszyfrowany RSA-OAEP kluczem publicznym MF, więc losowe dane nie będą poprawne
         int encryptionKeySize = 256; // bytes dla RSA
         byte[] corruptedEncryptedKey = new byte[encryptionKeySize];
-        SecureRandom.getInstanceStrong().nextBytes(corruptedEncryptedKey);
+        new SecureRandom().nextBytes(corruptedEncryptedKey);
         String corruptedEncryptedSymmetricKey = Base64.getEncoder().encodeToString(corruptedEncryptedKey);
         corruptedEncryptionInfo.setEncryptedSymmetricKey(corruptedEncryptedSymmetricKey);
         corruptedEncryptionInfo.setInitializationVector(encryptionData.encryptionInfo().getInitializationVector());
@@ -457,7 +457,7 @@ void shouldThrowWhileSendWithInvalidInitializationVector() throws JAXBException,
         // W AES-CBC poprawny IV jest kluczowy dla odszyfrowania pierwszego bloku
         int InitializationVectorSize = 16; // bytes
         byte[] corruptedInitializationVector = new byte[InitializationVectorSize];
-        SecureRandom.getInstanceStrong().nextBytes(corruptedInitializationVector);
+        new SecureRandom().nextBytes(corruptedInitializationVector);
         corruptedEncryptionInfo.setEncryptedSymmetricKey(encryptionData.encryptionInfo().getEncryptedSymmetricKey());
         corruptedEncryptionInfo.setInitializationVector(Base64.getEncoder().encodeToString(corruptedInitializationVector));
         EncryptionData corruptedEncryptionData = new EncryptionData(encryptionData.cipherKey(), encryptionData.cipherIv(),

demo-web-app/src/integrationTest/java/pl/akmf/ksef/sdk/QrCodeOnlineIntegrationTest.java

@@ -69,8 +69,9 @@ public void qrCodeOnlineE2ETest() throws JAXBException, IOException, ApiExceptio
         //Otwarcie sesji online z szyfrowaniem RSA.
         String sessionReferenceNumber = openOnlineSession(encryptionData, SystemCode.FA_2, SchemaVersion.VERSION_1_0E, SessionValue.FA, accessToken);
 
+        LocalDate invoicingDate = LocalDate.of(2025, 6, 15);
         //Utworzenie i wysłanie faktury FA(2)
-        String invoiceReferenceNumber = sendInvoiceOnlineSession(contextNip, sessionReferenceNumber, encryptionData, "/xml/invoices/sample/invoice-template.xml", accessToken);
+        String invoiceReferenceNumber = sendInvoiceOnlineSession(contextNip, sessionReferenceNumber, invoicingDate, encryptionData, "/xml/invoices/sample/invoice-template.xml", accessToken);
 
         //Weryfikacja, czy faktura została dodana do sesji.
         await().atMost(30, SECONDS)
@@ -109,10 +110,9 @@ public void qrCodeOnlineE2ETest() throws JAXBException, IOException, ApiExceptio
                 .orElseThrow();
         String invoiceKsefNumber = invoiceMetadata.getKsefNumber();
         String invoiceHash = invoiceMetadata.getInvoiceHash();
-        OffsetDateTime invoicingDate = invoiceMetadata.getInvoicingDate();
 
         //Stworzenie linku weryfikacyjnego do faktury za pomoca certyfikatu oraz hashu faktury
-        String invoiceForOnlineUrl = verificationLinkService.buildInvoiceVerificationUrl(contextNip, invoicingDate.toLocalDate(), invoiceHash);
+        String invoiceForOnlineUrl = verificationLinkService.buildInvoiceVerificationUrl(contextNip, invoicingDate, invoiceHash);
 
         Assertions.assertNotNull(invoiceForOnlineUrl);
         Assertions.assertTrue(invoiceForOnlineUrl.contains(Base64.getUrlEncoder().withoutPadding().encodeToString(Base64.getDecoder().decode(invoiceHash))));
@@ -142,11 +142,11 @@ private String openOnlineSession(EncryptionData encryptionData, SystemCode syste
         return openOnlineSessionResponse.getReferenceNumber();
     }
 
-    private String sendInvoiceOnlineSession(String nip, String sessionReferenceNumber, EncryptionData encryptionData,
+    private String sendInvoiceOnlineSession(String nip, String sessionReferenceNumber, LocalDate invoicingDate, EncryptionData encryptionData,
                                             String path, String accessToken) throws IOException, ApiException {
         String invoiceTemplate = new String(readBytesFromPath(path), StandardCharsets.UTF_8)
                 .replace("#nip#", nip)
-                .replace("#invoicing_date#", LocalDate.of(2025, 6, 15).format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                .replace("#invoicing_date#", invoicingDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                 .replace("#invoice_number#", UUID.randomUUID().toString());
 
         byte[] invoice = invoiceTemplate.getBytes(StandardCharsets.UTF_8);

demo-web-app/src/main/java/pl/akmf/ksef/sdk/util/ExampleApiProperties.java

@@ -13,6 +13,7 @@
 public class ExampleApiProperties extends KsefApiProperties {
 
     private String baseUri;
+    private String suffixUri;
     private String qrUri;
     private int requestTimeout;
     private Map<String, String> defaultHeaders;
@@ -22,6 +23,11 @@ public String getBaseUri() {
         return baseUri;
     }
 
+    @Override
+    public String getSuffixUri() {
+        return suffixUri;
+    }
+
     @Override
     public String getQrUri() {
         return qrUri;
@@ -44,6 +50,10 @@ public void setBaseUri(String baseUri) {
         this.baseUri = baseUri;
     }
 
+    public void setSuffixUri(String suffixUri) {
+        this.suffixUri = suffixUri;
+    }
+
     public void setQrUri(String qrUri) {
         this.qrUri = qrUri;
     }

demo-web-app/src/main/resources/application.yaml

@@ -4,6 +4,7 @@ server:
 sdk:
   config:
     base-uri: "https://api-test.ksef.mf.gov.pl"
+    suffix-uri: "v2"
     qr-uri: "https://qr-test.ksef.mf.gov.pl"
     request-timeout: 100
 

ksef-client/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 
-val appVersion = "3.0.9"
+val appVersion = "3.0.10"
 val artifactName = "ksef-client"
 
 val githubRepositoryToken = "token"

ksef-client/src/main/java/pl/akmf/ksef/sdk/api/DefaultKsefClient.java

@@ -230,6 +230,7 @@ public class DefaultKsefClient implements KSeFClient {
     private final ObjectMapper objectMapper;
     private final HttpClient apiClient;
     private final String baseURl;
+    private final String suffixURl;
     private final Duration timeout;
     private final Map<String, String> defaultHeaders;
 
@@ -240,6 +241,7 @@ public DefaultKsefClient(HttpClient apiClient,
         this.defaultHeaders = ksefApiProperties.getDefaultHeaders();
         this.timeout = ksefApiProperties.getRequestTimeout();
         this.baseURl = ksefApiProperties.getBaseUri();
+        this.suffixURl = ksefApiProperties.getSuffixUri();
         this.objectMapper = objectMapper;
     }
 
@@ -2052,7 +2054,7 @@ private HttpResponse<byte[]> delete(String uri, Map<String, String> headers) thr
 
     private HttpRequest buildRequest(String uri, String method, byte[] body, Map<String, String> additionalHeaders) {
         HttpRequest.Builder builder = HttpRequest.newBuilder()
-                .uri(URI.create(baseURl + uri))
+                .uri(buildUri(baseURl, suffixURl, uri))
                 .timeout(timeout);
 
         defaultHeaders.forEach(builder::header);
@@ -2080,7 +2082,7 @@ private HttpRequest buildRequest(String uri, String method, byte[] body, Map<Str
 
     private HttpRequest buildRequest(String uri, String method, Object body, Map<String, String> additionalHeaders) throws JsonProcessingException {
         HttpRequest.Builder builder = HttpRequest.newBuilder()
-                .uri(URI.create(baseURl + uri))
+                .uri(buildUri(baseURl, suffixURl, uri))
                 .timeout(timeout);
 
         defaultHeaders.forEach(builder::header);
@@ -2277,4 +2279,9 @@ private void validResponse(HttpResponse<byte[]> response,
             throw new ApiException(e);
         }
     }
+
+    private URI buildUri(String baseUrl, String suffix, String url) {
+        URI urlWithSuffix = URI.create(baseUrl + "/").resolve(suffix);
+        return URI.create(urlWithSuffix + "/").resolve(url);
+    }
 }

ksef-client/src/main/java/pl/akmf/ksef/sdk/api/KsefApiProperties.java

@@ -6,6 +6,7 @@
 public abstract class KsefApiProperties {
 
     public abstract String getBaseUri();
+    public abstract String getSuffixUri();
     public abstract String getQrUri();
 
     public abstract Duration getRequestTimeout();