Fix JWT default times and encoding value

Author: Vox-Ben

gateway-api/src/gateway_api/clinical_jwt/jwt.py

@@ -17,14 +17,18 @@ class JWT:
 
     # Time fields
     issued_at: int = field(default_factory=lambda: int(time()))
-    expiration: int = field(default_factory=lambda: int(time()) + 300)
+    expiration: int = 0
 
     # These are here for future proofing but are not expected ever to be changed
     algorithm: str = "none"
     type: str = "JWT"
     reason_for_request: str = "directcare"
     requested_scope: str = "patient/*.read"
 
+    def __post_init__(self) -> None:
+        if self.expiration == 0:
+            object.__setattr__(self, "expiration", self.issued_at + 300)
+
     @property
     def issue_time(self) -> str:
         return datetime.fromtimestamp(self.issued_at, tz=UTC).isoformat()

gateway-api/src/gateway_api/provider/client.py

@@ -62,7 +62,7 @@ class GpProviderClient:
         consumer_asid (str): The ASID for the consumer.
         token (JWT): JWT object for authentication with the provider API.
         endpoint_path (str): The endpoint path for the operation
-            (default: "FHIR/STU3/patient/$gpc.getstructuredrecord").
+            (default: "Patient/$gpc.getstructuredrecord").
 
     Methods:
         access_structured_record(trace_id: str, body: str) -> Response:
@@ -89,8 +89,8 @@ def _build_headers(self, trace_id: str) -> dict[str, str]:
         """
         # TODO: Post-steel-thread, probably check whether JWT is valid/not expired
         return {
-            "Content-Type": "application/fhir+json;charset=utf-8",
-            "Accept": "application/fhir+json;charset=utf-8",
+            "Content-Type": "application/fhir+json; charset=utf-8",
+            "Accept": "application/fhir+json; charset=utf-8",
             "Ssp-InteractionID": ACCESS_RECORD_STRUCTURED_INTERACTION_ID,
             "Ssp-To": self.provider_asid,
             "Ssp-From": self.consumer_asid,

gateway-api/src/gateway_api/provider/test_client.py

@@ -116,8 +116,8 @@ def test_valid_gpprovider_access_structured_record_with_correct_headers_post_200
         token=valid_jwt,
     )
     expected_headers = {
-        "Content-Type": "application/fhir+json;charset=utf-8",
-        "Accept": "application/fhir+json;charset=utf-8",
+        "Content-Type": "application/fhir+json; charset=utf-8",
+        "Accept": "application/fhir+json; charset=utf-8",
         "Ssp-TraceID": str(trace_id),
         "Ssp-From": consumer_asid,
         "Ssp-To": provider_asid,