feat: local user registration
This commit is contained in:
1 parent
8bb7f08074
commit
161029ec7c
29 files changed
+1549
-601
No files matched your search
@@ -5,26 +5,35 @@ declare(strict_types=1);
|
||||
namespace App\Tests\Security;
|
||||
|
||||
use App\BusProNet\ApiClient;
|
||||
use App\BusProNet\Exception\TimeoutException;
|
||||
use App\BusProNet\Model\CrmAttributes;
|
||||
use App\BusProNet\Model\PersonalData;
|
||||
use App\Entity\User;
|
||||
use App\Repository\UserRepository;
|
||||
use App\Security\BpnAuthenticator;
|
||||
use App\Security\Crypt;
|
||||
use App\Service\UserBootstrapper;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Doctrine\ORM\EntityRepository;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
|
||||
use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport;
|
||||
use App\Service\ProfileCompletenessChecker;
|
||||
use Symfony\Component\Validator\ConstraintViolationList;
|
||||
use Symfony\Component\Validator\Validator\ValidatorInterface;
|
||||
|
||||
class BpnAuthenticatorTest extends TestCase
|
||||
{
|
||||
public function testAuthenticateAcceptsLocalPasswordHashWithoutLegacyDecryption(): void
|
||||
{
|
||||
$user = new User('[email protected]');
|
||||
$user
|
||||
->setAddressId(10)
|
||||
->setPersonId(20)
|
||||
->setProfileComplete(false)
|
||||
;
|
||||
$user->setPassword(password_hash('secret', PASSWORD_BCRYPT));
|
||||
|
||||
$passwordHasher = $this->createMock(UserPasswordHasherInterface::class);
|
||||
@@ -34,14 +43,52 @@ class BpnAuthenticatorTest extends TestCase
|
||||
->with($user, 'secret')
|
||||
->willReturn(true);
|
||||
|
||||
$personalData = new PersonalData();
|
||||
$personalData->addressId = 123;
|
||||
$personalData->personId = 456;
|
||||
$personalData->firstName = 'Mia';
|
||||
$personalData->name = 'Muster';
|
||||
$personalData->gender = 'W';
|
||||
$personalData->nationality = 'DE';
|
||||
$personalData->dateOfBirth = new \DateTimeImmutable('1990-05-15');
|
||||
$personalData->communication->email = '[email protected]';
|
||||
$personalData->address->street = 'Main Street 1';
|
||||
$personalData->address->postCode = '10115';
|
||||
$personalData->address->city = 'Berlin';
|
||||
$personalData->address->country = 'DE';
|
||||
|
||||
$apiClient = $this->createMock(ApiClient::class);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getPersonalData')
|
||||
->with('[email protected]', 10, 20)
|
||||
->willReturn($personalData);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getCrmAttributes')
|
||||
->with('[email protected]', 123, 456)
|
||||
->willReturn((function (): CrmAttributes {
|
||||
$crmAttributes = new CrmAttributes();
|
||||
$crmAttributes->roles = ['ROLE_ADMIN'];
|
||||
$crmAttributes->hotelCodes = ['AAA'];
|
||||
|
||||
return $crmAttributes;
|
||||
})());
|
||||
|
||||
$authenticator = $this->createAuthenticator(
|
||||
user: $user,
|
||||
apiClient: $apiClient,
|
||||
passwordHasher: $passwordHasher,
|
||||
);
|
||||
|
||||
$passport = $authenticator->authenticate($this->createRequest('[email protected]', 'secret'));
|
||||
|
||||
self::assertInstanceOf(SelfValidatingPassport::class, $passport);
|
||||
self::assertSame(123, $user->getAddressId());
|
||||
self::assertSame(456, $user->getPersonId());
|
||||
self::assertTrue($user->isProfileComplete());
|
||||
self::assertSame(['ROLE_USER', 'ROLE_ADMIN'], $user->getRoles());
|
||||
self::assertSame(['AAA'], $user->getHotelCodes());
|
||||
}
|
||||
|
||||
public function testAuthenticateMigratesLegacyPasswordToLocalHashOnSuccess(): void
|
||||
@@ -66,8 +113,41 @@ class BpnAuthenticatorTest extends TestCase
|
||||
->with($user, 'secret')
|
||||
->willReturn('local-hash');
|
||||
|
||||
$personalData = new PersonalData();
|
||||
$personalData->addressId = 123;
|
||||
$personalData->personId = 456;
|
||||
$personalData->firstName = 'Mia';
|
||||
$personalData->name = 'Muster';
|
||||
$personalData->gender = 'W';
|
||||
$personalData->nationality = 'DE';
|
||||
$personalData->dateOfBirth = new \DateTimeImmutable('1990-05-15');
|
||||
$personalData->communication->email = '[email protected]';
|
||||
$personalData->address->street = 'Main Street 1';
|
||||
$personalData->address->postCode = '10115';
|
||||
$personalData->address->city = 'Berlin';
|
||||
$personalData->address->country = 'DE';
|
||||
|
||||
$apiClient = $this->createMock(ApiClient::class);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getPersonalData')
|
||||
->with('[email protected]', null, null)
|
||||
->willReturn($personalData);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getCrmAttributes')
|
||||
->with('[email protected]', 123, 456)
|
||||
->willReturn((function (): CrmAttributes {
|
||||
$crmAttributes = new CrmAttributes();
|
||||
$crmAttributes->roles = ['ROLE_CUSTOMER'];
|
||||
$crmAttributes->hotelCodes = [];
|
||||
|
||||
return $crmAttributes;
|
||||
})());
|
||||
|
||||
$authenticator = $this->createAuthenticator(
|
||||
user: $user,
|
||||
apiClient: $apiClient,
|
||||
crypt: $crypt,
|
||||
passwordHasher: $passwordHasher,
|
||||
);
|
||||
@@ -76,6 +156,70 @@ class BpnAuthenticatorTest extends TestCase
|
||||
|
||||
self::assertInstanceOf(SelfValidatingPassport::class, $passport);
|
||||
self::assertSame('local-hash', $user->getPassword());
|
||||
self::assertSame(123, $user->getAddressId());
|
||||
self::assertSame(456, $user->getPersonId());
|
||||
}
|
||||
|
||||
public function testAuthenticateFailsClosedWhenCrmSyncFailsAfterLocalPasswordValidation(): void
|
||||
{
|
||||
$user = new User('[email protected]');
|
||||
$user
|
||||
->setPassword(password_hash('secret', PASSWORD_BCRYPT))
|
||||
->setRoles(['ROLE_ADMIN'])
|
||||
->setHotelCodes(['STALE'])
|
||||
;
|
||||
|
||||
$passwordHasher = $this->createMock(UserPasswordHasherInterface::class);
|
||||
$passwordHasher
|
||||
->expects(self::once())
|
||||
->method('isPasswordValid')
|
||||
->with($user, 'secret')
|
||||
->willReturn(true);
|
||||
|
||||
$personalData = new PersonalData();
|
||||
$personalData->addressId = 123;
|
||||
$personalData->personId = 456;
|
||||
$personalData->firstName = 'Mia';
|
||||
$personalData->name = 'Muster';
|
||||
$personalData->gender = 'W';
|
||||
$personalData->nationality = 'DE';
|
||||
$personalData->dateOfBirth = new \DateTimeImmutable('1990-05-15');
|
||||
$personalData->communication->email = '[email protected]';
|
||||
$personalData->address->street = 'Main Street 1';
|
||||
$personalData->address->postCode = '10115';
|
||||
$personalData->address->city = 'Berlin';
|
||||
$personalData->address->country = 'DE';
|
||||
|
||||
$apiClient = $this->createMock(ApiClient::class);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getPersonalData')
|
||||
->with('[email protected]', null, null)
|
||||
->willReturn($personalData);
|
||||
$apiClient
|
||||
->expects(self::once())
|
||||
->method('getCrmAttributes')
|
||||
->with('[email protected]', 123, 456)
|
||||
->willThrowException(new TimeoutException());
|
||||
|
||||
$validator = $this->createMock(ValidatorInterface::class);
|
||||
$validator
|
||||
->expects(self::once())
|
||||
->method('validate')
|
||||
->with($personalData, null, ['personal_data'])
|
||||
->willReturn(new ConstraintViolationList());
|
||||
|
||||
$authenticator = $this->createAuthenticator(
|
||||
user: $user,
|
||||
apiClient: $apiClient,
|
||||
passwordHasher: $passwordHasher,
|
||||
validator: $validator,
|
||||
expectFlush: false,
|
||||
);
|
||||
|
||||
$this->expectException(CustomUserMessageAuthenticationException::class);
|
||||
|
||||
$authenticator->authenticate($this->createRequest('[email protected]', 'secret'));
|
||||
}
|
||||
|
||||
public function testAuthenticateBootstrapsMissingUserFromBpn(): void
|
||||
@@ -119,19 +263,20 @@ class BpnAuthenticatorTest extends TestCase
|
||||
->with(self::isInstanceOf(User::class), $password)
|
||||
->willReturn('local-hash');
|
||||
|
||||
$completenessChecker = $this->createMock(ProfileCompletenessChecker::class);
|
||||
$completenessChecker
|
||||
$validator = $this->createMock(ValidatorInterface::class);
|
||||
$validator
|
||||
->expects(self::once())
|
||||
->method('isComplete')
|
||||
->with($personalData)
|
||||
->willReturn(true);
|
||||
->method('validate')
|
||||
->with($personalData, null, ['personal_data'])
|
||||
->willReturn(new ConstraintViolationList());
|
||||
$userBootstrapper = new UserBootstrapper();
|
||||
|
||||
$persistedUser = null;
|
||||
$repository = $this->createMock(EntityRepository::class);
|
||||
$repository = $this->createMock(UserRepository::class);
|
||||
$repository
|
||||
->expects(self::once())
|
||||
->method('findOneBy')
|
||||
->with(['email' => $email])
|
||||
->method('findOneByNormalizedEmail')
|
||||
->with($email)
|
||||
->willReturn(null);
|
||||
|
||||
$entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
@@ -155,8 +300,9 @@ class BpnAuthenticatorTest extends TestCase
|
||||
$apiClient,
|
||||
$entityManager,
|
||||
$this->createMock(Crypt::class),
|
||||
$completenessChecker,
|
||||
$passwordHasher,
|
||||
$validator,
|
||||
$userBootstrapper,
|
||||
$this->createMock(LoggerInterface::class),
|
||||
);
|
||||
|
||||
@@ -172,19 +318,108 @@ class BpnAuthenticatorTest extends TestCase
|
||||
self::assertTrue($persistedUser->isProfileComplete());
|
||||
}
|
||||
|
||||
public function testAuthenticatePreservesNullBpnIdsWhenBootstrappingMissingUser(): void
|
||||
{
|
||||
$email = '[email protected]';
|
||||
$password = 'secret';
|
||||
|
||||
$personalData = new PersonalData();
|
||||
$personalData->addressId = null;
|
||||
$personalData->personId = null;
|
||||
|
||||
$crmAttributes = new CrmAttributes();
|
||||
|
||||
$apiClient = $this->createMock(ApiClient::class);
|
||||
$apiClient->expects(self::once())
|
||||
->method('getPersonalDataWithPassword')
|
||||
->with($email, $password)
|
||||
->willReturn($personalData);
|
||||
$apiClient->expects(self::once())
|
||||
->method('getCrmAttributesWithPassword')
|
||||
->with($email, $password)
|
||||
->willReturn($crmAttributes);
|
||||
|
||||
$passwordHasher = $this->createMock(UserPasswordHasherInterface::class);
|
||||
$passwordHasher
|
||||
->expects(self::once())
|
||||
->method('hashPassword')
|
||||
->with(self::isInstanceOf(User::class), $password)
|
||||
->willReturn('local-hash');
|
||||
|
||||
$validator = $this->createMock(ValidatorInterface::class);
|
||||
$validator
|
||||
->expects(self::once())
|
||||
->method('validate')
|
||||
->with($personalData, null, ['personal_data'])
|
||||
->willReturn(new ConstraintViolationList());
|
||||
|
||||
$persistedUser = null;
|
||||
$repository = $this->createMock(UserRepository::class);
|
||||
$repository
|
||||
->expects(self::once())
|
||||
->method('findOneByNormalizedEmail')
|
||||
->with($email)
|
||||
->willReturn(null);
|
||||
|
||||
$entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
$entityManager
|
||||
->method('getRepository')
|
||||
->willReturn($repository);
|
||||
$entityManager
|
||||
->expects(self::once())
|
||||
->method('persist')
|
||||
->with(self::callback(static function (User $user) use (&$persistedUser): bool {
|
||||
$persistedUser = $user;
|
||||
|
||||
return true;
|
||||
}));
|
||||
$entityManager
|
||||
->expects(self::once())
|
||||
->method('flush');
|
||||
|
||||
$authenticator = new BpnAuthenticator(
|
||||
$this->createMock(UrlGeneratorInterface::class),
|
||||
$apiClient,
|
||||
$entityManager,
|
||||
$this->createMock(Crypt::class),
|
||||
$passwordHasher,
|
||||
$validator,
|
||||
new UserBootstrapper(),
|
||||
$this->createMock(LoggerInterface::class),
|
||||
);
|
||||
|
||||
$authenticator->authenticate($this->createRequest($email, $password));
|
||||
|
||||
self::assertInstanceOf(User::class, $persistedUser);
|
||||
self::assertNull($persistedUser->getAddressId());
|
||||
self::assertNull($persistedUser->getPersonId());
|
||||
}
|
||||
|
||||
private function createAuthenticator(
|
||||
?User $user = null,
|
||||
?ApiClient $apiClient = null,
|
||||
?Crypt $crypt = null,
|
||||
?ProfileCompletenessChecker $completenessChecker = null,
|
||||
?UserPasswordHasherInterface $passwordHasher = null,
|
||||
?ValidatorInterface $validator = null,
|
||||
?UserBootstrapper $userBootstrapper = null,
|
||||
bool $expectFlush = true,
|
||||
): BpnAuthenticator {
|
||||
$repository = $this->createMock(EntityRepository::class);
|
||||
$validatorProvided = null !== $validator;
|
||||
$passwordHasher ??= $this->createMock(UserPasswordHasherInterface::class);
|
||||
$validator ??= $this->createMock(ValidatorInterface::class);
|
||||
if (!$validatorProvided) {
|
||||
$validator
|
||||
->method('validate')
|
||||
->willReturn(new ConstraintViolationList());
|
||||
}
|
||||
$userBootstrapper ??= new UserBootstrapper();
|
||||
|
||||
$repository = $this->createMock(UserRepository::class);
|
||||
$repository
|
||||
->expects(self::once())
|
||||
->method('findOneBy')
|
||||
->with(self::callback(static function (array $criteria): bool {
|
||||
return isset($criteria['email']) && is_string($criteria['email']);
|
||||
->method('findOneByNormalizedEmail')
|
||||
->with(self::callback(static function (string $email): bool {
|
||||
return '' !== trim($email);
|
||||
}))
|
||||
->willReturn($user);
|
||||
|
||||
@@ -194,7 +429,7 @@ class BpnAuthenticatorTest extends TestCase
|
||||
->with(User::class)
|
||||
->willReturn($repository);
|
||||
$entityManager
|
||||
->expects(self::once())
|
||||
->expects($expectFlush ? self::once() : self::never())
|
||||
->method('flush');
|
||||
$entityManager
|
||||
->expects(null === $user ? self::once() : self::never())
|
||||
@@ -205,8 +440,9 @@ class BpnAuthenticatorTest extends TestCase
|
||||
$apiClient ?? $this->createMock(ApiClient::class),
|
||||
$entityManager,
|
||||
$crypt ?? $this->createMock(Crypt::class),
|
||||
$completenessChecker ?? $this->createMock(ProfileCompletenessChecker::class),
|
||||
$passwordHasher ?? $this->createMock(UserPasswordHasherInterface::class),
|
||||
$passwordHasher,
|
||||
$validator,
|
||||
$userBootstrapper,
|
||||
$this->createMock(LoggerInterface::class),
|
||||
);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user