Merge pull request #86 from bunq/auto_update_bunq_context_bunq/sdk_python#65

Auto update bunq context #65

Author: OGKevin

bunq/sdk/client.py

@@ -112,7 +112,10 @@ def _request(self, method, uri_relative, request_bytes, params,
         uri_relative_with_params = self._append_params_to_uri(uri_relative,
                                                               params)
         if uri_relative not in self._URIS_NOT_REQUIRING_ACTIVE_SESSION:
-            self._api_context.ensure_session_active()
+            if self._api_context.ensure_session_active():
+                from bunq.sdk.context import BunqContext
+
+                BunqContext.update_api_context(self._api_context)
 
         all_headers = self._get_all_headers(
             method,

bunq/sdk/context.py

@@ -167,14 +167,20 @@ def _get_session_timeout_seconds(cls, session_server):
         else:
             return session_server.user_person.session_timeout
 
-    def ensure_session_active(self):
+    def ensure_session_active(self) -> bool:
         """
         Resets the session if it has expired.
+
+        :rtype: bool
         """
 
         if not self.is_session_active():
             self.reset_session()
 
+            return True
+
+        return False
+
     def is_session_active(self):
         """
         :rtype: bool
@@ -564,3 +570,11 @@ def user_context(cls):
             return cls._user_context
 
         raise BunqException(cls._ERROR_USER_CONTEXT_HAS_NOT_BEEN_LOADED)
+
+    @classmethod
+    def update_api_context(cls, api_context: ApiContext):
+        """
+        :type api_context: ApiContext
+        """
+
+        cls._api_context = api_context

tests/http/test_api_context.py

@@ -1,6 +1,8 @@
+import json
 import os
 
 from bunq.sdk.context import ApiContext
+from bunq.sdk.context import BunqContext
 from bunq.sdk.json import converter
 from tests.bunq_test import BunqSdkTestCase
 
@@ -13,6 +15,10 @@ class TestApiContext(BunqSdkTestCase):
 
     _TMP_FILE_PATH = '/context-save-test.conf'
 
+    __FIELD_SESSION_CONTEXT = 'session_context'
+    __FIELD_EXPIRE_TIME = 'expiry_time'
+    __TIME_STAMP_IN_PAST = '2000-04-07 19:50:43.839717'
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -84,3 +90,30 @@ def test_api_context_restore_json(self):
         api_context_restored = self._API_CONTEXT.from_json(context_json)
 
         self.assertEqual(api_context_restored, self._API_CONTEXT)
+
+    def test_auto_bunq_context_update(self):
+        """
+        Tests the auto update of BunqContext.
+        """
+
+        api_context: ApiContext = BunqContext.api_context()
+        api_context_json: object = json.loads(api_context.to_json())
+
+        api_context_json[self.__FIELD_SESSION_CONTEXT][
+            self.__FIELD_EXPIRE_TIME] = self.__TIME_STAMP_IN_PAST
+
+        expired_api_context = ApiContext.from_json(json.dumps(api_context_json))
+
+        self.assertNotEqual(api_context.session_context.expiry_time,
+                            expired_api_context.session_context.expiry_time)
+        self.assertEqual(BunqContext.api_context().session_context.expiry_time,
+                         api_context.session_context.expiry_time)
+
+        BunqContext.update_api_context(expired_api_context)
+        BunqContext.user_context().refresh_user_context()
+
+        self.assertNotEqual(
+            BunqContext.api_context().session_context.expiry_time,
+            api_context.session_context.expiry_time
+        )
+        self.assertFalse(BunqContext.api_context().ensure_session_active())

tests/model/generated/endpoint/test_attachment_public.py

@@ -1,5 +1,3 @@
-import os
-
 from bunq.sdk.client import ApiClient
 from bunq.sdk.model.generated import endpoint
 from tests.bunq_test import BunqSdkTestCase
@@ -25,8 +23,10 @@ def test_file_upload_and_retrieval(self):
                 self._ATTACHMENT_DESCRIPTION,
         }
 
-        attachment_uuid = endpoint.AttachmentPublic.create(self.attachment_contents,
-                                                  custom_headers).value
+        attachment_uuid = endpoint.AttachmentPublic.create(
+            self.attachment_contents,
+            custom_headers
+        ).value
 
         contents_from_response = endpoint.AttachmentPublicContent.list(
             attachment_uuid).value