mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-22 23:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Changed parsing of login_extra_fields in guzzle auth

Browse source
This commit is contained in:
Bertrand Dunogier 2017-01-22 00:42:05 +01:00
parent 5b914b0422
commit 662db41bae
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
View file

@ -54,7 +54,7 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
'loginUri' => $config->login_uri ?: null,
'usernameField' => $config->login_username_field ?: null,
'passwordField' => $config->login_password_field ?: null,
'extraFields' => is_array($config->login_extra_fields) ? $config->login_extra_fields : [],
'extraFields' => $this->processExtraFields($config->login_extra_fields),
'notLoggedInXpath' => $config->not_logged_in_xpath ?: null,
];
@ -65,4 +65,30 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
return new SiteConfig($parameters);
}
/**
* Processes login_extra_fields config, transforming an '=' separated array of strings
* into a key/value array.
*
* @param array|mixed $extraFieldsStrings
*
* @return array
*/
protected function processExtraFields($extraFieldsStrings)
{
if (!is_array($extraFieldsStrings)) {
return [];
}
$extraFields = [];
foreach ($extraFieldsStrings as $extraField) {
if (strpos($extraField, '=') === false) {
continue;
}
list($fieldName, $fieldValue) = explode('=', $extraField, 2);
$extraFields[$fieldName] = $fieldValue;
}
return $extraFields;
}
}

2
tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
View file

@ -24,7 +24,7 @@ class GrabySiteConfigBuilderTest extends PHPUnit_Framework_TestCase
$grabySiteConfig->login_uri = 'http://example.com/login';
$grabySiteConfig->login_username_field = 'login';
$grabySiteConfig->login_password_field = 'password';
$grabySiteConfig->login_extra_fields = ['field' => 'value'];
$grabySiteConfig->login_extra_fields = ['field=value'];
$grabySiteConfig->not_logged_in_xpath = '//div[@class="need-login"]';
$grabyConfigBuilderMock