Commit e94ae822 authored by Anthony Gautreau's avatar Anthony Gautreau
Browse files

Correction des classes et interfaces pour l'intégration unicaen/privilege

parent 71ca3079

api/src/Entity/AbstractRole.php

+6 −1
Changes for api/src/Entity/AbstractRole.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Unicaen\Utilisateur\Entity; 


use Doctrine\Common\Collections\Collection;

use Doctrine\ORM\Mapping as ORM;

use Unicaen\Utilisateur\Model\RoleInterface;

use Unicaen\Utilisateur\Model\UnicaenUserInterface;

use Unicaen\Privilege\Model\PrivilegeInterface;
@@ -30,8 +31,12 @@ abstract class AbstractRole implements RoleInterface 
    protected bool $accessibleExterieur = true;

    protected bool $displayed = true;



    #[ORM\ManyToMany(targetEntity: UnicaenUserInterface::class, mappedBy: 'roles')]

    protected Collection $users;

//    protected Collection $privileges;



    #[ORM\ManyToMany(targetEntity: PrivilegeInterface::class, inversedBy: 'roles')]

    #[ORM\JoinTable(name: 'unicaen_privilege_role_privilege')]

    protected Collection $privileges;



    public function getId() : ?int

    {

api/src/Entity/AbstractUser.php

+1 −12
Changes for api/src/Entity/AbstractUser.php: 1 added line, 12 removed lines.
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ use Symfony\Component\Serializer\Annotation\Groups; 
use Symfony\Component\Validator\Constraints as Assert;

use Unicaen\Utilisateur\Dto\UtilisateurInscriptionInput;

use Unicaen\Utilisateur\Dto\UtilisateurMeResource;

use Unicaen\Utilisateur\Model\RoleInterface;

use Unicaen\Utilisateur\Model\UnicaenUserInterface;

use Unicaen\Utilisateur\Repository\UtilisateurRepository;

use Unicaen\Utilisateur\State\UtilisateurInscriptionProcessor;
@@ -165,18 +166,6 @@ abstract class AbstractUser implements UnicaenUserInterface, PasswordAuthenticat 
        // $this->plainPassword = null;

    }



    public function getTypeConnexion(): ?string

    {

        return $this->typeConnexion;

    }



    public function setTypeConnexion(string $typeConnexion): static

    {

        $this->typeConnexion = $typeConnexion;



        return $this;

    }



    /**

     * Symfony a besoin que la methode getRoles() retourne un tableau de strings.

     *

api/src/Entity/User.php

+1 −1
Changes for api/src/Entity/User.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


namespace Unicaen\Utilisateur\Entity;



use Unicaen\Utilisateur\Model\Role;

use Unicaen\Utilisateur\Model\RoleInterface;

use Unicaen\Utilisateur\Repository\UtilisateurRepository;

use Doctrine\ORM\Mapping as ORM;

#[ORM\Entity(repositoryClass: UtilisateurRepository::class)]

api/src/Model/RoleInterface.php

+1 −1
Changes for api/src/Model/RoleInterface.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<?php



namespace Unicaen\Utilisateur\Entity;

namespace Unicaen\Utilisateur\Model;



use Doctrine\Common\Collections\Collection;

use Unicaen\Utilisateur\Model\UnicaenUserInterface;

api/src/Model/UnicaenUserInterface.php

+0 −1
Changes for api/src/Model/UnicaenUserInterface.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
namespace Unicaen\Utilisateur\Model;



use Symfony\Component\Security\Core\User\UserInterface;

use Unicaen\Utilisateur\Entity\RoleInterface;



interface UnicaenUserInterface extends UserInterface

{