tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.9' into 4.10

Browse Source
This commit is contained in:
Steve Boyd 2021-12-16 10:58:13 +13:00
commit 8b3bec9c68
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
View File

@ -113,5 +113,9 @@ class SessionAuthenticationHandler implements AuthenticationHandler
{ {
$request = $request ?: Controller::curr()->getRequest(); $request = $request ?: Controller::curr()->getRequest();
$request->getSession()->destroy(true, $request); $request->getSession()->destroy(true, $request);
if (Member::config()->get('login_marker_cookie')) {
Cookie::force_expiry(Member::config()->get('login_marker_cookie'));
}
} }
} }

2
src/i18n/TextCollection/i18nTextCollector.php
View File

@ -372,7 +372,7 @@ class i18nTextCollector
// For each module do a simple merge of the default yml with these strings // For each module do a simple merge of the default yml with these strings
foreach ($entitiesByModule as $module => $messages) { foreach ($entitiesByModule as $module => $messages) {
// Load existing localisations // Load existing localisations
$masterFile = "{$this->basePath}/{$module}/lang/{$this->defaultLocale}.yml"; $masterFile = "{$this->basePath}/vendor/{$module}/lang/{$this->defaultLocale}.yml";
$existingMessages = $this->getReader()->read($this->defaultLocale, $masterFile); $existingMessages = $this->getReader()->read($this->defaultLocale, $masterFile);
// Merge // Merge

20
tests/php/Security/MemberAuthenticator/SessionAuthenticationHandlerTest.php
View File

@ -4,13 +4,15 @@ namespace SilverStripe\Security\Tests\MemberAuthenticator;
use SilverStripe\Control\Cookie; use SilverStripe\Control\Cookie;
use SilverStripe\Control\HTTPRequest; use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session; use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\SapphireTest; use SilverStripe\Dev\SapphireTest;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler; use SilverStripe\Security\MemberAuthenticator\SessionAuthenticationHandler;
class SessionAuthenticationHandlerTest extends SapphireTest class SessionAuthenticationHandlerTest extends SapphireTest
{ {
protected static $fixture_file = 'SessionAuthenticationHandlerTest.yml';
protected $usesDatabase = true; protected $usesDatabase = true;
/** /**
@ -58,4 +60,20 @@ class SessionAuthenticationHandlerTest extends SapphireTest
$this->assertNotNull($matchedMember); $this->assertNotNull($matchedMember);
$this->assertEquals($matchedMember->Email, $member->Email); $this->assertEquals($matchedMember->Email, $member->Email);
} }
public function testLoginMarkerCookie()
{
Config::modify()->set(Member::class, 'login_marker_cookie', 'sslogin');
/** @var Member $member */
$member = $this->objFromFixture(Member::class, 'test');
$this->logInAs($member);
$this->assertNotNull(Cookie::get('sslogin'), 'Login marker cookie is set after logging in');
$this->logOut();
$this->assertNull(Cookie::get('sslogin'), 'Login marker cookie is deleted after logging out');
}
} }

11
tests/php/Security/MemberAuthenticator/SessionAuthenticationHandlerTest.yml Normal file
View File

@ -0,0 +1,11 @@
'SilverStripe\Security\Group':
usergroup:
Title: usergroup
Code: usergroup
'SilverStripe\Security\Member':
test:
FirstName: Test
Surname: User
Email: testuser@example.com
Password: 1nitialPassword
Groups: '=>SilverStripe\Security\Group.usergroup'