Add token refresh

src/Request/BasicAuthAbstract.php → src/Request/AuthAbstract.php

@@ -4,13 +4,10 @@
 use Nickpeirson\Evohome\RequestInterface;
 use Nickpeirson\Evohome\Service;
 
-abstract class BasicAuthAbstract implements RequestInterface
+abstract class AuthAbstract implements RequestInterface
 {
     const APP_PASS = 'test';
 
-    protected $username;
-    protected $password;
-
     public function getOptions()
     {
         return [
@@ -30,10 +27,7 @@ public function getHeaders()
     protected function getBody()
     {
         return [
-            'grant_type' => 'password',
-            'scope' => 'EMEA-V1-Basic EMEA-V1-Anonymous EMEA-V1-Get-Current-User-Account',
-            'Username' => $this->username,
-            'Password' => $this->password
+            'scope' => 'EMEA-V1-Basic EMEA-V1-Anonymous EMEA-V1-Get-Current-User-Account'
         ];
     }
 
@@ -42,17 +36,8 @@ public function getMethod()
         return 'post';
     }
 
-    abstract public function getPath();
-
-    public function setUsername($username)
-    {
-        $this->username = $username;
-        return $this;
-    }
-
-    public function setPassword($password)
+    public function getPath()
     {
-        $this->password = $password;
-        return $this;
+        return 'Auth/OAuth/Token';
     }
 }

src/Request/GetToken.php

@@ -1,10 +1,29 @@
 <?php
 namespace Nickpeirson\Evohome\Request;
 
-class GetToken extends BasicAuthAbstract
+class GetToken extends AuthAbstract
 {
-    public function getPath()
+    protected $username;
+    protected $password;
+
+    protected function getBody()
+    {
+        $body = parent::getBody();
+        $body['grant_type'] = 'password';
+        $body['Username'] = $this->username;
+        $body['Password'] = $this->password;
+        return $body;
+    }
+
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+
+    public function setPassword($password)
     {
-        return 'Auth/OAuth/Token';
+        $this->password = $password;
+        return $this;
     }
 }

src/Request/RefreshToken.php

@@ -0,0 +1,26 @@
+<?php
+namespace Nickpeirson\Evohome\Request;
+use Nickpeirson\Evohome\Token;
+
+class RefreshToken extends AuthAbstract
+{
+	/**
+	 *
+	 * @var Token
+	 */
+	protected $token;
+
+    protected function getBody()
+    {
+        $body = parent::getBody();
+        $body['grant_type'] = 'refresh_token';
+        $body['refresh_token'] = $this->token->getRefreshToken();
+        return $body;
+    }
+
+    public function setToken(Token $token)
+    {
+        $this->token = $token;
+        return $this;
+    }
+}

src/Service.php

@@ -10,6 +10,7 @@
 use Nickpeirson\Evohome\Request\Gateway;
 use Nickpeirson\Evohome\Request\LocationInstallationInfo;
 use Nickpeirson\Evohome\Request\ZoneSchedule;
+use Nickpeirson\Evohome\Request\RefreshToken;
 
 class Service
 {
@@ -103,12 +104,23 @@ public function sendRequest(TokenAbstract $request)
             throw new \Exception('Please log in before making requests');
         }
         if ($this->token->isExpired()) {
-            throw new \Exception('Token has expired. Please log in again.');
+            $this->refreshToken();
         }
         $request->setToken($this->token);
         return $this->client->sendRequest($request);
     }
 
+    public function refreshToken()
+    {
+        $request = (new RefreshToken())
+            ->setToken($this->token);
+        $response = $this->client->sendRequest($request);
+        if (isset($response->error)) {
+            throw new \Exception('Unable to refresh token');
+        }
+        $this->token = $this->mapResponseToToken($response);
+    }
+
     protected function mapResponseToToken($response)
     {
         return (new Token())

src/Token.php

@@ -48,5 +48,9 @@ public function getType()
     {
         return $this->type;
     }
+	public function getRefreshToken() {
+		return $this->refreshToken;
+	}
+
 
 }