Merge pull request #197 from cakephp/fix-cookie-auth

Add support for expanded cookies

Author: robertpustulka

src/Authenticator/CookieAuthenticator.php

@@ -91,7 +91,11 @@ public function authenticate(ServerRequestInterface $request, ResponseInterface
             ]);
         }
 
-        $token = json_decode($cookies[$cookieName], true);
+        if (is_array($cookies[$cookieName])) {
+            $token = $cookies[$cookieName];
+        } else {
+            $token = json_decode($cookies[$cookieName], true);
+        }
 
         if ($token === null || count($token) !== 2) {
             return new Result(null, Result::FAILURE_CREDENTIALS_INVALID, [

tests/TestCase/Authenticator/CookieAuthenticatorTest.php

@@ -103,6 +103,34 @@ public function testAuthenticateSuccess()
         $this->assertEquals(Result::SUCCESS, $result->getStatus());
     }
 
+    /**
+     * testAuthenticateSuccess
+     *
+     * @return void
+     */
+    public function testAuthenticateExpandedCookie()
+    {
+        $identifiers = new IdentifierCollection([
+            'Authentication.Password'
+        ]);
+
+        $request = ServerRequestFactory::fromGlobals(
+            ['REQUEST_URI' => '/testpath'],
+            null,
+            null,
+            [
+                'CookieAuth' => ["mariano", "$2y$10$1bE1SgasKoz9WmEvUfuZLeYa6pQgxUIJ5LAoS/KGmC1hNuWkUG7ES"]
+            ]
+        );
+        $response = new Response();
+
+        $authenticator = new CookieAuthenticator($identifiers);
+        $result = $authenticator->authenticate($request, $response);
+
+        $this->assertInstanceOf(Result::class, $result);
+        $this->assertEquals(Result::SUCCESS, $result->getStatus());
+    }
+
     /**
      * testAuthenticateUnknownUser
      *