Added isExpired() method #58.

bunq · Oct 12, 2017 · 718f79b · 718f79b
1 parent 92a6d8f
commit 718f79b
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Context/ApiContext.php b/src/Context/ApiContext.php
@@ -273,15 +273,21 @@ private function dropSessionContext()
      */
     public function ensureSessionActive()
     {
-        if (is_null($this->sessionContext)) {
-            return;
+        if (!is_null($this->sessionContext) && $this->isExpired()) {
+            $this->resetSession();
         }
+    }
 
+    /**
+     * Checks if the session has expired
+     *
+     * @return bool
+     */
+    public function isExpired()
+    {
         $timeExpiry = $this->sessionContext->getExpiryTime()->getTimestamp();
 
-        if ($timeExpiry - time() < self::TIME_TO_SESSION_EXPIRY_MINIMUM_SECONDS) {
-            $this->resetSession();
-        }
+        return is_null($this->sessionContext) || $timeExpiry - time() < self::TIME_TO_SESSION_EXPIRY_MINIMUM_SECONDS;
     }
 
     /**