From 79958337afd27e4bf73fc0a13f0bde9e2660612d Mon Sep 17 00:00:00 2001
From: RobinTTY <muellerobin95@gmail.com>
Date: Fri, 9 Dec 2022 20:00:46 +0100
Subject: [PATCH] Fix JWT handling

---
 src/RobinTTY.NordigenApiClient/NordigenClient.cs  | 15 ++++++---------
 .../RobinTTY.NordigenApiClient.csproj             |  2 +-
 src/RobinTTY.NordigenApiClient/release-notes.txt  |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/RobinTTY.NordigenApiClient/NordigenClient.cs b/src/RobinTTY.NordigenApiClient/NordigenClient.cs
index f82b051..04da48d 100644
--- a/src/RobinTTY.NordigenApiClient/NordigenClient.cs
+++ b/src/RobinTTY.NordigenApiClient/NordigenClient.cs
@@ -80,8 +80,8 @@ internal async Task<NordigenApiResponse<TResponse, TError>> MakeRequest<TRespons
         ) where TResponse : class where TError : class
     {
         var requestUri = query != null ? UriQueryBuilder.BuildUriWithQueryString(uri, query) : uri;
-        var authToken = useAuthentication ? await TryGetValidTokenPair(cancellationToken) : null;
-        var client = useAuthentication ? _httpClient.UseNordigenAuthenticationHeader(authToken) : _httpClient;
+        JwtTokenPair = useAuthentication ? await TryGetValidTokenPair(cancellationToken) : null;
+        var client = useAuthentication ? _httpClient.UseNordigenAuthenticationHeader(JwtTokenPair) : _httpClient;
 
         HttpResponseMessage ? response;
         if (method == HttpMethod.Get)
@@ -110,7 +110,6 @@ internal async Task<NordigenApiResponse<TResponse, TError>> MakeRequest<TRespons
         if (JwtTokenPair == null || JwtTokenPair.RefreshToken.IsExpired(TimeSpan.FromMinutes(1)))
         {
             var response = await TokenEndpoint.GetTokenPair(cancellationToken);
-            JwtTokenPair = new JsonWebTokenPair(response.Result!.AccessToken.EncodedToken, response.Result!.AccessToken.EncodedToken);
             return response.IsSuccess ? response.Result : null;
         }
 
@@ -118,12 +117,10 @@ internal async Task<NordigenApiResponse<TResponse, TError>> MakeRequest<TRespons
         if (JwtTokenPair.AccessToken.IsExpired(TimeSpan.FromMinutes(1)))
         {
             var response = await TokenEndpoint.RefreshAccessToken(JwtTokenPair.RefreshToken, cancellationToken);
-            if (!response.IsSuccess) return null;
-
-            // Update the token pair with the response
-            JwtTokenPair.AccessToken = response.Result!.AccessToken;
-            JwtTokenPair.AccessExpires = response.Result!.AccessExpires;
-            return JwtTokenPair;
+            return response.IsSuccess ?
+                // Return a new token pair consisting of the new access token and existing refresh token
+                new JsonWebTokenPair(response.Result!.AccessToken, JwtTokenPair.RefreshToken, response.Result!.AccessExpires, JwtTokenPair.RefreshExpires)
+                : null;
         }
 
         // Token pair is still valid and can be returned
diff --git a/src/RobinTTY.NordigenApiClient/RobinTTY.NordigenApiClient.csproj b/src/RobinTTY.NordigenApiClient/RobinTTY.NordigenApiClient.csproj
index 17883ed..0076288 100644
--- a/src/RobinTTY.NordigenApiClient/RobinTTY.NordigenApiClient.csproj
+++ b/src/RobinTTY.NordigenApiClient/RobinTTY.NordigenApiClient.csproj
@@ -14,7 +14,7 @@
     <PackageTags>Nordigen; API; client</PackageTags>
     <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/release-notes.txt"))</PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>2.0.2</Version>
+    <Version>2.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/RobinTTY.NordigenApiClient/release-notes.txt b/src/RobinTTY.NordigenApiClient/release-notes.txt
index fcf2e8c..1cea557 100644
--- a/src/RobinTTY.NordigenApiClient/release-notes.txt
+++ b/src/RobinTTY.NordigenApiClient/release-notes.txt
@@ -1 +1 @@
-Fixed BankAccountDetails ignoring BIC in json responses.
\ No newline at end of file
+Fixes JWT handling/updating. Prior implementation could cause a NullReferenceException if JWT refresh fails due to API not being reachable.
\ No newline at end of file