Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
bce2a5dc
Commit
bce2a5dc
authored
Oct 12, 2014
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.2'
* 1.2: Update RememberMeServiceProvider.php
parents
efbbd39f
2603afb3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
src/Silex/Provider/RememberMeServiceProvider.php
src/Silex/Provider/RememberMeServiceProvider.php
+3
-2
tests/Silex/Tests/Provider/RememberMeServiceProviderTest.php
tests/Silex/Tests/Provider/RememberMeServiceProviderTest.php
+9
-0
No files found.
src/Silex/Provider/RememberMeServiceProvider.php
View file @
bce2a5dc
...
@@ -58,7 +58,7 @@ class RememberMeServiceProvider implements ServiceProviderInterface, EventListen
...
@@ -58,7 +58,7 @@ class RememberMeServiceProvider implements ServiceProviderInterface, EventListen
'security.authentication_provider.'
.
$name
.
'.remember_me'
,
'security.authentication_provider.'
.
$name
.
'.remember_me'
,
'security.authentication_listener.'
.
$name
.
'.remember_me'
,
'security.authentication_listener.'
.
$name
.
'.remember_me'
,
null
,
// entry point
null
,
// entry point
'remember_me'
'remember_me'
,
);
);
});
});
...
@@ -85,7 +85,8 @@ class RememberMeServiceProvider implements ServiceProviderInterface, EventListen
...
@@ -85,7 +85,8 @@ class RememberMeServiceProvider implements ServiceProviderInterface, EventListen
$app
[
'security'
],
$app
[
'security'
],
$app
[
'security.remember_me.service.'
.
$providerKey
],
$app
[
'security.remember_me.service.'
.
$providerKey
],
$app
[
'security.authentication_manager'
],
$app
[
'security.authentication_manager'
],
$app
[
'logger'
]
$app
[
'logger'
],
$app
[
'dispatcher'
]
);
);
return
$listener
;
return
$listener
;
...
...
tests/Silex/Tests/Provider/RememberMeServiceProviderTest.php
View file @
bce2a5dc
...
@@ -29,19 +29,28 @@ class RememberMeServiceProviderTest extends WebTestCase
...
@@ -29,19 +29,28 @@ class RememberMeServiceProviderTest extends WebTestCase
{
{
$app
=
$this
->
createApplication
();
$app
=
$this
->
createApplication
();
$event
=
false
;
$app
->
on
(
\Symfony\Component\Security\Http\SecurityEvents
::
INTERACTIVE_LOGIN
,
function
(
$event
)
use
(
$app
,
&
$event
)
{
$event
=
true
;
});
$client
=
new
Client
(
$app
);
$client
=
new
Client
(
$app
);
$client
->
request
(
'get'
,
'/'
);
$client
->
request
(
'get'
,
'/'
);
$this
->
assertFalse
(
$event
,
'The interactive login has not been triggered yet'
);
$client
->
request
(
'post'
,
'/login_check'
,
array
(
'_username'
=>
'fabien'
,
'_password'
=>
'foo'
,
'_remember_me'
=>
'true'
));
$client
->
request
(
'post'
,
'/login_check'
,
array
(
'_username'
=>
'fabien'
,
'_password'
=>
'foo'
,
'_remember_me'
=>
'true'
));
$client
->
followRedirect
();
$client
->
followRedirect
();
$this
->
assertEquals
(
'AUTHENTICATED_FULLY'
,
$client
->
getResponse
()
->
getContent
());
$this
->
assertEquals
(
'AUTHENTICATED_FULLY'
,
$client
->
getResponse
()
->
getContent
());
$this
->
assertTrue
(
$event
,
'The interactive login has been triggered'
);
$this
->
assertNotNull
(
$client
->
getCookiejar
()
->
get
(
'REMEMBERME'
),
'The REMEMBERME cookie is set'
);
$this
->
assertNotNull
(
$client
->
getCookiejar
()
->
get
(
'REMEMBERME'
),
'The REMEMBERME cookie is set'
);
$event
=
false
;
$client
->
getCookiejar
()
->
expire
(
'MOCKSESSID'
);
$client
->
getCookiejar
()
->
expire
(
'MOCKSESSID'
);
$client
->
request
(
'get'
,
'/'
);
$client
->
request
(
'get'
,
'/'
);
$this
->
assertEquals
(
'AUTHENTICATED_REMEMBERED'
,
$client
->
getResponse
()
->
getContent
());
$this
->
assertEquals
(
'AUTHENTICATED_REMEMBERED'
,
$client
->
getResponse
()
->
getContent
());
$this
->
assertTrue
(
$event
,
'The interactive login has been triggered'
);
$client
->
request
(
'get'
,
'/logout'
);
$client
->
request
(
'get'
,
'/logout'
);
$client
->
followRedirect
();
$client
->
followRedirect
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment