From 0d240955f55b522caa8d05375cabd1b75723ce3e Mon Sep 17 00:00:00 2001
From: Alexander Schwarz <schwarz@epicsoft.de>
Date: Fri, 22 Oct 2021 11:22:04 +0200
Subject: [PATCH] change accesstoken 'valid to' to 'arrival time'

---
 .../decorator/service/AccessTokenPayloadBuilderImpl.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java b/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
index dfcd064..4daea68 100644
--- a/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
+++ b/src/main/java/eu/europa/ec/dgc/validation/decorator/service/AccessTokenPayloadBuilderImpl.java
@@ -62,9 +62,10 @@ public AccessTokenPayload build(
         accessTokenConditions.setDob(this.parseBirthDay(subjectResponse.getBirthDate()));
 
         final OffsetDateTime departureTime = occurrenceInfo.getDepartureTime();
-        accessTokenConditions.setValidFrom(departureTime.format(FORMATTER));
-        accessTokenConditions.setValidationClock(occurrenceInfo.getArrivalTime().format(FORMATTER));
-        accessTokenConditions.setValidTo(departureTime.plusDays(2).format(FORMATTER));
+        final OffsetDateTime arrivalTime = occurrenceInfo.getArrivalTime();
+        accessTokenConditions.setValidFrom(departureTime.format(FORMATTER));        
+        accessTokenConditions.setValidationClock(arrivalTime.format(FORMATTER));
+        accessTokenConditions.setValidTo(arrivalTime.format(FORMATTER));
 
         final AccessTokenPayload accessTokenPayload = new AccessTokenPayload();
         accessTokenPayload.setJti(subjectResponse.getJti());