Fixing Content-Type for POST/PUT requests

Author: jamiehannaford

lib/OpenCloud/CloudMonitoring/Resource/AbstractResource.php

@@ -78,7 +78,7 @@ public function testParams($params = array(), $debug = false)
         // send the request
         $response = $this->getService()
             ->getClient()
-            ->post($this->testUrl($debug), array(), $json)
+            ->post($this->testUrl($debug), self::getJsonHeader(), $json)
             ->send();
 
         return Formatter::decode($response);
@@ -97,7 +97,7 @@ public function test($debug = false)
         $this->checkJsonError();
 
         $response = $this->getClient()
-            ->post($this->testExistingUrl($debug), array(), $json)
+            ->post($this->testExistingUrl($debug), self::getJsonHeader(), $json)
             ->send();
 
         return Formatter::decode($response);

lib/OpenCloud/CloudMonitoring/Resource/Alarm.php

@@ -85,7 +85,7 @@ public function test($params = array(), $debug = false)
 
         $response = $this->getService()
             ->getClient()
-            ->post($url, array(), $body)
+            ->post($url, self::getJsonHeader(), $body)
             ->send();
 
         return Formatter::decode($response);

lib/OpenCloud/CloudMonitoring/Resource/Zone.php

@@ -55,7 +55,7 @@ public function traceroute(array $options)
         try {
             $response = $this->getService()
                 ->getClient()
-                ->post($this->url('traceroute'), array(), json_encode($params))
+                ->post($this->url('traceroute'), self::getJsonHeader(), json_encode($params))
                 ->send();
 
             $body = Formatter::decode($response);

lib/OpenCloud/Common/Base.php

@@ -14,6 +14,8 @@
 use OpenCloud\Common\Exceptions\JsonError;
 use OpenCloud\Common\Exceptions\UrlError;
 use OpenCloud\Common\Collection\ResourceIterator;
+use OpenCloud\Common\Constants\Header as HeaderConst;
+use OpenCloud\Common\Constants\Mime as MimeConst;
 
 /**
  * The root class for all other objects used or defined by this SDK.
@@ -423,4 +425,9 @@ public function stripNamespace($namespace)
         return end($array);
     }
 
+    protected static function getJsonHeader()
+    {
+        return array(HeaderConst::CONTENT_TYPE => MimeConst::JSON);
+    }
+
 }

lib/OpenCloud/Common/Http/Message/RequestSubscriber.php

@@ -29,22 +29,10 @@ public static function getInstance()
     public static function getSubscribedEvents()
     {
         return array(
-            'request.before_send'    => 'ensureContentType',
             'curl.callback.progress' => 'doCurlProgress'
         );
     }
 
-    public function ensureContentType(Event $event)
-    {
-        if ($event['request'] instanceof EntityEnclosingRequest
-            && $event['request']->getBody()
-            && $event['request']->getBody()->getContentLength()
-            && !$event['request']->hasHeader(Header::CONTENT_TYPE)
-        ) {
-            $event['request']->setHeader(Header::CONTENT_TYPE, 'application/json');
-        }
-    }
-
     /**
      * @param $options
      * @return mixed

lib/OpenCloud/Common/PersistentObject.php

@@ -72,7 +72,6 @@
  */
 abstract class PersistentObject extends Base
 {
-      
     private $service;
     private $parent;
     protected $metadata;
@@ -182,7 +181,7 @@ public function create($params = array())
 
         $createUrl = $this->createUrl();
 
-        $response = $this->getClient()->post($createUrl, array(), $json)->send();
+        $response = $this->getClient()->post($createUrl, self::getJsonHeader(), $json)->send();
 
         // We have to try to parse the response body first because it should have precedence over a Location refresh.
         // I'd like to reverse the order, but Nova instances return ephemeral properties on creation which are not
@@ -233,7 +232,7 @@ public function update($params = array())
         $this->checkJsonError();
 
         // send the request
-        return $this->getClient()->put($this->getUrl(), array(), $json)->send();
+        return $this->getClient()->put($this->getUrl(), self::getJsonHeader(), $json)->send();
     }
 
     /**
@@ -417,7 +416,7 @@ protected function action($object)
         $url = $this->url('action');
 
         // POST the message
-        return $this->getClient()->post($url, array(), $json)->send();
+        return $this->getClient()->post($url, self::getJsonHeader(), $json)->send();
     }
 
      /**

lib/OpenCloud/Compute/Resource/Server.php

@@ -327,7 +327,7 @@ public function imageSchedule($retention = false)
                 (object) array('retention' => $retention)
             );
             $body = json_encode($object);
-            $request = $this->getClient()->post($url, array(), $body);
+            $request = $this->getClient()->post($url, self::getJsonHeader(), $body);
         }
 
         $body = Formatter::decode($request->send());

lib/OpenCloud/Compute/Resource/ServerMetadata.php

@@ -108,7 +108,7 @@ public function create()
     {
         return $this->getParent()
             ->getClient()
-            ->put($this->url(), array(), $this->getMetadataJson())
+            ->put($this->getUrl(), self::getJsonHeader(), $this->getMetadataJson())
             ->send();
     }
 
@@ -123,7 +123,7 @@ public function update()
     {
         return $this->getParent()
             ->getClient()
-            ->post($this->url(), array(), $this->getMetadataJson())
+            ->post($this->getUrl(), self::getJsonHeader(), $this->getMetadataJson())
             ->send();
     }
 
@@ -136,7 +136,7 @@ public function update()
      */
     public function delete()
     {
-        return $this->getParent()->getClient()->delete($this->url(), array());
+        return $this->getParent()->getClient()->delete($this->getUrl(), array());
     }
 
     public function __set($key, $value)
@@ -146,7 +146,7 @@ public function __set($key, $value)
         if ($this->key && $key != $this->key) {
             throw new Exceptions\MetadataKeyError(sprintf(
                 Lang::translate('You cannot set extra values on [%s]'),
-                $this->Url()
+                $this->getUrl()
             ));
         }
 

lib/OpenCloud/Database/Resource/Database.php

@@ -106,7 +106,7 @@ public function create($params = array())
         $this->checkJsonError();
 
         // POST it off
-        return $this->getClient()->post($url, array(), $json)->send();
+        return $this->getClient()->post($url, self::getJsonHeader(), $json)->send();
     }
 
     /**

lib/OpenCloud/ObjectStore/Resource/AbstractResource.php

@@ -161,7 +161,7 @@ public function getMetadata()
      */
     public function saveMetadata(array $metadata)
     {
-        $headers = self::stockHeaders($metadata);
+        $headers = self::stockHeaders($metadata) + self::getJsonHeader();
         return $this->getClient()->post($this->getUrl(), $headers)->send();
     }
 
@@ -190,9 +190,11 @@ public function unsetMetadataItem($key)
     {
         $header = sprintf('%s-Remove-%s-Meta-%s', self::GLOBAL_METADATA_PREFIX, 
             static::METADATA_LABEL, $key);
-        
+
+        $headers = array($header => 'True');
+
         return $this->getClient()
-            ->post($this->getUrl(), array($header => 'True'))
+            ->post($this->getUrl(), $headers)
             ->send();
     }