Piou-piou / RibsAdminBundle

Form/Type/AutocompleteType.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
                 ],
                 "mapped" => false
             ])
-            ->add($options["autocomplete_name"]."_id", HiddenType::class, [
+            ->add($options["autocomplete_name"] . "_id", HiddenType::class, [
                 "mapped" => false
             ]);
     }

Indentation +23 added lines, -23 removed lines

@@ -10,28 +10,28 @@
 
 class AutocompleteType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add($options["autocomplete_name"], TextType::class, [
-                "label" => false,
-                "attr" => [
-                    "class" => "input-autocomplete",
-                    "data-url" => $options["data_url"],
-                    "autocomplete" => "off"
-                ],
-                "mapped" => false
-            ])
-            ->add($options["autocomplete_name"]."_id", HiddenType::class, [
-                "mapped" => false
-            ]);
-    }
+				public function buildForm(FormBuilderInterface $builder, array $options)
+				{
+								$builder
+												->add($options["autocomplete_name"], TextType::class, [
+																"label" => false,
+																"attr" => [
+																				"class" => "input-autocomplete",
+																				"data-url" => $options["data_url"],
+																				"autocomplete" => "off"
+																],
+																"mapped" => false
+												])
+												->add($options["autocomplete_name"]."_id", HiddenType::class, [
+																"mapped" => false
+												]);
+				}
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            "autocomplete_name" => null,
-            "data_url" => null,
-        ]);
-    }
+				public function configureOptions(OptionsResolver $resolver)
+				{
+								$resolver->setDefaults([
+												"autocomplete_name" => null,
+												"data_url" => null,
+								]);
+				}
 }

Entity/AccountToken.php

Indentation +150 added lines, -150 removed lines

@@ -15,154 +15,154 @@
  */
 class AccountToken
 {
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $token;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $endToken;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $userAgent;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $ip;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
-     * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
-     */
-    protected $account;
-
-    /**
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param mixed $id
-     * @return AccountToken
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param mixed $token
-     * @return AccountToken
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getEndToken()
-    {
-        return $this->endToken;
-    }
-
-    /**
-     * @param mixed $endToken
-     * @return AccountToken
-     */
-    public function setEndToken($endToken)
-    {
-        $this->endToken = $endToken;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * @param mixed $userAgent
-     * @return AccountToken
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = $userAgent;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * @param mixed $ip
-     * @return AccountToken
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-
-        return $this;
-    }
-
-    /**
-     * Set Account entity (many to one).
-     *
-     * @param Account $account
-     * @return AccountToken
-     */
-    public function setAccount(Account $account = null)
-    {
-        $this->account = $account;
-
-        return $this;
-    }
-
-    /**
-     * Get Account entity (many to one).
-     *
-     * @return Account
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
+				/**
+				 * @ORM\Id
+				 * @ORM\Column(type="integer")
+				 * @ORM\GeneratedValue(strategy="AUTO")
+				 */
+				protected $id;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $token;
+
+				/**
+				 * @ORM\Column(type="datetime", nullable=true)
+				 */
+				protected $endToken;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $userAgent;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $ip;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
+				 * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
+				 */
+				protected $account;
+
+				/**
+				 * @return mixed
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param mixed $id
+				 * @return AccountToken
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getToken()
+				{
+								return $this->token;
+				}
+
+				/**
+				 * @param mixed $token
+				 * @return AccountToken
+				 */
+				public function setToken($token)
+				{
+								$this->token = $token;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getEndToken()
+				{
+								return $this->endToken;
+				}
+
+				/**
+				 * @param mixed $endToken
+				 * @return AccountToken
+				 */
+				public function setEndToken($endToken)
+				{
+								$this->endToken = $endToken;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getUserAgent()
+				{
+								return $this->userAgent;
+				}
+
+				/**
+				 * @param mixed $userAgent
+				 * @return AccountToken
+				 */
+				public function setUserAgent($userAgent)
+				{
+								$this->userAgent = $userAgent;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getIp()
+				{
+								return $this->ip;
+				}
+
+				/**
+				 * @param mixed $ip
+				 * @return AccountToken
+				 */
+				public function setIp($ip)
+				{
+								$this->ip = $ip;
+
+								return $this;
+				}
+
+				/**
+				 * Set Account entity (many to one).
+				 *
+				 * @param Account $account
+				 * @return AccountToken
+				 */
+				public function setAccount(Account $account = null)
+				{
+								$this->account = $account;
+
+								return $this;
+				}
+
+				/**
+				 * Get Account entity (many to one).
+				 *
+				 * @return Account
+				 */
+				public function getAccount()
+				{
+								return $this->account;
+				}
 }

Repository/AccountTokenRepository.php

Indentation +14 added lines, -14 removed lines

@@ -8,23 +8,23 @@
 
 class AccountTokenRepository extends EntityRepository
 {
-    /**
-     * method to find UserToken to archive
-     * @param int $max_inactivation_days
-     * @return mixed
-     * @throws Exception
-     */
-    public function findByExpiredToken(int $max_inactivation_days)
-    {
-        $now = new \DateTime();
-        $now->sub(new \DateInterval("P" . $max_inactivation_days . "D"));
+				/**
+				 * method to find UserToken to archive
+				 * @param int $max_inactivation_days
+				 * @return mixed
+				 * @throws Exception
+				 */
+				public function findByExpiredToken(int $max_inactivation_days)
+				{
+								$now = new \DateTime();
+								$now->sub(new \DateInterval("P" . $max_inactivation_days . "D"));
 
-        $query = $this->getEntityManager()->createQuery("SELECT u FROM App:AccountToken u WHERE
+								$query = $this->getEntityManager()->createQuery("SELECT u FROM App:AccountToken u WHERE
 			u.endToken < :max_inactivation_days
 		");
 
-        $query->setParameter("max_inactivation_days", $now, Type::DATETIME);
+								$query->setParameter("max_inactivation_days", $now, Type::DATETIME);
 
-        return $query->getResult();
-    }
+								return $query->getResult();
+				}
 }

Controller/ApiController.php

Indentation +33 added lines, -33 removed lines

@@ -13,16 +13,16 @@ 
 
 class ApiController extends AbstractController
 {
-    /**
-     * this method is user to authenticate a user by an api request
-     * if success it return a token api that expire in 20 minutes
-     * @Route("/api/users/authenticate", name="ribsadmin_api_login", methods={"POST"})
-     * @param Request $request
-     * @param Api $api
-     * @param EncoderFactoryInterface $encoder
-     * @return JsonResponse
-     * @throws \Exception
-     */
+				/**
+				 * this method is user to authenticate a user by an api request
+				 * if success it return a token api that expire in 20 minutes
+				 * @Route("/api/users/authenticate", name="ribsadmin_api_login", methods={"POST"})
+				 * @param Request $request
+				 * @param Api $api
+				 * @param EncoderFactoryInterface $encoder
+				 * @return JsonResponse
+				 * @throws \Exception
+				 */
 	public function login(Request $request, Api $api, EncoderFactoryInterface $encoder): JsonResponse
 	{
 		$em = $this->getDoctrine()->getManager();
@@ -55,29 +55,29 @@ 
 		]);
 	}
 
-    /**
-     * method that test if user steel logged and send token or new token if it was expired
-     * @Route("/api/users/test-token", name="ribsadmin_api_test_token", methods={"POST"})
-     * @param Request $request
-     * @param Api $api
-     * @param Session $session
-     * @return JsonResponse
-     * @throws \Exception
-     */
-    public function testUserToken(Request $request, Api $api, Session $session): JsonResponse
-    {
-        $test_logged = $api->userIslogged($request->get("infos"), $request->get("token"));
+				/**
+				 * method that test if user steel logged and send token or new token if it was expired
+				 * @Route("/api/users/test-token", name="ribsadmin_api_test_token", methods={"POST"})
+				 * @param Request $request
+				 * @param Api $api
+				 * @param Session $session
+				 * @return JsonResponse
+				 * @throws \Exception
+				 */
+				public function testUserToken(Request $request, Api $api, Session $session): JsonResponse
+				{
+								$test_logged = $api->userIslogged($request->get("infos"), $request->get("token"));
 
-        if ($test_logged === false) {
-            return new JsonResponse([
-                "success" => $test_logged,
-                "error_message" => "Votre compte a été archivé, vous ne pouvez plus vous connecter",
-            ]);
-        }
+								if ($test_logged === false) {
+												return new JsonResponse([
+																"success" => $test_logged,
+																"error_message" => "Votre compte a été archivé, vous ne pouvez plus vous connecter",
+												]);
+								}
 
-        return new JsonResponse([
-            "success" => $test_logged,
-            "token" => $api->getToken($session->get("account")),
-        ]);
-    }
+								return new JsonResponse([
+												"success" => $test_logged,
+												"token" => $api->getToken($session->get("account")),
+								]);
+				}
 }

Service/Api.php

Indentation +188 added lines, -188 removed lines

@@ -23,192 +23,192 @@
 
 class Api
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    /**
-     * @var EntityManagerInterface
-     */
-    private $em;
-
-    /**
-     * @var SessionInterface
-     */
-    private $session;
-
-    /**
-     * @var Account
-     */
-    private $account;
-
-    /**
-     * @var Request|null
-     */
-    private $request;
-
-    /**
-     * Api constructor.
-     * @param ContainerInterface $container
-     * @param EntityManagerInterface $em
-     * @param SessionInterface $session
-     * @param RequestStack $request_stack
-     */
-    public function __construct(ContainerInterface $container, EntityManagerInterface $em, SessionInterface $session, RequestStack $request_stack)
-    {
-        $this->container = $container;
-        $this->em = $em;
-        $this->session = $session;
-        $this->request = $request_stack->getCurrentRequest();
-    }
-
-    /**
-     * this method is used to test jwt and if the account is ok else send false
-     * @param string $infos_jwt
-     * @param string $token
-     * @return bool
-     * @throws Exception
-     */
-    public function userIslogged(string $infos_jwt, string $token): bool
-    {
-        $em = $this->em;
-        $jwt = Jwt::decode($infos_jwt, $token);
-
-        if ($jwt === false) {
-            return false;
-        }
-
-        $account_token_search = [
-            "token" => $token,
-            "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            "ip" => $this->request->server->get("REMOTE_ADDR")
-        ];
-        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
-            $account_token_search = [
-                "token" => $token,
-                "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            ];
-        }
-
-        $account_token = $em->getRepository(AccountToken::class)->findOneBy($account_token_search);
-
-        if (!$account_token) {
-            return false;
-        }
-
-        $this->account = $em->getRepository(Account::class)->findOneBy([
-            "id" => $account_token->getAccount()->getId(),
-            "isActive" => true,
-        ]);
-
-        if (!$this->account) {
-            return false;
-        }
-
-        $this->account->setLastConnection(new \DateTime());
-        $em->persist($this->account);
-        $em->flush();
-
-        $this->getToken($this->account);
-        $this->session->set("jwt_infos", $jwt);
-        $this->session->set("account", $this->account);
-        $this->session->set("account_token", $account_token);
-
-        return true;
-    }
-
-    /**
-     * method that return the token for a account
-     * @param Account $account
-     * @return string
-     * @throws Exception
-     */
-    public function getToken(Account $account): string
-    {
-        $account_token = $this->em->getRepository(AccountToken::class)->findOneBy([
-            "account" => $account,
-            "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
-            "ip" => $this->request->server->get("REMOTE_ADDR")
-        ]);
-
-        $token = $account_token ? $account_token->getToken() : null;
-        $now = new \DateTime();
-
-        if ($token === null || $account_token->getEndToken() < $now) {
-            return $this->setToken($account, $account_token);
-        }
-
-        return $token;
-    }
-
-    /**
-     * @param Account $account
-     * @param $account_token
-     * @return string
-     * method that set a token for the account
-     * @throws Exception
-     */
-    public function setToken(Account $account, $account_token): string
-    {
-        $token = $this->generateToken();
-        $now = new \DateTime();
-        $end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
-
-        if (!$account_token) {
-            $account_token = new AccountToken();
-        }
-
-        $account_token->setToken($token);
-        $account_token->setUserAgent($this->request->server->get("HTTP_USER_AGENT"));
-        $account_token->setIp($this->request->server->get("REMOTE_ADDR"));
-        $account_token->setEndToken($end_token);
-        $account_token->setAccount($account);
-        $this->em->persist($account_token);
-        $this->em->flush();
-
-        $this->account = $account;
-        $this->session->set("account", $this->account);
-        $this->session->set("account_token", $account_token);
-
-        return $token;
-    }
-
-    /**
-     * generate a token for api
-     * @param int $length
-     * @return string
-     */
-    public function generateToken(int $length = 200): string
-    {
-        $string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
-        $token = "";
-        srand((double)microtime() * 1000000);
-        for ($i = 0; $i < $length; $i++) {
-            $token .= $string[rand() % strlen($string)];
-        }
-
-        return $token;
-    }
-
-    /**
-     * method that encode an object to a json
-     * @param $object
-     * @param string $type
-     * @return mixed
-     * @throws ExceptionInterface
-     * @throws AnnotationException
-     */
-    public function serializeObject($object, $type = "json")
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
-
-        return $serializer->normalize($object, $type, [
-            'circular_reference_handler' => function ($object) {
-                return $object->getId();
-            },
-            'groups' => 'main'
-        ]);
-    }
+				/**
+				 * @var ContainerInterface
+				 */
+				private $container;
+
+				/**
+				 * @var EntityManagerInterface
+				 */
+				private $em;
+
+				/**
+				 * @var SessionInterface
+				 */
+				private $session;
+
+				/**
+				 * @var Account
+				 */
+				private $account;
+
+				/**
+				 * @var Request|null
+				 */
+				private $request;
+
+				/**
+				 * Api constructor.
+				 * @param ContainerInterface $container
+				 * @param EntityManagerInterface $em
+				 * @param SessionInterface $session
+				 * @param RequestStack $request_stack
+				 */
+				public function __construct(ContainerInterface $container, EntityManagerInterface $em, SessionInterface $session, RequestStack $request_stack)
+				{
+								$this->container = $container;
+								$this->em = $em;
+								$this->session = $session;
+								$this->request = $request_stack->getCurrentRequest();
+				}
+
+				/**
+				 * this method is used to test jwt and if the account is ok else send false
+				 * @param string $infos_jwt
+				 * @param string $token
+				 * @return bool
+				 * @throws Exception
+				 */
+				public function userIslogged(string $infos_jwt, string $token): bool
+				{
+								$em = $this->em;
+								$jwt = Jwt::decode($infos_jwt, $token);
+
+								if ($jwt === false) {
+												return false;
+								}
+
+								$account_token_search = [
+												"token" => $token,
+												"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												"ip" => $this->request->server->get("REMOTE_ADDR")
+								];
+								if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
+												$account_token_search = [
+																"token" => $token,
+																"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												];
+								}
+
+								$account_token = $em->getRepository(AccountToken::class)->findOneBy($account_token_search);
+
+								if (!$account_token) {
+												return false;
+								}
+
+								$this->account = $em->getRepository(Account::class)->findOneBy([
+												"id" => $account_token->getAccount()->getId(),
+												"isActive" => true,
+								]);
+
+								if (!$this->account) {
+												return false;
+								}
+
+								$this->account->setLastConnection(new \DateTime());
+								$em->persist($this->account);
+								$em->flush();
+
+								$this->getToken($this->account);
+								$this->session->set("jwt_infos", $jwt);
+								$this->session->set("account", $this->account);
+								$this->session->set("account_token", $account_token);
+
+								return true;
+				}
+
+				/**
+				 * method that return the token for a account
+				 * @param Account $account
+				 * @return string
+				 * @throws Exception
+				 */
+				public function getToken(Account $account): string
+				{
+								$account_token = $this->em->getRepository(AccountToken::class)->findOneBy([
+												"account" => $account,
+												"userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
+												"ip" => $this->request->server->get("REMOTE_ADDR")
+								]);
+
+								$token = $account_token ? $account_token->getToken() : null;
+								$now = new \DateTime();
+
+								if ($token === null || $account_token->getEndToken() < $now) {
+												return $this->setToken($account, $account_token);
+								}
+
+								return $token;
+				}
+
+				/**
+				 * @param Account $account
+				 * @param $account_token
+				 * @return string
+				 * method that set a token for the account
+				 * @throws Exception
+				 */
+				public function setToken(Account $account, $account_token): string
+				{
+								$token = $this->generateToken();
+								$now = new \DateTime();
+								$end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
+
+								if (!$account_token) {
+												$account_token = new AccountToken();
+								}
+
+								$account_token->setToken($token);
+								$account_token->setUserAgent($this->request->server->get("HTTP_USER_AGENT"));
+								$account_token->setIp($this->request->server->get("REMOTE_ADDR"));
+								$account_token->setEndToken($end_token);
+								$account_token->setAccount($account);
+								$this->em->persist($account_token);
+								$this->em->flush();
+
+								$this->account = $account;
+								$this->session->set("account", $this->account);
+								$this->session->set("account_token", $account_token);
+
+								return $token;
+				}
+
+				/**
+				 * generate a token for api
+				 * @param int $length
+				 * @return string
+				 */
+				public function generateToken(int $length = 200): string
+				{
+								$string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
+								$token = "";
+								srand((double)microtime() * 1000000);
+								for ($i = 0; $i < $length; $i++) {
+												$token .= $string[rand() % strlen($string)];
+								}
+
+								return $token;
+				}
+
+				/**
+				 * method that encode an object to a json
+				 * @param $object
+				 * @param string $type
+				 * @return mixed
+				 * @throws ExceptionInterface
+				 * @throws AnnotationException
+				 */
+				public function serializeObject($object, $type = "json")
+				{
+								$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
+								$serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
+
+								return $serializer->normalize($object, $type, [
+												'circular_reference_handler' => function ($object) {
+																return $object->getId();
+												},
+												'groups' => 'main'
+								]);
+				}
 }

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
             "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
             "ip" => $this->request->server->get("REMOTE_ADDR")
         ];
-        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i',$this->request->server->get("HTTP_USER_AGENT"))||preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i',substr($this->request->server->get("HTTP_USER_AGENT"),0,4))) {
+        if (preg_match('/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i', $this->request->server->get("HTTP_USER_AGENT")) || preg_match('/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i', substr($this->request->server->get("HTTP_USER_AGENT"), 0, 4))) {
             $account_token_search = [
                 "token" => $token,
                 "userAgent" => $this->request->server->get("HTTP_USER_AGENT"),
@@ -153,7 +153,7 @@ 
     {
         $token = $this->generateToken();
         $now = new \DateTime();
-        $end_token = $now->add(new \DateInterval("PT".$this->container->getParameter("ribs_admin")["api_token_duration"]."M"));
+        $end_token = $now->add(new \DateInterval("PT" . $this->container->getParameter("ribs_admin")["api_token_duration"] . "M"));
 
         if (!$account_token) {
             $account_token = new AccountToken();
@@ -183,7 +183,7 @@ 
     {
         $string = "abcdefghijklmnopqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789";
         $token = "";
-        srand((double)microtime() * 1000000);
+        srand((double) microtime() * 1000000);
         for ($i = 0; $i < $length; $i++) {
             $token .= $string[rand() % strlen($string)];
         }
@@ -205,7 +205,7 @@ 
         $serializer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer($classMetadataFactory)], [new XmlEncoder(), new JsonEncoder()]);
 
         return $serializer->normalize($object, $type, [
-            'circular_reference_handler' => function ($object) {
+            'circular_reference_handler' => function($object) {
                 return $object->getId();
             },
             'groups' => 'main'

EventListener/CreateUpdateAwareListener.php

Indentation +17 added lines, -17 removed lines

@@ -12,30 +12,30 @@
 	 */
 	private $user;
 
-    /**
-     * CreateUpdateAwareListener constructor.
-     * @param TokenStorage $tokenStorage
-     */
-    public function __construct(TokenStorage $tokenStorage)
+				/**
+				 * CreateUpdateAwareListener constructor.
+				 * @param TokenStorage $tokenStorage
+				 */
+				public function __construct(TokenStorage $tokenStorage)
 	{
-        $this->user = $tokenStorage->getToken()->getUser()->getUser();
+								$this->user = $tokenStorage->getToken()->getUser()->getUser();
 	}
 	
 	public function prePersist($entity)
 	{
 		if ($entity->getCreatedBy() === null) {
-            $entity->setCreatedAt(new \DateTime());
-            $entity->setCreatedBy($this->user);
+												$entity->setCreatedAt(new \DateTime());
+												$entity->setCreatedBy($this->user);
 		}
-        if ($entity->getUpdatedBy() === null) {
-            $entity->setUpdatedAt(new \DateTime());
-            $entity->setUpdatedBy($this->user);
-        }
+								if ($entity->getUpdatedBy() === null) {
+												$entity->setUpdatedAt(new \DateTime());
+												$entity->setUpdatedBy($this->user);
+								}
 	}
 
-    public function preUpdate($entity)
-    {
-        $entity->setUpdatedAt(new \DateTime());
-        $entity->setUpdatedBy($this->user);
-    }
+				public function preUpdate($entity)
+				{
+								$entity->setUpdatedAt(new \DateTime());
+								$entity->setUpdatedBy($this->user);
+				}
 }

Entity/Account.php

Indentation +127 added lines, -127 removed lines

@@ -44,16 +44,16 @@ 
 	 */
 	private $isActive;
 
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $last_connection;
+				/**
+				 * @ORM\Column(type="datetime", nullable=true)
+				 */
+				protected $last_connection;
 
-    /**
-     * @ORM\OneToMany(targetEntity="AccountToken", mappedBy="account")
-     * @ORM\JoinColumn(name="id", referencedColumnName="account_id", nullable=false)
-     */
-    protected $tokens;
+				/**
+				 * @ORM\OneToMany(targetEntity="AccountToken", mappedBy="account")
+				 * @ORM\JoinColumn(name="id", referencedColumnName="account_id", nullable=false)
+				 */
+				protected $tokens;
 	
 	/**
 	 * @var User
@@ -65,29 +65,29 @@ 
 	 */
 	private $user;
 
-    /**
-     * @ORM\Column(name="created_at", type="datetime", nullable=true)
-     */
-    protected $created_at;
+				/**
+				 * @ORM\Column(name="created_at", type="datetime", nullable=true)
+				 */
+				protected $created_at;
 
-    /**
-     * @ORM\Column(name="created_by", type="integer", nullable=false)
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
-     */
-    protected $created_by;
+				/**
+				 * @ORM\Column(name="created_by", type="integer", nullable=false)
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $created_by;
 
-    /**
-     * @ORM\Column(name="updated_at", type="datetime", nullable=true)
-     */
-    protected $updated_at;
+				/**
+				 * @ORM\Column(name="updated_at", type="datetime", nullable=true)
+				 */
+				protected $updated_at;
 
-    /**
-     * @ORM\Column(name="updated_by", type="integer", nullable=false)
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
-     */
-    protected $updated_by;
+				/**
+				 * @ORM\Column(name="updated_by", type="integer", nullable=false)
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $updated_by;
 	
 	public function __construct()
 	{
@@ -208,43 +208,43 @@ 
 		$this->user = $user;
 	}
 
-    /**
-     * @return mixed
-     */
-    public function getLastConnection()
-    {
-        return $this->last_connection;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getLastConnection()
+				{
+								return $this->last_connection;
+				}
 
-    /**
-     * @param mixed $last_connection
-     * @return Account
-     */
-    public function setLastConnection($last_connection)
-    {
-        $this->last_connection = $last_connection;
+				/**
+				 * @param mixed $last_connection
+				 * @return Account
+				 */
+				public function setLastConnection($last_connection)
+				{
+								$this->last_connection = $last_connection;
 
-        return $this;
-    }
+								return $this;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getTokens()
-    {
-        return $this->tokens;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getTokens()
+				{
+								return $this->tokens;
+				}
 
-    /**
-     * @param mixed $tokens
-     * @return Account
-     */
-    public function setTokens($tokens)
-    {
-        $this->tokens = $tokens;
+				/**
+				 * @param mixed $tokens
+				 * @return Account
+				 */
+				public function setTokens($tokens)
+				{
+								$this->tokens = $tokens;
 
-        return $this;
-    }
+								return $this;
+				}
 	
 	/**
 	 * Returns the roles granted to the user.
@@ -328,81 +328,81 @@ 
 			) = unserialize($serialized);
 	}
 
-    /**
-     * @return mixed
-     */
-    public function getCreatedAt()
-    {
-        return $this->created_at;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedAt()
+				{
+								return $this->created_at;
+				}
 
-    /**
-     * @param mixed $created_at
-     * @return Account
-     */
-    public function setCreatedAt($created_at): Account
-    {
-        $this->created_at = $created_at;
+				/**
+				 * @param mixed $created_at
+				 * @return Account
+				 */
+				public function setCreatedAt($created_at): Account
+				{
+								$this->created_at = $created_at;
 
-        return $this;
-    }
+								return $this;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getCreatedBy()
-    {
-        return $this->created_by;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedBy()
+				{
+								return $this->created_by;
+				}
 
-    /**
-     * @ORM\PrePersist
-     * @param mixed $created_by
-     * @return Account
-     */
-    public function setCreatedBy($created_by): Account
-    {
-        $this->created_by = $created_by;
+				/**
+				 * @ORM\PrePersist
+				 * @param mixed $created_by
+				 * @return Account
+				 */
+				public function setCreatedBy($created_by): Account
+				{
+								$this->created_by = $created_by;
 
-        return $this;
-    }
+								return $this;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getUpdatedAt()
-    {
-        return $this->updated_at;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedAt()
+				{
+								return $this->updated_at;
+				}
 
-    /**
-     * @param mixed $updated_at
-     * @return Account
-     */
-    public function setUpdatedAt($updated_at): Account
-    {
-        $this->updated_at = $updated_at;
+				/**
+				 * @param mixed $updated_at
+				 * @return Account
+				 */
+				public function setUpdatedAt($updated_at): Account
+				{
+								$this->updated_at = $updated_at;
 
-        return $this;
-    }
+								return $this;
+				}
 
-    /**
-     * @return mixed
-     */
-    public function getUpdatedBy()
-    {
-        return $this->updated_by;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedBy()
+				{
+								return $this->updated_by;
+				}
 
-    /**
-     * @ORM\PreUpdate
-     * @param mixed $updated_by
-     * @return Account
-     */
-    public function setUpdatedBy($updated_by): Account
-    {
-        $this->updated_by = $updated_by;
+				/**
+				 * @ORM\PreUpdate
+				 * @param mixed $updated_by
+				 * @return Account
+				 */
+				public function setUpdatedBy($updated_by): Account
+				{
+								$this->updated_by = $updated_by;
 
-        return $this;
-    }
+								return $this;
+				}
 }

Entity/User.php

Indentation +307 added lines, -307 removed lines

@@ -14,21 +14,21 @@ 
  */
 class User
 {
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="guid", type="string", length=255, nullable=false)
-     */
-    private $guid;
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="id", type="integer", nullable=false, options={"unsigned"=true})
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
+				 */
+				private $id;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="guid", type="string", length=255, nullable=false)
+				 */
+				private $guid;
 	
 	/**
 	 * @var AccessRight
@@ -36,63 +36,63 @@ 
 	 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\AccessRight", inversedBy="users")
 	 * @ORM\JoinColumn(name="id_access_right", referencedColumnName="id", nullable=true)
 	 */
-    private $accessRightList;
+				private $accessRightList;
 	
 	/**
 	 * @var boolean
 	 *
 	 * @ORM\Column(name="admin", type="boolean", nullable=true, options={"default": false})
 	 */
-    private $admin;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
-     */
-    private $firstname;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
-     */
-    private $lastname;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="adress", type="string", length=255, nullable=true)
-     */
-    private $adress;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
-     */
-    private $postalCode;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="country", type="string", length=100, nullable=true)
-     */
-    private $country;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="state", type="string", length=255, nullable=true)
-     */
-    private $state;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="access_rights", type="text", nullable=true)
-     */
-    private $accessRights;
+				private $admin;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="firstname", type="string", length=255, nullable=false)
+				 */
+				private $firstname;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="lastname", type="string", length=255, nullable=false)
+				 */
+				private $lastname;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="adress", type="string", length=255, nullable=true)
+				 */
+				private $adress;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="postal_code", type="string", length=100, nullable=true)
+				 */
+				private $postalCode;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="country", type="string", length=100, nullable=true)
+				 */
+				private $country;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="state", type="string", length=255, nullable=true)
+				 */
+				private $state;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="access_rights", type="text", nullable=true)
+				 */
+				private $accessRights;
 	
 	/**
 	 * @var boolean
@@ -101,59 +101,59 @@ 
 	 */
 	private $archived = false;
 
-    /**
-     * @ORM\Column(name="created_at", type="datetime", nullable=true)
-     */
-    protected $created_at;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
-     */
-    protected $created_by;
-
-    /**
-     * @ORM\Column(name="updated_at", type="datetime", nullable=true)
-     */
-    protected $updated_at;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
-     */
-    protected $updated_by;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getGuid()
-    {
-        return $this->guid;
-    }
-
-    /**
-     * @param string $guid
-     */
-    public function setGuid($guid)
-    {
-        $this->guid = $guid;
-    }
+				/**
+				 * @ORM\Column(name="created_at", type="datetime", nullable=true)
+				 */
+				protected $created_at;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="created_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $created_by;
+
+				/**
+				 * @ORM\Column(name="updated_at", type="datetime", nullable=true)
+				 */
+				protected $updated_at;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="updated_by", referencedColumnName="id", nullable=false)
+				 */
+				protected $updated_by;
+
+				/**
+				 * @return int
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getGuid()
+				{
+								return $this->guid;
+				}
+
+				/**
+				 * @param string $guid
+				 */
+				public function setGuid($guid)
+				{
+								$this->guid = $guid;
+				}
 	
 	/**
 	 * @return AccessRight
@@ -187,117 +187,117 @@ 
 		$this->admin = $admin;
 	}
 
-    /**
-     * @return string
-     */
-    public function getFirstname()
-    {
-        return $this->firstname;
-    }
-
-    /**
-     * @param string $firstname
-     */
-    public function setFirstname($firstname)
-    {
-        $this->firstname = $firstname;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLastname()
-    {
-        return $this->lastname;
-    }
-
-    /**
-     * @param string $lastname
-     */
-    public function setLastname($lastname)
-    {
-        $this->lastname = $lastname;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAdress()
-    {
-        return $this->adress;
-    }
-
-    /**
-     * @param string $adress
-     */
-    public function setAdress($adress)
-    {
-        $this->adress = $adress;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPostalCode()
-    {
-        return $this->postalCode;
-    }
-
-    /**
-     * @param string $postalCode
-     */
-    public function setPostalCode($postalCode)
-    {
-        $this->postalCode = $postalCode;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCountry()
-    {
-        return $this->country;
-    }
-
-    /**
-     * @param string $country
-     */
-    public function setCountry($country)
-    {
-        $this->country = $country;
-    }
-
-    /**
-     * @return string
-     */
-    public function getState()
-    {
-        return $this->state;
-    }
-
-    /**
-     * @param string $state
-     */
-    public function setState($state)
-    {
-        $this->state = $state;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccessRights()
-    {
-        return $this->accessRights;
-    }
-
-    /**
-     * @param string $accessRights
-     */
-    public function setAccessRights($accessRights)
-    {
-        $this->accessRights = $accessRights;
-    }
+				/**
+				 * @return string
+				 */
+				public function getFirstname()
+				{
+								return $this->firstname;
+				}
+
+				/**
+				 * @param string $firstname
+				 */
+				public function setFirstname($firstname)
+				{
+								$this->firstname = $firstname;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getLastname()
+				{
+								return $this->lastname;
+				}
+
+				/**
+				 * @param string $lastname
+				 */
+				public function setLastname($lastname)
+				{
+								$this->lastname = $lastname;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getAdress()
+				{
+								return $this->adress;
+				}
+
+				/**
+				 * @param string $adress
+				 */
+				public function setAdress($adress)
+				{
+								$this->adress = $adress;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getPostalCode()
+				{
+								return $this->postalCode;
+				}
+
+				/**
+				 * @param string $postalCode
+				 */
+				public function setPostalCode($postalCode)
+				{
+								$this->postalCode = $postalCode;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getCountry()
+				{
+								return $this->country;
+				}
+
+				/**
+				 * @param string $country
+				 */
+				public function setCountry($country)
+				{
+								$this->country = $country;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getState()
+				{
+								return $this->state;
+				}
+
+				/**
+				 * @param string $state
+				 */
+				public function setState($state)
+				{
+								$this->state = $state;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getAccessRights()
+				{
+								return $this->accessRights;
+				}
+
+				/**
+				 * @param string $accessRights
+				 */
+				public function setAccessRights($accessRights)
+				{
+								$this->accessRights = $accessRights;
+				}
 	
 	/**
 	 * @return boolean
@@ -315,82 +315,82 @@ 
 		$this->archived = $archived;
 	}
 
-    /**
-     * @return mixed
-     */
-    public function getCreatedAt()
-    {
-        return $this->created_at;
-    }
-
-    /**
-     * @param mixed $created_at
-     * @return User
-     */
-    public function setCreatedAt($created_at): User
-    {
-        $this->created_at = $created_at;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCreatedBy()
-    {
-        return $this->created_by;
-    }
-
-    /**
-     * @ORM\PrePersist
-     * @param mixed $created_by
-     * @return User
-     */
-    public function setCreatedBy($created_by): User
-    {
-        $this->created_by = $created_by;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUpdatedAt()
-    {
-        return $this->updated_at;
-    }
-
-    /**
-     * @param mixed $updated_at
-     * @return User
-     */
-    public function setUpdatedAt($updated_at): User
-    {
-        $this->updated_at = $updated_at;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUpdatedBy()
-    {
-        return $this->updated_by;
-    }
-
-    /**
-     * @ORM\PreUpdate
-     * @param mixed $updated_by
-     * @return User
-     */
-    public function setUpdatedBy($updated_by): User
-    {
-        $this->updated_by = $updated_by;
-
-        return $this;
-    }
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedAt()
+				{
+								return $this->created_at;
+				}
+
+				/**
+				 * @param mixed $created_at
+				 * @return User
+				 */
+				public function setCreatedAt($created_at): User
+				{
+								$this->created_at = $created_at;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getCreatedBy()
+				{
+								return $this->created_by;
+				}
+
+				/**
+				 * @ORM\PrePersist
+				 * @param mixed $created_by
+				 * @return User
+				 */
+				public function setCreatedBy($created_by): User
+				{
+								$this->created_by = $created_by;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedAt()
+				{
+								return $this->updated_at;
+				}
+
+				/**
+				 * @param mixed $updated_at
+				 * @return User
+				 */
+				public function setUpdatedAt($updated_at): User
+				{
+								$this->updated_at = $updated_at;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getUpdatedBy()
+				{
+								return $this->updated_by;
+				}
+
+				/**
+				 * @ORM\PreUpdate
+				 * @param mixed $updated_by
+				 * @return User
+				 */
+				public function setUpdatedBy($updated_by): User
+				{
+								$this->updated_by = $updated_by;
+
+								return $this;
+				}
 }