Auto reload context bunq/sdk_csharp#72

BunqSdk.Tests/Context/ApiContextTest.cs

@@ -1,4 +1,6 @@
-using Bunq.Sdk.Context;
+using System;
+using Bunq.Sdk.Context;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Bunq.Sdk.Tests.Context
@@ -14,6 +16,12 @@ public class ApiContextTest : BunqSdkTestBase, IClassFixture<ApiContextTest>
         /// </summary>
         private const string ContextFilenameTest = "context-save-restore-test.conf";
 
+        /// <summary>
+        /// Field constatns.
+        /// </summary>
+        private const string FieldSessionContext = "session_context";
+        private const string FieldExpiryTime = "expiry_time";
+
         private static ApiContext apiContext;
 
         public ApiContextTest()
@@ -45,5 +53,25 @@ public void TestApiContextSaveRestore()
 
             Assert.Equal(apiContextJson, apiContextRestored.ToJson());
         }
+
+        [Fact]
+        public void TestAutoApiContextReLoad()
+        {
+            var contextJson = JObject.Parse(apiContext.ToJson());
+            var expiredTime = DateTime.Now.Subtract(TimeSpan.FromDays(20));
+            contextJson.SelectToken(FieldSessionContext)[FieldExpiryTime] = expiredTime.ToString();
+
+            var expiredApiContext = ApiContext.FromJson(contextJson.ToString());
+
+            Assert.NotEqual(apiContext, expiredApiContext);
+
+            BunqContext.UpdateApiContext(expiredApiContext);
+
+            Assert.Equal(expiredApiContext, BunqContext.ApiContext);
+
+            BunqContext.UserContext.RefreshUserContext();
+
+            Assert.True(BunqContext.ApiContext.IsSessionActive());
+        }
     }
 }

BunqSdk/Context/ApiContext.cs

@@ -174,12 +174,17 @@ private void DeleteSession()
         /// <summary>
         /// Check if current time is too close to the saved session expiry time and reset session if needed.
         /// </summary>
-        public void EnsureSessionActive()
+        public bool EnsureSessionActive()
         {
-            if (!IsSessionActive())
+            if (IsSessionActive())
             {
-                ResetSession();
+                return false;
             }
+
+            ResetSession();
+
+            return true;
+
         }
 
         public bool IsSessionActive()

BunqSdk/Context/BunqContext.cs

@@ -13,18 +13,21 @@ public static class BunqContext
         public static ApiContext ApiContext {
             get
             {
-                if (apiContext == null)
-                {
-                    throw new BunqException(ErrorApicontextHasNotBeenLoaded);
-                }
-                else
-                {
-                    return apiContext;
-                }
+                AssertApiContextIsLoaded();
+
+                return apiContext;
             }
             private set => apiContext = value ?? throw new ArgumentNullException(nameof(value));
         }
 
+        private static void AssertApiContextIsLoaded()
+        {
+            if (apiContext == null)
+            {
+                throw new BunqException(ErrorApicontextHasNotBeenLoaded);
+            }
+        }
+
         public static UserContext UserContext
         {
             get
@@ -47,5 +50,12 @@ public static void LoadApiContext(ApiContext apiContextToLoad)
             UserContext = new UserContext(apiContextToLoad.SessionContext.UserId);
             UserContext.InitPrimaryMonetaryAccount();
         }
+
+        public static void UpdateApiContext(ApiContext apiContext)
+        {
+            AssertApiContextIsLoaded();
+
+            BunqContext.apiContext = apiContext;
+        }
     }
 }

BunqSdk/Http/ApiClient.cs

@@ -151,9 +151,9 @@ private BunqResponseRaw SendRequest(HttpMethod method, string uriRelative,
         private BunqResponseRaw SendRequest(HttpRequestMessage requestMessage,
             IDictionary<string, string> customHeaders, string uriRelative)
         {
-            if (!URIS_NOT_REQUIRING_ACTIVE_SESSION.Contains(uriRelative))
+            if (!URIS_NOT_REQUIRING_ACTIVE_SESSION.Contains(uriRelative) && apiContext.EnsureSessionActive())
             {
-                apiContext.EnsureSessionActive();
+                BunqContext.UpdateApiContext(apiContext);
             }
 
             SetDefaultHeaders(requestMessage);