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 pull request #4348 from dhensby/pulls/3.2/fix-orphaned-passwords

Browse Source 
FIX MemberPassword history removed with with Members
This commit is contained in:
Damian Mooyman 2015-06-25 09:14:09 +12:00
commit d85590ddb9
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
security/Member.php
View File

@ -59,7 +59,9 @@ class Member extends DataObject implements TemplateGlobalProvider {
private static $has_one = array(); private static $has_one = array();
private static $has_many = array(); private static $has_many = array(
'LoggedPasswords' => 'MemberPassword',
);
private static $many_many = array(); private static $many_many = array();
@ -879,6 +881,26 @@ class Member extends DataObject implements TemplateGlobalProvider {
} }
} }
public function onAfterDelete() {
parent::onAfterDelete();
//prevent orphaned records remaining in the DB
$this->deletePasswordLogs();
}
/**
* Delete the MemberPassword objects that are associated to this user
*
* @return self
*/
protected function deletePasswordLogs() {
foreach ($this->LoggedPasswords() as $password) {
$password->delete();
$password->destroy();
}
return $this;
}
/** /**
* If any admin groups are requested, deny the whole save operation. * If any admin groups are requested, deny the whole save operation.
* *

7
tests/security/MemberTest.php
View File

@ -172,6 +172,13 @@ class MemberTest extends FunctionalTest {
$this->assertInstanceOf('DataObject', $passwords->current()); $this->assertInstanceOf('DataObject', $passwords->current());
$this->assertTrue($passwords->current()->checkPassword('1nitialPassword'), $this->assertTrue($passwords->current()->checkPassword('1nitialPassword'),
"Password 1nitialPassword not found in MemberRecord"); "Password 1nitialPassword not found in MemberRecord");
//check we don't retain orphaned records when a member is deleted
$member->delete();
$passwords = MemberPassword::get()->filter('MemberID', $member->OldID);
$this->assertCount(0, $passwords);
} }
/** /**