Modification on cookie API

The cookie jar must be passed from the previous response to be used in another request
roman-ali · Oct 3, 2017 · d4477c9 · d4477c9
1 parent 29d94f2
commit d4477c9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 28 deletions.
diff --git a/src/Zttp.php b/src/Zttp.php
@@ -14,7 +14,9 @@ class PendingZttpRequest
 {
     function __construct()
     {
-        $this->beforeSendingCallbacks = collect();
+        $this->beforeSendingCallbacks = collect([ function ($request, $options) {
+            $this->cookies = $options['cookies'];
+        }]);
         $this->bodyFormat = 'json';
         $this->options = [
             'http_errors' => false,
@@ -103,22 +105,15 @@ function withDigestAuth($username, $password)
         });
     }
 
-    static $cookieJar;
-
-    function withCookies()
+    function withCookies($cookies)
     {
-        return tap($this, function($request) {
+        return tap($this, function($request) use ($cookies) {
             return $this->options = array_merge_recursive($this->options, [
-                'cookies' => static::getCookieJar(),
+                'cookies' => $cookies,
             ]);
         });
     }
 
-    static function getCookieJar()
-    {
-        return static::$cookieJar ?: static::$cookieJar = new \GuzzleHttp\Cookie\CookieJar();
-    }
-
     function beforeSending($callback)
     {
         return tap($this, function () use ($callback) {
@@ -163,14 +158,19 @@ function delete($url, $params = [])
 
     function send($method, $url, $options)
     {
-        return new ZttpResponse($this->buildClient()->request($method, $url, $this->mergeOptions([
-            'query' => $this->parseQueryParams($url),
-        ], $options)));
+        return tap(new ZttpResponse($this->buildClient()->request($method, $url, $this->mergeOptions(
+            ['query' => $this->parseQueryParams($url)], $options))),
+            function($response) {
+                $response->cookies = $this->cookies;
+            });
     }
 
     function buildClient()
     {
-        return new \GuzzleHttp\Client(['handler' => $this->buildHandlerStack()]);
+        return new \GuzzleHttp\Client([
+            'handler' => $this->buildHandlerStack(),
+            'cookies' => true,
+        ]);
     }
 
     function buildHandlerStack()
@@ -183,15 +183,15 @@ function buildBeforeSendingHandler()
     {
         return function ($handler) {
             return function ($request, $options) use ($handler) {
-                return $handler($this->runBeforeSendingCallbacks($request), $options);
+                return $handler($this->runBeforeSendingCallbacks($request, $options), $options);
             };
         };
     }
 
-    function runBeforeSendingCallbacks($request)
+    function runBeforeSendingCallbacks($request, $options)
     {
-        return tap($request, function ($request) {
-            $this->beforeSendingCallbacks->each->__invoke(new ZttpRequest($request));
+        return tap($request, function ($request) use ($options) {
+            $this->beforeSendingCallbacks->each->__invoke(new ZttpRequest($request), $options);
         });
     }
 
@@ -301,6 +301,11 @@ function isServerError()
         return $this->status() >= 500;
     }
 
+    function cookies()
+    {
+        return $this->cookies;
+    }
+
     function __call($method, $args)
     {
         if (static::hasMacro($method)) {

diff --git a/tests/ZttpTest.php b/tests/ZttpTest.php
@@ -466,13 +466,16 @@ function can_use_basic_auth()
     /** @test */
     function cookies_can_be_shared_between_requests()
     {
-        $response = Zttp::withCookies()->get($this->url('/echo-cookie'));
-        $this->assertEmpty($response->body());
-        Zttp::withCookies()->get($this->url('/set-cookie'));
-        $response = Zttp::withCookies()->get($this->url('/echo-cookie'));
-        $this->assertEquals('bar', $response->body());
-        $response = Zttp::get($this->url('/echo-cookie'));
-        $this->assertEmpty($response->body());
+        $response = Zttp::get($this->url('/set-cookie'));
+        $response = Zttp::withCookies($response->cookies())->get($this->url('/get'));
+        $this->assertEquals(['foo' => 'bar'], $response->json()['cookies']);
+
+        $response = Zttp::withCookies($response->cookies())->get($this->url('/set-another-cookie'));
+        $response = Zttp::withCookies($response->cookies())->get($this->url('/get'));
+        $this->assertEquals(['foo' => 'bar', 'baz' => 'qux'], $response->json()['cookies']);
+
+        $response = Zttp::get($this->url('/get'));
+        $this->assertEquals([], $response->json()['cookies']);
     }
 }
 

diff --git a/tests/server/public/index.php b/tests/server/public/index.php
@@ -13,6 +13,7 @@ function build_response($request)
         'query' => $request->query(),
         'json' => $request->json()->all(),
         'form_params' => $request->request->all(),
+        'cookies' => $request->cookies->all(),
     ], $request->header('Z-Status', 200));
 }
 
@@ -73,8 +74,10 @@ function build_response($request)
    );
 });
 
-$app->get('/echo-cookie', function() {
-    return response(app('request')->cookies->get('foo'), 200);
+$app->get('/set-another-cookie', function() {
+    return response(null, 200)->withCookie(
+        new \Symfony\Component\HttpFoundation\Cookie('baz', 'qux')
+    );
 });
 
 $app->run();