deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #144 from havvg/master

Browse source 
fix SecurityIdentity username with multiple dashes
This commit is contained in:
William Durand 2012-04-24 05:58:31 -07:00
parent e4823e3f9b 7f14193c39
commit 3f4be39a9d
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Model/Acl/SecurityIdentity.php
View file

@ -34,7 +34,7 @@ class SecurityIdentity extends BaseSecurityIdentity
throw new \InvalidArgumentException('The given identifier does not resolve to a UserSecurityIdentity.');
}
list($class, $username) = explode('-', $identifier);
list($class, $username) = explode('-', $identifier, 2);
return new UserSecurityIdentity($username, $class);
}

13
Tests/Model/Acl/SecurityIdentityTest.php
View file

@ -54,6 +54,17 @@ class SecurityIdentityTest extends AclTestCase
$this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\UserSecurityIdentity', $secIdentity);
}
public function testToAclIdentityMultipleDashes()
{
$identity = new SecurityIdentity();
$identity->setIdentifier('Propel\PropelBundle\Tests\Fixtures\UserProxy-some-username@domain.com');
$identity->setUsername(true);
$secIdentity = SecurityIdentity::toAclIdentity($identity);
$this->assertInstanceOf('Symfony\Component\Security\Acl\Domain\UserSecurityIdentity', $secIdentity);
$this->assertEquals('some-username@domain.com', $secIdentity->getUsername());
}
public function testToAclIdentityValidRole()
{
$identity = new SecurityIdentity();
@ -108,4 +119,4 @@ class SecurityIdentityTest extends AclTestCase
$dbEntry = SecurityIdentityQuery::create()->findPk($identity->getId());
$this->assertInstanceOf('Propel\PropelBundle\Model\Acl\SecurityIdentity', $dbEntry);
}
}
}