Update BunqContext with new ApiContext on reset. (#94)

bunq · Apr 7, 2018 · ea35012 · ea35012
1 parent abc6437
commit ea35012
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Context/ApiContext.php b/src/Context/ApiContext.php
@@ -278,12 +278,18 @@ private function dropSessionContext()
     /**
      * Check if current time is too close to the saved session expiry time and reset session if
      * needed.
+     *
+     * @return bool
      */
-    public function ensureSessionActive()
+    public function ensureSessionActive(): bool
     {
         if (!$this->isSessionActive()) {
             $this->resetSession();
+
+            return true;
         }
+
+        return false;
     }
 
     /**

diff --git a/src/Http/ApiClient.php b/src/Http/ApiClient.php
@@ -2,6 +2,7 @@
 namespace bunq\Http;
 
 use bunq\Context\ApiContext;
+use bunq\Context\BunqContext;
 use bunq\Exception\BunqException;
 use bunq\Http\Handler\HandlerUtil;
 use bunq\Http\Handler\RequestHandlerAuthentication;
@@ -223,7 +224,9 @@ private function request(
     private function initialize(string $uri)
     {
         if (!isset(self::URIS_NOT_REQUIRING_ACTIVE_SESSION[$uri])) {
-            $this->apiContext->ensureSessionActive();
+            if ($this->apiContext->ensureSessionActive()) {
+                BunqContext::updateApiContext($this->apiContext);
+            }
         }
 
         $this->initializeHttpClient();