Merge pull request #181 from bunq/feature/fix_double_wrapped_objects

Fix decoding of double-wrapped objects. Updated OAuth endpoints.
bunq · Sep 13, 2019 · 69df09e · 69df09e
2 parents feaf376 + 96f4941
commit 69df09e
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 4 deletions.
diff --git a/src/Model/Core/BunqModel.php b/src/Model/Core/BunqModel.php
@@ -210,6 +210,15 @@ private static function determineFieldContents(ReflectionProperty $property, $co
                 /** @var BunqModel $modelClassNameQualified */
                 $modelClassNameQualified = ModelUtil::determineModelClassNameQualified($fieldType);
 
+                $parentClassName = $property->getDeclaringClass()->getName();
+                $additionalWrappingKey = BunqModelWrapper::determineWrappingKey($parentClassName, $property->getName());
+
+                if (!is_null($additionalWrappingKey)) {
+                    if (isset($contents[$additionalWrappingKey])) {
+                        return $modelClassNameQualified::createFromResponseArray($contents[$additionalWrappingKey]);
+                    }
+                }
+
                 return $modelClassNameQualified::createFromResponseArray($contents);
             }
         } else {

diff --git a/src/Model/Core/BunqModelWrapper.php b/src/Model/Core/BunqModelWrapper.php
@@ -0,0 +1,43 @@
+<?php
+namespace bunq\Model\Core;
+
+use bunq\Model\Generated\Endpoint\BunqMeTabResultInquiry;
+use bunq\Model\Generated\Endpoint\Payment;
+use JsonSerializable;
+
+/**
+ * Base class for all endpoints, responsible for parsing json received from the server.
+ */
+abstract class BunqModelWrapper implements JsonSerializable
+{
+    /**
+     * Field constants.
+     */
+    const FIELD_PAYMENT = 'payment';
+
+    /**
+     * The double wrapping map.
+     */
+    const MODEL_WRAPPING_MAP = [
+        BunqMeTabResultInquiry::class => [
+            self::FIELD_PAYMENT => Payment::OBJECT_TYPE_GET
+        ]
+    ];
+
+    /**
+     * @param $className
+     * @param $propertyName
+     *
+     * @return string|null
+     */
+    public static function determineWrappingKey($className, $propertyName)
+    {
+        if (isset(self::MODEL_WRAPPING_MAP[$className])) {
+            if (isset(self::MODEL_WRAPPING_MAP[$className][$propertyName])) {
+                return self::MODEL_WRAPPING_MAP[$className][$propertyName];
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Model/Core/OauthAccessToken.php b/src/Model/Core/OauthAccessToken.php
@@ -26,8 +26,8 @@ class OauthAccessToken extends BunqModel
     /**
      * Token constants.
      */
-    const TOKEN_URI_FORMAT_SANDBOX = 'https://api.oauth.sandbox.bunq.com/v1/token?';
-    const TOKEN_URI_FORMAT_PRODUCTION = 'https://api.oauth.bunq.com/v1/token?';
+    const TOKEN_URI_FORMAT_SANDBOX = 'https://api.oauth.sandbox.bunq.com/v1/token?%s';
+    const TOKEN_URI_FORMAT_PRODUCTION = 'https://api.oauth.bunq.com/v1/token?%s';
 
     /**
      * Error constants.

diff --git a/src/Model/Core/OauthAuthorizationUri.php b/src/Model/Core/OauthAuthorizationUri.php
@@ -13,8 +13,8 @@ class OauthAuthorizationUri extends BunqModel
     /**
      * Uri constants.
      */
-    const AUTH_URI_FORMAT_PRODUCTION = 'https://oauth.bunq.com/auth?';
-    const AUTH_URI_FORMAT_SANDBOX = 'https://oauth.sandbox.bunq.com/auth?';
+    const AUTH_URI_FORMAT_PRODUCTION = 'https://oauth.bunq.com/auth?%s';
+    const AUTH_URI_FORMAT_SANDBOX = 'https://oauth.sandbox.bunq.com/auth?%s';
 
     /**
      * Field constants.