Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2820888 by lhangea, Wim Leers: Cookie authentication: the user.login.http route never supports the 'hal_json' format or some other format, depending on module order

8.3.x
Alex Pott 2016-11-26 21:16:28 +00:00
parent 6fe12176c4
commit bc7d4f144f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/serialization/src/EventSubscriber/UserRouteAlterSubscriber.php
View File

@ -63,7 +63,7 @@ class UserRouteAlterSubscriber implements EventSubscriberInterface {
foreach ($route_names as $route_name) {
if ($route = $routes->get($route_name)) {
$formats = explode('|', $route->getRequirement('_format'));
$formats = array_unique($formats + $this->serializerFormats);
$formats = array_unique(array_merge($formats, $this->serializerFormats));
$route->setRequirement('_format', implode('|', $formats));
}
}

12
core/modules/user/tests/src/Functional/UserLoginHttpTest.php
View File

@ -10,6 +10,7 @@ use GuzzleHttp\Cookie\CookieJar;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Serializer\Encoder\XmlEncoder;
use Drupal\hal\Encoder\JsonEncoder as HALJsonEncoder;
use Symfony\Component\Serializer\Serializer;
/**
@ -19,6 +20,13 @@ use Symfony\Component\Serializer\Serializer;
*/
class UserLoginHttpTest extends BrowserTestBase {
/**
* Modules to install.
*
* @var array
*/
public static $modules = ['hal'];
/**
* The cookie jar.
*
@ -39,7 +47,7 @@ class UserLoginHttpTest extends BrowserTestBase {
protected function setUp() {
parent::setUp();
$this->cookies = new CookieJar();
$encoders = [new JsonEncoder(), new XmlEncoder()];
$encoders = [new JsonEncoder(), new XmlEncoder(), new HALJsonEncoder()];
$this->serializer = new Serializer([], $encoders);
}
@ -90,7 +98,7 @@ class UserLoginHttpTest extends BrowserTestBase {
/** @var \Drupal\Core\Extension\ModuleInstaller $module_installer */
$module_installer = $this->container->get('module_installer');
$module_installer->install(['serialization']);
$formats = ['json', 'xml'];
$formats = ['json', 'xml', 'hal_json'];
}
else {
// Without the serialization module only JSON is supported.