Get login working

This commit is contained in:
2024-11-28 11:37:56 -05:00
parent 17b399aa3f
commit 2656d93208
18 changed files with 1577 additions and 15 deletions

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Controller;
use App\Entity\User;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Http\Attribute\CurrentUser;
class DefaultController extends AbstractController
{
#[Route('/dashboard', name: 'app_dashboard')]
public function dashboard(Request $request, #[CurrentUser()] ?User $user): Response
{
$this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
if (!$user->getCompany()) {
return $this->redirectToRoute('app_register_step', ['step' => RegistrationController::REGISTER_STEP_TWO]);
}
return $this->render(
'internal/dashboard.html.twig',
[
'user' => $user
]
);
}
}

View File

@@ -0,0 +1,157 @@
<?php
namespace App\Controller;
use App\DataTransferObject\CompanyDetailsDto;
use App\Entity\User;
use App\Enums\CaseLevel;
use App\Enums\JobType;
use App\Enums\RateType;
use App\Factory\CompanyFactory;
use App\Form\CompanyFormType;
use App\Form\RegistrationFormType;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Security\Http\Authentication\UserAuthenticatorInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Attribute\CurrentUser;
class RegistrationController extends AbstractController
{
public const REGISTER_STEP_ONE = 'admin';
public const REGISTER_STEP_TWO = 'company';
public function __construct(
private readonly CompanyFactory $companyFactory,
private readonly RequestStack $requestStack,
private readonly EntityManagerInterface $entityManager,
private readonly UserPasswordHasherInterface $userPasswordHasher,
private readonly UserAuthenticatorInterface $userAuthenticator
) {
}
#[Route('/register/{step}', name: 'app_register_step')]
public function registerStep(string $step, Request $request, #[CurrentUser] ?User $user): Response
{
$form = match($step) {
self::REGISTER_STEP_ONE => $this->createForm(RegistrationFormType::class),
self::REGISTER_STEP_TWO => $this->renderRegisterStepTwo(),
default => $this->redirectToRoute('app_register_step', ['step' => self::REGISTER_STEP_ONE]),
};
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
return match(true) {
$step === self::REGISTER_STEP_ONE => $this->handleRegisterStepOne($form, $request),
$step === self::REGISTER_STEP_TWO => $this->handleRegisterStepTwo($form, $user),
default => $this->redirectToRoute('app_register_step', ['step' => self::REGISTER_STEP_ONE]),
};
}
return $this->render(sprintf('registration/register-step-%s.html.twig', $step), [
'form' => $form,
'data' => $form->getData(),
'admin' => $user
]);
}
private function handleRegisterStepOne(FormInterface $form, Request $request): Response
{
$user = new User();
$form = $this->createForm(RegistrationFormType::class, $user);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
// @var string $plainPassword
$plainPassword = $form->get('plainPassword')->getData();
// encode the plain password
$user->setPassword(
$this->userPasswordHasher->hashPassword(
$user,
$plainPassword
)
);
$user->setJob(JobType::ADMIN);
$user->setRateType(RateType::FIXED);
$user->setRate('0.00');
$user->setRoles(['ROLE_ADMIN']);
$user->setLevel(CaseLevel::ADMIN);
// save user
$this->entityManager->persist($user);
$this->entityManager->flush();
return $this->redirectToRoute('app_dashboard');
}
return $this->redirectToRoute('app_register_step', ['step' => self::REGISTER_STEP_ONE]);
}
private function renderRegisterStepTwo(): FormInterface
{
$company = $this->requestStack->getSession()->get('register-form-step-two');
if (!$company instanceof CompanyDetailsDto) {
$company = new CompanyDetailsDto();
}
return $this->createForm(CompanyFormType::class, $company);
}
private function handleRegisterStepTwo(FormInterface $form, User $owner): Response
{
$company = $this->companyFactory->create($form->getData(), $owner);
$owner->setCompany($company);
$this->entityManager->persist($owner);
$this->entityManager->persist($company);
$this->entityManager->flush();
return $this->redirectToRoute('app_dashboard');
}
#[Route('/new-user', name: 'app_new_user')]
public function newUser(Request $request): Response
{
return $this->render('registration/new-user.html.twig');
}
#[Route('/add-user', name: 'app_add_user')]
public function addUser(Request $request, UserPasswordHasherInterface $userPasswordHasher, EntityManagerInterface $entityManager): Response
{
$user = new User();
$user->setUsername('new-user');
$user->setEmail('g6eK1@example.com');
$user->setName('New User');
$user->setPassword(
$this->userPasswordHasher->hashPassword(
$user,
'password'
)
);
$user->setJob(JobType::ADMIN);
$user->setRateType(RateType::FIXED);
$user->setRate('0.00');
$entityManager->persist($user);
$entityManager->flush();
return $this->redirectToRoute('dashboard');
}
#[Route('/register', name: 'app_register')]
public function register(): Response
{
return $this->redirectToRoute('app_register_step', ['step' => self::REGISTER_STEP_ONE]);
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
class SecurityController extends AbstractController
{
#[Route(path: '/', name: 'app_login')]
public function login(AuthenticationUtils $authenticationUtils): Response
{
if ($this->isGranted('IS_AUTHENTICATED_FULLY')) {
return $this->redirectToRoute('app_dashboard');
}
// get the login error if there is one
$error = $authenticationUtils->getLastAuthenticationError();
// last username entered by the user
$lastUsername = $authenticationUtils->getLastUsername();
return $this->render('security/login.html.twig', [
'last_username' => $lastUsername,
'error' => $error,
]);
}
#[Route(path: '/logout', name: 'app_logout')]
public function logout(): void
{
}
}

View File

@@ -0,0 +1,199 @@
<?php
namespace App\DataTransferObject;
class CompanyDetailsDto
{
public function __construct(
private ?string $name = null,
private ?string $address = null,
private ?string $email = null,
private ?string $phone = null,
private ?string $url = null,
private ?string $zip = null,
private ?string $city = null,
private ?string $state = null,
private ?string $owner = null,
) {
}
/**
* Get the value of name
*/
public function getName()
{
return $this->name;
}
/**
* Set the value of name
*
* @return self
*/
public function setName($name)
{
$this->name = $name;
return $this;
}
/**
* Get the value of address
*/
public function getAddress()
{
return $this->address;
}
/**
* Set the value of address
*
* @return self
*/
public function setAddress($address)
{
$this->address = $address;
return $this;
}
/**
* Get the value of email
*/
public function getEmail()
{
return $this->email;
}
/**
* Set the value of email
*
* @return self
*/
public function setEmail($email)
{
$this->email = $email;
return $this;
}
/**
* Get the value of phone
*/
public function getPhone()
{
return $this->phone;
}
/**
* Set the value of phone
*
* @return self
*/
public function setPhone($phone)
{
$this->phone = $phone;
return $this;
}
/**
* Get the value of url
*/
public function getUrl()
{
return $this->url;
}
/**
* Set the value of url
*
* @return self
*/
public function setUrl($url)
{
$this->url = $url;
return $this;
}
/**
* Get the value of zip
*/
public function getZip()
{
return $this->zip;
}
/**
* Set the value of zip
*
* @return self
*/
public function setZip($zip)
{
$this->zip = $zip;
return $this;
}
/**
* Get the value of city
*/
public function getCity()
{
return $this->city;
}
/**
* Set the value of city
*
* @return self
*/
public function setCity($city)
{
$this->city = $city;
return $this;
}
/**
* Get the value of state
*/
public function getState()
{
return $this->state;
}
/**
* Set the value of state
*
* @return self
*/
public function setState($state)
{
$this->state = $state;
return $this;
}
/**
* Get the value of owner
*/
public function getOwner()
{
return $this->owner;
}
/**
* Set the value of owner
*
* @return self
*/
public function setOwner($owner)
{
$this->owner = $owner;
return $this;
}
}

202
src/Entity/Company.php Normal file
View File

@@ -0,0 +1,202 @@
<?php
namespace App\Entity;
use App\Repository\CompanyRepository;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Component\Uid\Uuid;
#[ORM\Entity(repositoryClass: CompanyRepository::class)]
class Company
{
#[ORM\Id]
#[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
private ?Uuid $id = null;
#[ORM\Column(length: 255)]
private ?string $name = null;
#[ORM\Column(length: 255)]
private ?string $address = null;
#[ORM\Column(length: 255)]
private ?string $city = null;
#[ORM\Column(length: 10)]
private ?string $state = null;
#[ORM\Column(length: 15)]
private ?string $zip = null;
#[ORM\Column(length: 15)]
private ?string $phone = null;
#[ORM\Column(length: 64)]
private ?string $email = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $url = null;
/**
* @var Collection<int, User>
*/
#[ORM\OneToMany(targetEntity: User::class, mappedBy: 'company')]
private Collection $users;
#[ORM\OneToOne(cascade: ['persist', 'remove'])]
#[ORM\JoinColumn(nullable: false)]
private ?User $owner = null;
public function __construct()
{
$this->users = new ArrayCollection();
}
public function getId(): ?Uuid
{
return $this->id;
}
public function getName(): ?string
{
return $this->name;
}
public function setName(string $name): static
{
$this->name = $name;
return $this;
}
public function getAddress(): ?string
{
return $this->address;
}
public function setAddress(string $address): static
{
$this->address = $address;
return $this;
}
public function getCity(): ?string
{
return $this->city;
}
public function setCity(string $city): static
{
$this->city = $city;
return $this;
}
public function getState(): ?string
{
return $this->state;
}
public function setState(string $state): static
{
$this->state = $state;
return $this;
}
public function getZip(): ?string
{
return $this->zip;
}
public function setZip(string $zip): static
{
$this->zip = $zip;
return $this;
}
public function getPhone(): ?string
{
return $this->phone;
}
public function setPhone(string $phone): static
{
$this->phone = $phone;
return $this;
}
public function getEmail(): ?string
{
return $this->email;
}
public function setEmail(string $email): static
{
$this->email = $email;
return $this;
}
public function getUrl(): ?string
{
return $this->url;
}
public function setUrl(?string $url): static
{
$this->url = $url;
return $this;
}
/**
* @return Collection<int, User>
*/
public function getUsers(): Collection
{
return $this->users;
}
public function addUser(User $user): static
{
if (!$this->users->contains($user)) {
$this->users->add($user);
$user->setCompany($this);
}
return $this;
}
public function removeUser(User $user): static
{
if ($this->users->removeElement($user)) {
// set the owning side to null (unless already changed)
if ($user->getCompany() === $this) {
$user->setCompany(null);
}
}
return $this;
}
public function getOwner(): ?User
{
return $this->owner;
}
public function setOwner(User $owner): static
{
$this->owner = $owner;
return $this;
}
}

267
src/Entity/User.php Normal file
View File

@@ -0,0 +1,267 @@
<?php
namespace App\Entity;
use App\Repository\UserRepository;
use App\Enums\RateType;
use App\Enums\JobType;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
use Symfony\Bridge\Doctrine\Types\UuidType;
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Uid\Uuid;
use \App\Enums\CaseLevel;
#[ORM\Entity(repositoryClass: UserRepository::class)]
#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_USERNAME', fields: ['username'])]
#[UniqueEntity(fields: ['username'], message: 'There is already an account with this username')]
class User implements UserInterface, PasswordAuthenticatedUserInterface
{
#[ORM\Id]
#[ORM\Column(type: UuidType::NAME, unique: true)]
#[ORM\GeneratedValue(strategy: 'CUSTOM')]
#[ORM\CustomIdGenerator(class: 'doctrine.uuid_generator')]
private ?Uuid $id = null;
#[ORM\Column(length: 45)]
private ?string $username = null;
/**
* @var list<string> The user roles
*/
#[ORM\Column]
private array $roles = [];
/**
* @var string The hashed password
*/
#[ORM\Column]
private ?string $password = null;
#[ORM\Column(length: 45)]
private ?string $name = null;
#[ORM\Column(length: 45)]
private ?string $email = null;
#[ORM\Column(length: 45)]
private ?JobType $job = null;
#[ORM\Column(enumType: RateType::class)]
private ?RateType $rateType = null;
#[ORM\Column(type: Types::DECIMAL, precision: 6, scale: 2)]
private ?string $rate = null;
/**
* @var Collection<int, UserCase>
*/
#[ORM\OneToMany(targetEntity: UserCase::class, mappedBy: 'userId')]
private Collection $userCases;
#[ORM\ManyToOne(inversedBy: 'users')]
#[ORM\JoinColumn(nullable: true)]
private ?Company $company = null;
#[ORM\Column(enumType: CaseLevel::class)]
private ?CaseLevel $level = null;
public function __construct()
{
$this->userCases = new ArrayCollection();
}
public function getId(): ?Uuid
{
return $this->id;
}
public function getUsername(): ?string
{
return $this->username;
}
public function setUsername(string $username): static
{
$this->username = $username;
return $this;
}
/**
* A visual identifier that represents this user.
*
* @see UserInterface
*/
public function getUserIdentifier(): string
{
return (string) $this->username;
}
/**
* @see UserInterface
*
* @return list<string>
*/
public function getRoles(): array
{
$roles = $this->roles;
// guarantee every user at least has ROLE_USER
$roles[] = 'ROLE_USER';
return array_unique($roles);
}
/**
* @param list<string> $roles
*/
public function setRoles(array $roles): static
{
$this->roles = $roles;
return $this;
}
/**
* @see PasswordAuthenticatedUserInterface
*/
public function getPassword(): ?string
{
return $this->password;
}
public function setPassword(string $password): static
{
$this->password = $password;
return $this;
}
/**
* @see UserInterface
*/
public function eraseCredentials(): void
{
// If you store any temporary, sensitive data on the user, clear it here
// $this->plainPassword = null;
}
public function getName(): ?string
{
return $this->name;
}
public function setName(string $name): static
{
$this->name = $name;
return $this;
}
public function getEmail(): ?string
{
return $this->email;
}
public function setEmail(string $email): static
{
$this->email = $email;
return $this;
}
public function getJob(): ?JobType
{
return $this->job;
}
public function setJob(JobType $job): static
{
$this->job = $job;
return $this;
}
public function getRateType(): ?RateType
{
return $this->rateType;
}
public function setRateType(RateType $rateType): static
{
$this->rateType = $rateType;
return $this;
}
public function getRate(): ?string
{
return $this->rate;
}
public function setRate(string $rate): static
{
$this->rate = $rate;
return $this;
}
/**
* @return Collection<int, UserCase>
*/
public function getUserCases(): Collection
{
return $this->userCases;
}
public function addUserCase(UserCase $userCase): static
{
if (!$this->userCases->contains($userCase)) {
$this->userCases->add($userCase);
$userCase->setUserId($this);
}
return $this;
}
public function removeUserCase(UserCase $userCase): static
{
if ($this->userCases->removeElement($userCase)) {
// set the owning side to null (unless already changed)
if ($userCase->getUserId() === $this) {
$userCase->setUserId(null);
}
}
return $this;
}
public function getCompany(): ?Company
{
return $this->company;
}
public function setCompany(?Company $company): static
{
$this->company = $company;
return $this;
}
public function getLevel(): ?CaseLevel
{
return $this->level;
}
public function setLevel(CaseLevel $level): static
{
$this->level = $level;
return $this;
}
}

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Factory;
use App\DataTransferObject\CompanyDetailsDto;
use App\Entity\Company;
use App\Entity\User;
final class CompanyFactory
{
public function create(
CompanyDetailsDto $companyDetails,
User $ownerDetails,
) : Company {
$company = new Company();
$company->setName($companyDetails->getName());
$company->setAddress($companyDetails->getAddress());
$company->setCity($companyDetails->getCity());
$company->setState($companyDetails->getState());
$company->setZip($companyDetails->getZip());
$company->setPhone($companyDetails->getPhone());
$company->setEmail($companyDetails->getEmail());
$company->setUrl($companyDetails->getUrl());
$company->setOwner($ownerDetails);
return $company;
}
}

View File

@@ -0,0 +1,55 @@
<?php
namespace App\Form;
use App\DataTransferObject\CompanyDetailsDto;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
class CompanyFormType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('name', TextType::class, [
'required' => true,
'attr' => [
'placeholder' => 'Company Name',
'class' => 'form-control',
'autofocus' => true,
'autocomplete' => 'off'
]
])
->add('address', TextType::class, [
'required' => true
])
->add('city', TextType::class, [
'required' => true
])
->add('state', TextType::class, [
'required' => true
])
->add('zip', TextType::class, [
'required' => true
])
->add('phone', TextType::class, [
'required' => true
])
->add('email', EmailType::class, [
'required' => true
])
->add('url', UrlType::class)
;
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => CompanyDetailsDto::class,
]);
}
}

View File

@@ -0,0 +1,47 @@
<?php
namespace App\Form;
use App\Entity\User;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
class RegistrationFormType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder
->add('name')
->add('username')
->add('email')
->add('plainPassword', PasswordType::class, [
// instead of being set onto the object directly,
// this is read and encoded in the controller
'mapped' => false,
'attr' => ['autocomplete' => 'new-password'],
'constraints' => [
new NotBlank([
'message' => 'Please enter a password',
]),
new Length([
'min' => 6,
'minMessage' => 'Your password should be at least {{ limit }} characters',
// max length allowed by Symfony for security reasons
'max' => 4096,
]),
],
])
;
}
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'data_class' => User::class,
]);
}
}

View File

@@ -0,0 +1,43 @@
<?php
namespace App\Repository;
use App\Entity\Company;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<Company>
*/
class CompanyRepository extends ServiceEntityRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, Company::class);
}
// /**
// * @return Company[] Returns an array of Company objects
// */
// public function findByExampleField($value): array
// {
// return $this->createQueryBuilder('c')
// ->andWhere('c.exampleField = :val')
// ->setParameter('val', $value)
// ->orderBy('c.id', 'ASC')
// ->setMaxResults(10)
// ->getQuery()
// ->getResult()
// ;
// }
// public function findOneBySomeField($value): ?Company
// {
// return $this->createQueryBuilder('c')
// ->andWhere('c.exampleField = :val')
// ->setParameter('val', $value)
// ->getQuery()
// ->getOneOrNullResult()
// ;
// }
}

View File

@@ -0,0 +1,60 @@
<?php
namespace App\Repository;
use App\Entity\User;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
/**
* @extends ServiceEntityRepository<User>
*/
class UserRepository extends ServiceEntityRepository implements PasswordUpgraderInterface
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, User::class);
}
/**
* Used to upgrade (rehash) the user's password automatically over time.
*/
public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
{
if (!$user instanceof User) {
throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', $user::class));
}
$user->setPassword($newHashedPassword);
$this->getEntityManager()->persist($user);
$this->getEntityManager()->flush();
}
// /**
// * @return User[] Returns an array of User objects
// */
// public function findByExampleField($value): array
// {
// return $this->createQueryBuilder('u')
// ->andWhere('u.exampleField = :val')
// ->setParameter('val', $value)
// ->orderBy('u.id', 'ASC')
// ->setMaxResults(10)
// ->getQuery()
// ->getResult()
// ;
// }
// public function findOneBySomeField($value): ?User
// {
// return $this->createQueryBuilder('u')
// ->andWhere('u.exampleField = :val')
// ->setParameter('val', $value)
// ->getQuery()
// ->getOneOrNullResult()
// ;
// }
}