Fix: issue with missing user hash property and APIResponse validations

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.1.5 - 2023-03-14
+
+* Fixed issues with APIResponse and Token models
+
 ## 1.1.4 - 2023-02-28
 
 * Compliance with Draft 1.30 signature style

src/SSOfy/Client.php

@@ -55,7 +55,8 @@ public function verifyAuthentication($token)
         $response = $this->requestAndCache($path, $token);
 
         return new APIResponse([
-            'token' => new Token($response['token'])
+            'token' => new Token($response['token']),
+            'user'  => new UserEntity($response['user']),
         ]);
     }
 
@@ -75,8 +76,8 @@ public function authenticatedUser($token, $cache = false)
         $response = $this->requestAndCache($path, $token, [], $cache);
 
         return new APIResponse([
+            'token' => new Token($response['token']),
             'user'  => new UserEntity($response['user']),
-            'token' => new Token($response['token'])
         ]);
     }
 

src/SSOfy/Models/APIResponse.php

@@ -5,13 +5,38 @@
 use SSOfy\Models\Entities\UserEntity;
 
 /**
- * @property Token token
- * @property UserEntity $user
+ * @property Token      token
+ * @property UserEntity user
  */
 class APIResponse extends BaseModel
 {
     protected $properties = [
         'token',
         'user',
     ];
+
+    protected function validate($attr, $value)
+    {
+        if (is_null($value)) {
+            return true;
+        }
+
+        switch ($attr) {
+            case 'token':
+                if (!is_a($value, Token::class)) {
+                    return 'value must be ' . Token::class;
+                }
+
+                return true;
+
+            case 'user':
+                if (!is_a($value, UserEntity::class)) {
+                    return 'value must be ' . UserEntity::class;
+                }
+
+                return true;
+        }
+
+        return parent::validate($attr, $value);
+    }
 }

src/SSOfy/Models/Signature.php

@@ -4,7 +4,7 @@
 
 /**
  * @property string hash
- * @property string $salt
+ * @property string salt
  */
 class Signature extends BaseModel
 {

src/SSOfy/Models/Token.php

@@ -19,6 +19,24 @@ class Token extends BaseModel
         'expires_at',
     ];
 
+    protected function validate($attr, $value)
+    {
+        if (is_null($value)) {
+            return true;
+        }
+
+        switch ($attr) {
+            case 'scopes':
+                if (!is_array($value)) {
+                    return 'value must be array';
+                }
+
+                return true;
+        }
+
+        return parent::validate($attr, $value);
+    }
+
     public function export()
     {
         $export = parent::export();