v29.0.4

gematik · Oct 28, 2024 · ed6b2b4 · ed6b2b4
1 parent dd6a87f
commit ed6b2b4
Show file tree

Hide file tree

Showing 16 changed files with 723 additions and 699 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ or use docker compose:
 
 ```console
 $ mvn clean install -pl idp-server -am -Dskip.unittests -Dskip.inttests
-$ export appVersion=29.0.3
+$ export appVersion=29.0.4
 $ export serverLoglevel=info (default)
 $ docker-compose --project-name myidp -f docker-compose-ref.yml up -d
 ```

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+# Release 29.0.4
+
+- add method isExpired() to IdpJoseObject
+
 # Release 29.0.3
 
 - fix missing claim ORGANIZATION_IK in configuration

diff --git a/doc/tokenFlowEgk.html b/doc/tokenFlowEgk.html
diff --git a/doc/tokenFlowPs.html b/doc/tokenFlowPs.html
diff --git a/doc/tokenFlowSso.html b/doc/tokenFlowSso.html
diff --git a/idp-client/pom.xml b/idp-client/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-client</artifactId>
 
-  <version>29.0.3</version>
+  <version>29.0.4</version>
   <packaging>jar</packaging>
 
   <dependencies>

diff --git a/idp-commons/pom.xml b/idp-commons/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-commons</artifactId>
 
-  <version>29.0.3</version>
+  <version>29.0.4</version>
 
   <dependencies>
 

diff --git a/idp-commons/src/main/java/de/gematik/idp/token/IdpJoseObject.java b/idp-commons/src/main/java/de/gematik/idp/token/IdpJoseObject.java
@@ -71,6 +71,10 @@ public ZonedDateTime getExpiresAt() {
     return getDateTimeClaim(EXPIRES_AT, this::getBodyClaims).orElseThrow();
   }
 
+  public boolean isExpired() {
+    return ZonedDateTime.now().isAfter(getExpiresAt());
+  }
+
   public ZonedDateTime getExpiresAtBody() {
     return getBodyClaimAsZonedDateTime(EXPIRES_AT).orElseThrow();
   }

diff --git a/idp-commons/src/test/java/de/gematik/idp/token/JsonWebTokenTest.java b/idp-commons/src/test/java/de/gematik/idp/token/JsonWebTokenTest.java
@@ -82,6 +82,22 @@ void getTokenExp_ShouldBeCorrect() {
         .isBetween(ZonedDateTime.now().plusMinutes(4), ZonedDateTime.now().plusMinutes(6));
   }
 
+  @Test
+  void token_isExpired_isFalse() {
+    final JsonWebToken jsonWebToken =
+        idpJwtProcessor.buildJwt(new JwtBuilder().expiresAt(ZonedDateTime.now().plusMinutes(5)));
+
+    assertThat(jsonWebToken.isExpired()).isFalse();
+  }
+
+  @Test
+  void token_isExpired_isTrue() {
+    final JsonWebToken jsonWebToken =
+        idpJwtProcessor.buildJwt(new JwtBuilder().expiresAt(ZonedDateTime.now().minusMinutes(5)));
+
+    assertThat(jsonWebToken.isExpired()).isTrue();
+  }
+
   @Test
   void getBodyClaims_shouldMatch() {
     final JsonWebToken jsonWebToken =

diff --git a/idp-crypto/pom.xml b/idp-crypto/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-crypto</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
 
   <dependencies>
     <dependency>

diff --git a/idp-report/pom.xml b/idp-report/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
   </parent>
   <artifactId>idp-report</artifactId>
 

diff --git a/idp-sektoral/pom.xml b/idp-sektoral/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-sektoral</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/idp-server/pom.xml b/idp-server/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>idp-server</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/idp-test/pom.xml b/idp-test/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>de.gematik.idp</groupId>
     <artifactId>idp-global</artifactId>
-    <version>29.0.3</version>
+    <version>29.0.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>idp-test</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
 
   <dependencies>
     <dependency>

diff --git a/idp-testsuite/pom.xml b/idp-testsuite/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-testsuite</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>de.gematik.idp</groupId>
   <artifactId>idp-global</artifactId>
-  <version>29.0.3</version>
+  <version>29.0.4</version>
   <packaging>pom</packaging>
 
   <description>IDP</description>