nullable session

Author: nicklog

src/Api/AbstractCore.php

@@ -12,6 +12,7 @@
 use Http\Client\Common\Plugin\QueryDefaultsPlugin;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
+use RuntimeException;
 use Shapecode\FUT\Client\Authentication\AccountInterface;
 use Shapecode\FUT\Client\Authentication\Session;
 use Shapecode\FUT\Client\Config\Config;
@@ -694,9 +695,14 @@ public function clubConsumables()
      */
     public function squad(int $squadId = 0)
     {
+        $session = $this->getAccount()->getSession();
+        if ($session === null) {
+            throw new RuntimeException('session has to be set');
+        }
+
         $this->pin->sendEvent('page_view', 'Hub - Squads');
 
-        $personaId = $this->getAccount()->getSession()->getPersona();
+        $personaId = $session->getPersona();
         $response  = $this->request('GET', '/squad/' . $squadId . '/user/' . $personaId);
 
         $this->pin->sendEvent('page_view', 'Squads - Squad Overview');
@@ -1122,6 +1128,10 @@ protected function request(
         $account = $this->getAccount();
         $session = $account->getSession();
 
+        if ($session === null) {
+            throw new RuntimeException('session has to be set');
+        }
+
         if ($method === 'GET') {
             $params['_'] = time();
         }

src/Api/Pin.php

@@ -5,6 +5,7 @@
 namespace Shapecode\FUT\Client\Api;
 
 use Carbon\Carbon;
+use RuntimeException;
 use Shapecode\FUT\Client\Authentication\AccountInterface;
 use Shapecode\FUT\Client\Exception\PinErrorException;
 use Shapecode\FUT\Client\Http\ClientFactoryInterface;
@@ -58,6 +59,10 @@ public function event(
         $account = $this->account;
         $session = $account->getSession();
 
+        if ($session === null) {
+            throw new RuntimeException('session has to be set');
+        }
+
         $data = [
             'core' => [
                 'dob'      => $session->getDob(),
@@ -121,6 +126,10 @@ public function send(array $events) : bool
         $session  = $account->getSession();
         $platform = $account->getCredentials()->getPlatform();
 
+        if ($session === null) {
+            throw new RuntimeException('session has to be set');
+        }
+
         $body = json_encode([
             'custom'  => [
                 'networkAccess' => 'G',

src/Authentication/Account.php

@@ -5,7 +5,6 @@
 namespace Shapecode\FUT\Client\Authentication;
 
 use GuzzleHttp\ClientInterface;
-use RuntimeException;
 use Shapecode\FUT\Client\Model\ProxyInterface;
 
 class Account implements AccountInterface
@@ -37,12 +36,8 @@ public function getCredentials() : CredentialsInterface
         return $this->credentials;
     }
 
-    public function getSession() : SessionInterface
+    public function getSession() : ?SessionInterface
     {
-        if ($this->session === null) {
-            throw new RuntimeException('session has to be set');
-        }
-
         return $this->session;
     }
 

src/Authentication/AccountInterface.php

@@ -10,7 +10,7 @@ interface AccountInterface
 {
     public function getCredentials() : CredentialsInterface;
 
-    public function getSession() : SessionInterface;
+    public function getSession() : ?SessionInterface;
 
     public function setSession(SessionInterface $session) : void;