pre-changes

Author: MaximusBaton

Diff for: Client.php

@@ -14,9 +14,9 @@
 class Client {
 
     // Make screenshot action
-    const MAKE_SCREENSHOT_ACTION = '/makeScreenshot';
+    const MAKE_SCREENSHOT_ACTION = '/create-job';
     // Get screenshot action
-    const GET_SCREENSHOT_ACTION = '/getScreenshot';
+    const GET_SCREENSHOT_ACTION = '/get-job-result';
 
     /** @var Logger\LoggerInterface */
     private $_logger;
@@ -59,7 +59,7 @@ public function setLogger(Logger\LoggerInterface $logger) {
      */
     public function makeScreenshot(Params\MakeParams $params, Adapter\AdapterInterface $adapter, ImageCreator $creator) {
         // Make request
-        $params = $params->getParams($this->_secret);
+        $params = $params->getParams();
         if ($response = $this->postRequest($this->getActionUrl(self::MAKE_SCREENSHOT_ACTION), $params)) {
             $adapter->makeScreenshot($response, $creator);
         }
@@ -72,7 +72,7 @@ public function makeScreenshot(Params\MakeParams $params, Adapter\AdapterInterfa
      */
     public function getScreenshot(Params\GetParams $params, Adapter\AdapterInterface $adapter) {
         // Make request
-        $params = $params->getParams($this->_secret);
+        $params = $params->getParams();
         if ($response = $this->postRequest($this->getActionUrl(self::GET_SCREENSHOT_ACTION), $params)) {
             $adapter->getScreenshot($response);
         }
@@ -116,6 +116,11 @@ protected function postRequest($url, $data = []) {
         curl_setopt($ch, CURLOPT_POST, 1);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $postString);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            'Authorization: Bearer '. $this->_secret,
+            "Cache-Control: no-cache",
+        ]);
+        
         $response = curl_exec($ch);
 
         if(curl_errno($ch)) {

Diff for: Params/BaseParams.php

@@ -15,11 +15,8 @@ abstract class BaseParams {
      * @param string $secret - client key
      * @return array
      */
-    public function getParams($secret) {
-        return [
-            'secret' => $secret,
-            'params' => $this->params()
-        ];
+    public function getParams() {
+        return $this->params();
     }
 
     abstract public function params();

Diff for: Params/MakeParams.php

@@ -10,7 +10,7 @@
 
 class MakeParams extends BaseParams {
 
-    const AUTO_SCALE = 'auto';
+    const AUTO_SCALE = 0;
 
     /**@var string - url to take screenshot */
     private $_url;

Diff for: README.md

@@ -1,20 +1,22 @@
 Cagoi screenshots
 =================
 
-Library for easy screenshots making
+Library for an easy screenshots making
 
 
 Quick structure description
 ---------------------------
 
-###"Root directory"
+### "Root directory"
+
 **Cagoi\Screenshots\Client** 			- this class manages all process;
 
 **Cagoi\Screenshots\ImageCreator** 		- helps create images by response from server;
 
 **Cagoi\Screenshots\Exception** 		- library exception;
 
-###"Adapter" directory
+### "Adapter" directory
+
 In this directory you can find predefined adapters. Now available adapter for MongoDb, but you can define new adapter
 for your own purposes. 
 
@@ -23,10 +25,10 @@ It needs for handle such operations:
 - Get screenshot;
 - Callback processing.
 
-###"Logger" directory
+### "Logger" directory
 Classes for log work process. You can define new logger for your own purposes. Cagoi\Screenshots\Logger\FileLogger - log in file
 
-###"Params" directory
+### "Params" directory
 Classes in this directory helps prepare request parameters:
 
 **Cagoi\Screenshots\Params\GetParams** - helps with parameters for get screenshot request
@@ -82,19 +84,19 @@ $params->setCallback("http://my.site.com/callback");
 $params->setElementId("<element id>");
 // Delay in milliseconds
 $params->setDelay(1000);
-// Set scale width = 300px, height = auto scale
+// Set scale width = 300px, height = 0 (auto scale)
 $params->addWidthScale(300);
-// Set scale width = auto scale, height = 300px
+// Set scale width = 0 (auto scale), height = 300px
 $params->addHeightScale(300);
 // Set scale width = 300px, height = 300px
 $params->addScale(300, 300);
 
 $creator = Cagoi\Screenshots\ImageCreator();
 // Create full image
 $creator->add('full', '<path to save>', '<filename>');
-// Create image with width = 300px, height = auto scale
+// Create image with width = 300px, height = 0 (auto scale)
 $creator->add('300x0', '<path to save>', '<filename>');
-// Create image with width = auto scale, height = 300px
+// Create image with width = 0 (auto scale), height = 300px
 $creator->add('0x300', '<path to save>', '<filename>');
 // Create image with width = 300px, height = 300px
 $creator->add('300x300', '<path to save>', '<filename>');