Merge branch 'master' of github.com:getcandy/candy-client-php

getcandy · Apr 12, 2019 · 9ef284c · 9ef284c
2 parents da77dc3 + 2967dfb
commit 9ef284c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 571 deletions.
diff --git a/src/Candy.php b/src/Candy.php
@@ -3,7 +3,6 @@
 namespace GetCandy\Client;
 
 use Cache;
-use Closure;
 use GuzzleHttp\Client;
 use Psr\Log\LoggerInterface;
 use GuzzleHttp\Exception\ClientException;
@@ -21,21 +20,18 @@ class Candy
     protected $clientId;
     protected $clientSecret;
     protected $channel = 'webstore';
+    protected $debug;
     protected $locale = 'en';
     protected $client;
     protected $token = null;
     protected $driver;
     protected $logger;
 
-    public function __construct($app, $internal = false)
+    public function __construct($app, $driver = 'guzzle')
     {
         $manager = $app->make(CandyClientManager::class);
         $this->logger = $app->make(LoggerInterface::class);
-        if ($internal) {
-            $this->driver = $manager->with('internal');
-        } else {
-            $this->driver = $manager->with('guzzle');
-        }
+        $this->driver = $manager->with($driver);
     }
 
     /**
@@ -67,8 +63,6 @@ public function revoke($token)
             ],
             'verify' => config('services.ecommerce_api.verify'),
         ]);
-
-        dd('hit');
     }
 
     public function getClient()
@@ -90,6 +84,7 @@ public function init($url, array $config = [])
         $this->clientId = $config['client_id'] ?? null;
         $this->locale = $config['locale'] ?? $this->locale;
         $this->channel = $config['channel'] ?? $this->channel;
+        $this->debug = $config['debug'] ?? false;
 
         $this->client = new Client([
             'base_uri' => $this->getUri(),
@@ -200,32 +195,16 @@ public function execute()
         $response = $job->getRequest()->getResponse();
         $status = $response->getStatus();
 
-        $level = 'info';
-
         if ($status > 400) {
             $level = 'error';
         }
 
-        // $this->logger->log($level, $response->toArray());
-
-        return $job->getRequest();
-    }
-
-    public function batch(Closure $addJobs)
-    {
-        $batch = new \GetCandy\Client\InternalBatchRequestService();
-
-        $addJobs($batch);
-
-        $batch->execute();
-
-        $responses = [];
-
-        foreach ($batch->getJobs() as $key => $job) {
-            $responses[$key] = $job->getRequest()->getResponse();
+        if ($this->debug) {
+            // Helps to see actual response from API
+            $this->logger->log('debug', $response);
         }
 
-        return $responses;
+        return $job->getRequest();
     }
 
     public function reset()
@@ -312,6 +291,7 @@ public function getToken($force = false)
         if ($this->token) {
             return $this->token;
         }
+
         return $this->getClientToken();
     }
 

diff --git a/src/CandyClientManager.php b/src/CandyClientManager.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Manager;
 use GetCandy\Client\Drivers\Guzzle;
-use GetCandy\Client\Drivers\Internal;
 
 class CandyClientManager extends Manager
 {
@@ -31,13 +30,6 @@ public function createGuzzleDriver()
         );
     }
 
-    public function createInternalDriver()
-    {
-        return $this->buildProvider(
-            Internal::class
-        );
-    }
-
     /**
      * Build a layout provider instance.
      *

diff --git a/src/Drivers/Internal.php b/src/Drivers/Internal.php
diff --git a/src/GetCandyServiceProvider.php b/src/GetCandyServiceProvider.php
@@ -18,7 +18,7 @@ class GetCandyServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->app->singleton(CandyClient::class, function ($app) {
-            return new Candy($app, config('getcandy.internal_requests', false));
+            return new Candy($app);
         });
 
         $this->app->bind(CandyClientManager::class, function ($app) {