Fix tests by replacing documentNumbers with working ones. Update dependencies. (#77)

* fix tests by replacing documentNumbers with working ones. update dependencies.
* downgrade jersey to 3.0.x as 3.1.x does not work with Java 8
* downgrade resteasy
* downgrade resteasy to 6.0.x as higher versions don't work with Java 8
* fix typo in README.md
* remove codecov

---------

Co-authored-by: juhanaasaru <Juhan.Aasaru@nortal.com>

Author: aasaru

.travis.yml

@@ -11,9 +11,6 @@ env:
 before_install:
 - eval $(openssl aes-256-cbc -K $encrypted_key -iv $encrypted_iv -in private.key.enc -out private.key -d)
 - chmod +x travis.sh
-- pip install --user codecov
 install: true
-after_success:
-- codecov
 script:
 - "./travis.sh"

README.md

@@ -214,7 +214,7 @@ String verificationCode = authenticationHash.calculateVerificationCode();
 
 SmartIdAuthenticationResponse authenticationResponse = client
     .createAuthentication()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
     .withAuthenticationHash(authenticationHash)
     .withCertificateLevel("QUALIFIED")
     .withAllowedInteractionsOrder(Collections.singletonList(
@@ -291,7 +291,7 @@ To fetch the certificate you can use documentNumber.
 ```java
 SmartIdCertificate responseWithSigningCertificate = client
     .getCertificate()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q") // returned as authentication result
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q") // returned as authentication result
     .withCertificateLevel("QUALIFIED")
     .fetch();
 
@@ -328,7 +328,7 @@ String verificationCode = hashToSign.calculateVerificationCode();
 
 SmartIdSignature smartIdSignature = client
     .createSignature()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q") // returned as authentication result
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q") // returned as authentication result
     .withSignableHash(hashToSign)
     .withCertificateLevel("QUALIFIED")
     .withAllowedInteractionsOrder(asList(
@@ -372,7 +372,7 @@ Every Smart-ID app supports this interaction flow and there is no need to provid
 ```java
 SmartIdSignature smartIdSignature = client
     .createSignature()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
     .withSignableHash(hashToSign)
     .withCertificateLevel("QUALIFIED")
     .withAllowedInteractionsOrder(Collections.singletonList(
@@ -394,7 +394,7 @@ If user's app doesn't support displaying verification code choice then system fa
 try {
     SmartIdSignature smartIdSignature = client
         .createSignature()
-        .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+        .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
         .withSignableHash(hashToSign)
         .withCertificateLevel("QUALIFIED")
         .withAllowedInteractionsOrder(Arrays.asList(
@@ -417,7 +417,7 @@ If the Smart-ID app in user's smart device doesn't support this feature then the
 ```java
 SmartIdSignature smartIdSignature = client
     .createSignature()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
     .withSignableHash(hashToSign)
     .withCertificateLevel("QUALIFIED")
     .withAllowedInteractionsOrder(asList(
@@ -445,7 +445,7 @@ If user picks wrong verification code then the session is cancelled and library
 ```java
 SmartIdSignature smartIdSignature = client
     .createSignature()
-    .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+    .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
     .withSignableHash(hashToSign)
     .withCertificateLevel("QUALIFIED")
     .withAllowedInteractionsOrder(asList(
@@ -476,7 +476,7 @@ If End User's phone doesn't support required flow the library throws `RequiredIn
 try {
     client
         .createSignature()
-        .withDocumentNumber("PNOLT-30303039914-PBZK-Q")
+        .withDocumentNumber("PNOLT-30303039914-MOCK-Q")
         .withSignableHash(hashToSign)
         .withCertificateLevel("QUALIFIED")
         .withAllowedInteractionsOrder(Collections.singletonList(
@@ -503,7 +503,7 @@ This way it is possible to reduce error handling code to only handle generic par
             * UserRefusedConfirmationMessageWithVerificationChoiceException
             * UserRefusedDisplayTextAndPinException
             * UserRefusedVerificationChoiceException
-        * UserSelectedWrongVerificationCodeException - 3 different codeuser was displayed 3 codes in app and selected wrong code
+        * UserSelectedWrongVerificationCodeException - the end user was displayed 3 codes in app and user selected wrong code
     * UserAccountException - Exceptions that are caused by user account configuration. 
         * CertificateLevelMismatchException
         * NoSuitableAccountOfRequestedTypeFoundException
@@ -516,7 +516,7 @@ This way it is possible to reduce error handling code to only handle generic par
         * ServerMaintenanceException - Server is currently under maintenance
         * SmartIdClientException - this exception is a sign of incorrect integration with Smart-ID service (i.e. missing parameters etc)
             * RelyingPartyAccountConfigurationException - indicates that RelyingParty configuration at Smart-ID side can be incorrect
-            * UnprocessableSmartIdResponseException - shouldn't happen under normal condtitions
+            * UnprocessableSmartIdResponseException - shouldn't happen under normal conditions
     * SessionNotFoundException - When session was not found. Usually this is also caused by problems with implementation.
 
 

pom.xml

@@ -27,12 +27,12 @@
         <developer>
             <name>Juhan Aasaru</name>
             <organization>Nortal</organization>
-            <organizationUrl>http://www.nortal.com</organizationUrl>
+            <organizationUrl>https://www.nortal.com</organizationUrl>
         </developer>
         <developer>
             <name>Andreas Valdma</name>
             <organization>Nortal</organization>
-            <organizationUrl>http://www.nortal.com</organizationUrl>
+            <organizationUrl>https://www.nortal.com</organizationUrl>
         </developer>
     </developers>
 
@@ -45,19 +45,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <jackson.version>2.13.4</jackson.version>
-        <jackson.annotations.version>2.13.4</jackson.annotations.version>
-        <jersey.version>3.0.8</jersey.version>
-        <rs-api.version>3.0.0</rs-api.version>
-        <resteasy.version>6.0.3.Final</resteasy.version>
+        <jackson.version>2.14.2</jackson.version>
+        <jackson.annotations.version>2.14.2</jackson.annotations.version>
+        <jersey.version>3.0.10</jersey.version><!-- NB! 3.1.x does not work with Java 8 -->
+        <resteasy.version>6.0.3.Final</resteasy.version><!-- 6.1+ doesn't work with Java 8 -->
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-json-jackson</artifactId>
@@ -69,12 +63,6 @@
             <version>${jersey.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${rs-api.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
             <artifactId>jersey-apache-connector</artifactId>
@@ -245,10 +233,10 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>7.3.0</version>
+                <version>8.2.1</version>
                 <configuration>
                     <skipTestScope>true</skipTestScope>
-                    <skip>true</skip>
+                    <skip>false</skip>
                 </configuration>
                 <executions>
                     <execution>

src/main/java/ee/sk/smartid/AuthenticationResponseValidator.java

@@ -85,9 +85,8 @@ public AuthenticationResponseValidator(X509Certificate[] trustedCertificates) {
   }
 
   /**
-   * Validates the authentication response and returns the its result
-   *
-   * Performs following validations:
+   * Validates the authentication response and returns the result.
+   * Performs the following validations:
    * "result.endResult" has the value "OK"
    * "signature.value" is the valid signature over the same "hash", which was submitted by the RP.
    * "signature.value" is the valid signature, verifiable with the public key inside the certificate of the user, given in the field "cert.value"
@@ -121,7 +120,7 @@ public AuthenticationIdentity validate(SmartIdAuthenticationResponse authenticat
    * Gets the list of trusted CA certificates
    * <p>
    * Authenticating person's certificate has to be issued by
-   * one of the trusted CA certificates. Otherwise the person's
+   * one of the trusted CA certificates. Otherwise, the person's
    * authentication is deemed untrusted and therefore not valid.
    *
    * @return list of trusted CA certificates
@@ -134,7 +133,7 @@ public List<X509Certificate> getTrustedCACertificates() {
    * Adds a certificate to the list of trusted CA certificates
    * <p>
    * Authenticating person's certificate has to be issued by
-   * one of the trusted CA certificates. Otherwise the person's
+   * one of the trusted CA certificates. Otherwise, the person's
    * authentication is deemed untrusted and therefore not valid.
    *
    * @param certificate trusted CA certificate
@@ -148,7 +147,7 @@ public void addTrustedCACertificate(X509Certificate certificate) {
    * adds it into the list of trusted CA certificates
    * <p>
    * Authenticating person's certificate has to be issued by
-   * one of the trusted CA certificates. Otherwise the person's
+   * one of the trusted CA certificates. Otherwise, the person's
    * authentication is deemed untrusted and therefore not valid.
    *
    * @throws CertificateException when there was an error constructing the certificate from bytes
@@ -166,7 +165,7 @@ public void addTrustedCACertificate(byte[] certificateBytes) throws CertificateE
    * and adds it into the list of trusted CA certificates
    * <p>
    * Authenticating person's certificate has to be issued by
-   * one of the trusted CA certificates. Otherwise the person's
+   * one of the trusted CA certificates. Otherwise, the person's
    * authentication is deemed untrusted and therefore not valid.
    *
    * @throws IOException when there is an error reading the file

src/test/java/ee/sk/smartid/EndpointSslVerificationIntegrationTest.java

@@ -55,7 +55,7 @@ public class EndpointSslVerificationIntegrationTest {
     private static final String LIVE_HOST_URL = "https://rp-api.smart-id.com/v1";
     private static final String DEMO_RELYING_PARTY_UUID = "00000000-0000-0000-0000-000000000000";
     private static final String DEMO_RELYING_PARTY_NAME = "DEMO";
-    private static final String DEMO_DOCUMENT_NUMBER = "PNOLT-30303039914-PBZK-Q";
+    private static final String DEMO_DOCUMENT_NUMBER = "PNOLT-30303039914-MOCK-Q";
 
     public static final String LIVE_HOST_SSL_CERTIFICATE = "-----BEGIN CERTIFICATE-----\nMIIGjjCCBXagAwIBAgIQA6feGFsbcuz3yYop3036xzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E\naWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTkxMTAxMDAwMDAwWhcN\nMjExMTA1MTIwMDAwWjBaMQswCQYDVQQGEwJFRTEQMA4GA1UEBxMHVGFsbGlubjEb\nMBkGA1UEChMSU0sgSUQgU29sdXRpb25zIEFTMRwwGgYDVQQDExNycC1hcGkuc21h\ncnQtaWQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuycMJZaS\nlaHLAYvqSFLoTZUF61EPrU4SiYmNqpvoAR7A/ywfjsZUyil1xBYwKI9+wZ4fW1Lj\njgzAY5p26ueGQSx/qHSU5D4ISL6dYvV1zvg5KRYtf1PxPFCOIhwzvoj8XnuiJoBt\n/wZmekB90giFRaeUmM2hCU9j78AM6hVJxMsvjP9Kpua4Hc4RJJSZwpnjO8nLO1BO\ndRf1M6TFqkYqUYtSJ8Y2NTalgo2gcPw+peN74MomRRB7oIRK6jUsUzwMDaJ0GTan\ngnLY1VIgdJhN9EIrIkisJMQJYcabh6KV/s1JG+wTpoC8usqFE/r4ILmTU+BeXL38\nyJXHoGhmkyvCBQIDAQABo4IDWzCCA1cwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeN\nRji0LOHG2eIwHQYDVR0OBBYEFDfsZsmLfC1FetD3tQu+TR6qdAlgMB4GA1UdEQQX\nMBWCE3JwLWFwaS5zbWFydC1pZC5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW\nMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8v\nY3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWc2LmNybDAvoC2gK4YpaHR0cDov\nL2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nNi5jcmwwTAYDVR0gBEUwQzA3\nBglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQu\nY29tL0NQUzAIBgZngQwBAgIwfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhho\ndHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNl\ncnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQw\nDAYDVR0TAQH/BAIwADCCAX0GCisGAQQB1nkCBAIEggFtBIIBaQFnAHYAu9nfvB+K\ncbWTlCOXqpJ7RzhXlQqrUugakJZkNo4e0YUAAAFuJnDpmQAABAMARzBFAiBOZX5E\noZTVzSXTZFgxNf16qm8UJz2h3ipNicc3Jk7T5gIhALLh+P1hMSmN+GZ6j2Q0Ithd\n0XCzzLyepocD9MoS5lGgAHYAh3W/51l8+IxDmV+9827/Vo1HVjb/SrVgwbTq/16g\ngw8AAAFuJnDp9wAABAMARzBFAiARiorj+Iahj3ht/QurQ8jhKY3G2gSTpLifh6YW\nw+I+egIhAIQCtaaIjKXP5a8jJbKSphUVmj0f78wX0F3flqSOqbyBAHUARJRlLrDu\nzq/EQAfYqP4owNrmgr7YyzG1P9MzlrW2gagAAAFuJnDpAAAABAMARjBEAiBnqbvU\n9b50/orscwLl8Ynyggfym7rsnfX4zkbq/Iun0gIgG1ar0X2/vLa7PKlgCWmnzNM1\nfM2ex6zBYjjBHNjN5GAwDQYJKoZIhvcNAQELBQADggEBACko+lWd1cqdlSv2GDU2\nFJC6f3rMLOcUr/H6A6taaThUQ9gJ1W/xtlSAldHkwC/X2J9Zuw3MbKn+jV17SFEg\nlWu4iMlOSd5RPM51Dc7DyALAceau/I5rchKrYH3hhspJydZhz1ghgyZ3mdwkQE6t\nYv5v+G4jeHwUXxJ5dFFnRLNCHeTDqpa2zOglA/ORRM83NDt4cKTl3CqXWeeteFyu\nulnrt7w+IuCVhV6zywolQsqI5T77nQ4GfB6Cco3s01JWTaOg+DcPnobjwqk0o0mi\n/rBcmf49zy9T5O8CW6sABOqRV7RKIRSPEiv3M9IKJd621F/OfgGYwWDepBIk4ex3\ndgE=\n-----END CERTIFICATE-----\n";
 

src/test/java/ee/sk/smartid/rest/SmartIdRestConnectorTest.java

@@ -36,6 +36,7 @@
 import ee.sk.smartid.rest.dao.*;
 import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
 import org.glassfish.jersey.client.ClientConfig;
+import org.hamcrest.MatcherAssert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -65,7 +66,6 @@ public void setUp() {
   @Test(expected = SessionNotFoundException.class)
   public void getNotExistingSessionStatus() {
     stubNotFoundResponse("/session/de305d54-75b4-431b-adb2-eb6b9e546016");
-    SessionStatusRequest request = new SessionStatusRequest("de305d54-75b4-431b-adb2-eb6b9e546016");
     connector.getSessionStatus("de305d54-75b4-431b-adb2-eb6b9e546016");
   }
 
@@ -92,7 +92,7 @@ public void getSessionStatus_forSuccessfulCertificateRequest() {
     SessionStatus sessionStatus = getStubbedSessionStatusWithResponse("responses/sessionStatusForSuccessfulCertificateRequest.json");
     assertSuccessfulResponse(sessionStatus);
     assertNotNull(sessionStatus.getCert());
-    assertThat(sessionStatus.getCert().getValue(), startsWith("MIIHhjCCBW6gAwIBAgIQDNYLtVwrKURYStrYApYViTANBgkqhkiG9"));
+    MatcherAssert.assertThat(sessionStatus.getCert().getValue(), startsWith("MIIHhjCCBW6gAwIBAgIQDNYLtVwrKURYStrYApYViTANBgkqhkiG9"));
     assertEquals("QUALIFIED", sessionStatus.getCert().getCertificateLevel());
   }
 
@@ -101,7 +101,7 @@ public void getSessionStatus_forSuccessfulSigningRequest() {
     SessionStatus sessionStatus = getStubbedSessionStatusWithResponse("responses/sessionStatusForSuccessfulSigningRequest.json");
     assertSuccessfulResponse(sessionStatus);
     assertNotNull(sessionStatus.getSignature());
-    assertThat(sessionStatus.getSignature().getValue(), startsWith("luvjsi1+1iLN9yfDFEh/BE8hXtAKhAIxilv"));
+    MatcherAssert.assertThat(sessionStatus.getSignature().getValue(), startsWith("luvjsi1+1iLN9yfDFEh/BE8hXtAKhAIxilv"));
     assertEquals("sha256WithRSAEncryption", sessionStatus.getSignature().getAlgorithm());
   }
 

src/test/java/ee/sk/smartid/rest/SmartIdRestIntegrationTest.java

@@ -48,8 +48,8 @@ public class SmartIdRestIntegrationTest {
 
   private static final String RELYING_PARTY_UUID = "00000000-0000-0000-0000-000000000000";
   private static final String RELYING_PARTY_NAME = "DEMO";
-  private static final String DOCUMENT_NUMBER = "PNOLT-30303039903-FMB7-Q";
-  private static final String DOCUMENT_NUMBER_LT = "PNOLT-30303039914-PBZK-Q";
+  private static final String DOCUMENT_NUMBER = "PNOLT-30303039903-MOCK-Q";
+  private static final String DOCUMENT_NUMBER_LT = "PNOLT-30303039914-MOCK-Q";
   private static final String DATA_TO_SIGN = "Hello World!";
   private static final String CERTIFICATE_LEVEL_QUALIFIED = "QUALIFIED";
   private SmartIdConnector connector;