Piou-piou / RibsAdminBundle

Repository/AccountRepository.php

Indentation +13 added lines, -13 removed lines

@@ -7,21 +7,21 @@
 
 class AccountRepository extends EntityRepository
 {
-    /**
-     * function that return a list of all users that are not archived and different of current account
-     * @param User $current_account
-     * @param bool $archived
-     * @return array
-     */
-    public function findAllUserArchived(User $current_account, bool $archived = false): array
-    {
-        $query = $this->getEntityManager()->createQuery("SELECT fu FROM RibsAdminBundle:Account fu
+				/**
+				 * function that return a list of all users that are not archived and different of current account
+				 * @param User $current_account
+				 * @param bool $archived
+				 * @return array
+				 */
+				public function findAllUserArchived(User $current_account, bool $archived = false): array
+				{
+								$query = $this->getEntityManager()->createQuery("SELECT fu FROM RibsAdminBundle:Account fu
 			  JOIN RibsAdminBundle:User u  WITH fu.user = u
 			  WHERE u.archived = :archived and u != :current_account
 			")
-            ->setParameter("archived", $archived)
-            ->setParameter("current_account", $current_account);
+												->setParameter("archived", $archived)
+												->setParameter("current_account", $current_account);
 
-        return $query->getResult();
-    }
+								return $query->getResult();
+				}
 }

Repository/AccessRightRepository.php

Indentation +24 added lines, -24 removed lines

@@ -8,33 +8,33 @@
 
 class AccessRightRepository extends EntityRepository
 {
-    /**
-     * function that delete all user which are in a list of rights
-     * @param AccessRight $access_right
-     * @throws DBALException
-     */
-    public function deleteAllUsersList(AccessRight $access_right)
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = NULL WHERE
+				/**
+				 * function that delete all user which are in a list of rights
+				 * @param AccessRight $access_right
+				 * @throws DBALException
+				 */
+				public function deleteAllUsersList(AccessRight $access_right)
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = NULL WHERE
  			id_access_right = :id_access_right
  		");
-        $query->bindValue("id_access_right", $access_right->getId());
-        $query->execute();
-    }
+								$query->bindValue("id_access_right", $access_right->getId());
+								$query->execute();
+				}
 
-    /**
-     * function that add a user in an access right list
-     * @param int $access_right_id
-     * @param string $guid_admin
-     * @throws DBALException
-     */
-    public function setAccessRightListUser(int $access_right_id, string $guid_admin)
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = :id_access_right WHERE
+				/**
+				 * function that add a user in an access right list
+				 * @param int $access_right_id
+				 * @param string $guid_admin
+				 * @throws DBALException
+				 */
+				public function setAccessRightListUser(int $access_right_id, string $guid_admin)
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = :id_access_right WHERE
  			guid = :guid_user
  		");
-        $query->bindValue("id_access_right", $access_right_id, \PDO::PARAM_INT);
-        $query->bindValue("guid_user", $guid_admin, \PDO::PARAM_STR);
-        $query->execute();
-    }
+								$query->bindValue("id_access_right", $access_right_id, \PDO::PARAM_INT);
+								$query->bindValue("guid_user", $guid_admin, \PDO::PARAM_STR);
+								$query->execute();
+				}
 }

Entity/AccountToken.php

Indentation +152 added lines, -152 removed lines

@@ -16,156 +16,156 @@
  */
 class AccountToken
 {
-    use GuidTrait;
-
-    /**
-     * @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;
-    }
+				use GuidTrait;
+
+				/**
+				 * @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;
+				}
 }

Service/AccessRights.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		
 		$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json"));
 		$modules_rights = $this->module->getModuleRights();
-		$ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights);
+		$ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights);
 		
 		if ($admin_page == "ribsadmin" && !$api && strpos($route, "login") === false && strpos($route, "register") === false) {
 			//redirection if user not connected

Indentation +31 added lines, -31 removed lines

@@ -43,10 +43,10 @@ 
 	 */
 	private $module;
 
-    /**
-     * @var Api
-     */
-    private $api;
+				/**
+				 * @var Api
+				 */
+				private $api;
 	
 	/**
 	 * @var User
@@ -56,17 +56,17 @@ 
 	/** @var TokenStorageInterface */
 	private $token_storage;
 
-    /**
-     * AccessRights constructor.
-     * @param ContainerInterface $container
-     * @param RouterInterface $router
-     * @param SessionInterface $session
-     * @param RequestStack $request
-     * @param TokenStorageInterface $tokenStorage
-     * @param Globals $globals
-     * @param ModuleService $module
-     * @param Api $api
-     */
+				/**
+				 * AccessRights constructor.
+				 * @param ContainerInterface $container
+				 * @param RouterInterface $router
+				 * @param SessionInterface $session
+				 * @param RequestStack $request
+				 * @param TokenStorageInterface $tokenStorage
+				 * @param Globals $globals
+				 * @param ModuleService $module
+				 * @param Api $api
+				 */
 	public function __construct(ContainerInterface $container, RouterInterface $router, SessionInterface $session, RequestStack $request, TokenStorageInterface $tokenStorage, Globals $globals, ModuleService $module, Api $api)
 	{
 		$this->container = $container;
@@ -78,8 +78,8 @@ 
 		$this->api = $api;
 		$this->token_storage = $tokenStorage;
 		if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
-            $this->user = $this->token_storage->getToken()->getUser()->getUser();
-        }
+												$this->user = $this->token_storage->getToken()->getUser()->getUser();
+								}
 	}
 	
 	public function onKernelController()
@@ -120,14 +120,14 @@ 
 			
 			throw new AccessDeniedException("No access");
 		} else if ($api && strpos($route, "login") === false && strpos($route, "register") === false) {
-            if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
-                throw new AccessDeniedException("User is not connected");
-            }
-        }
+												if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
+																throw new AccessDeniedException("User is not connected");
+												}
+								}
 	}
 	
 	/**
-     * function that allow to test a right directly in the view
+	 * function that allow to test a right directly in the view
 	 * @param string $right
 	 * @return bool
 	 */
@@ -138,9 +138,9 @@ 
 		
 		$all_rights = array_merge($user_rights, $list_rights);
 
-        if (in_array("*", $all_rights)) {
-            return true;
-        }
+								if (in_array("*", $all_rights)) {
+												return true;
+								}
 
 		if (in_array($right, $all_rights)) {
 			return true;
@@ -150,7 +150,7 @@ 
 	}
 	
 	/**
-     * test if route_right is found in users rights
+	 * test if route_right is found in users rights
 	 * @param array $route_right
 	 * @return bool
 	 */
@@ -162,8 +162,8 @@ 
 		$all_rights = array_merge($user_rights, $list_rights);
 
 		if (in_array("*", $all_rights)) {
-		    return true;
-        }
+						return true;
+								}
 
 		foreach ($all_rights as $right) {
 			if (in_array($right, $route_right)) {
@@ -175,7 +175,7 @@ 
 	}
 	
 	/**
-     * function that search if the right contain an url or more
+	 * function that search if the right contain an url or more
 	 * @param $needle
 	 * @param $haystack
 	 * @return bool|mixed
@@ -199,7 +199,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all user rights or empty array if no right found
+	 * function that retun a array that contain all user rights or empty array if no right found
 	 * @return array
 	 */
 	private function getUserRights(): array
@@ -214,7 +214,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all rights of rattached list right of the current user
+	 * function that retun a array that contain all rights of rattached list right of the current user
 	 * @return array
 	 */
 	private function getRightsListOfUser(): array

Service/UserLog.php

Indentation +47 added lines, -47 removed lines

@@ -9,51 +9,51 @@
 
 class UserLog
 {
-    /**
-     * @var TokenStorageInterface
-     */
-    private $token_storage;
-
-    /**
-     * @var EntityManagerInterface a
-     */
-    private $em;
-
-    public function __construct(TokenStorageInterface $token_storage, EntityManagerInterface $em)
-    {
-        $this->token_storage = $token_storage;
-        $this->em = $em;
-    }
-
-    /**
-     * @param RequestEvent $request_event
-     */
-    public function onKernelRequest(RequestEvent $request_event)
-    {
-        if ($request_event->isMasterRequest()) {
-            $user = null;
-            if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
-                $user = $this->token_storage->getToken()->getUser()->getUser();
-            }
-            $request = $request_event->getRequest();
-            $route = $request->get("_route");
-
-            if (in_array($route, ["_profiler", "_profiler_search_bar", "_wdt", "ribsadmin_userlogs", "ribsadmin_userlogs_show"])) {
-                return;
-            }
-
-            if ($user) {
-                $user_log = new UserLogs();
-                $user_log->setMethod($request->getMethod());
-                $user_log->setUser($user);
-                $user_log->setRoute($request->get("_route"));
-                $user_log->setUrl($request->getRequestUri());
-                $user_log->setFullUrl($request->getUri());
-                $user_log->setRequestFormat($request->getRequestFormat());
-                $user_log->setRequestParameters($request->request->all());
-                $this->em->persist($user_log);
-                $this->em->flush();
-            }
-        }
-    }
+				/**
+				 * @var TokenStorageInterface
+				 */
+				private $token_storage;
+
+				/**
+				 * @var EntityManagerInterface a
+				 */
+				private $em;
+
+				public function __construct(TokenStorageInterface $token_storage, EntityManagerInterface $em)
+				{
+								$this->token_storage = $token_storage;
+								$this->em = $em;
+				}
+
+				/**
+				 * @param RequestEvent $request_event
+				 */
+				public function onKernelRequest(RequestEvent $request_event)
+				{
+								if ($request_event->isMasterRequest()) {
+												$user = null;
+												if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
+																$user = $this->token_storage->getToken()->getUser()->getUser();
+												}
+												$request = $request_event->getRequest();
+												$route = $request->get("_route");
+
+												if (in_array($route, ["_profiler", "_profiler_search_bar", "_wdt", "ribsadmin_userlogs", "ribsadmin_userlogs_show"])) {
+																return;
+												}
+
+												if ($user) {
+																$user_log = new UserLogs();
+																$user_log->setMethod($request->getMethod());
+																$user_log->setUser($user);
+																$user_log->setRoute($request->get("_route"));
+																$user_log->setUrl($request->getRequestUri());
+																$user_log->setFullUrl($request->getUri());
+																$user_log->setRequestFormat($request->getRequestFormat());
+																$user_log->setRequestParameters($request->request->all());
+																$this->em->persist($user_log);
+																$this->em->flush();
+												}
+								}
+				}
 }

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'

Service/Globals.php

Indentation +14 added lines, -14 removed lines

@@ -11,11 +11,11 @@ 
 	 */
 	private $container;
 
-    /**
-     * Globals constructor.
-     * @param ContainerInterface $container
-     */
-    public function __construct(ContainerInterface $container)
+				/**
+				 * Globals constructor.
+				 * @param ContainerInterface $container
+				 */
+				public function __construct(ContainerInterface $container)
 	{
 		$this->container = $container;
 	}
@@ -38,23 +38,23 @@ 
 		return $package_name;
 	}
 
-    /**
-     * this method send base bundle path related to ribs-admin
-     * @param string|null $package
-     * @param bool $dev_mode
-     * @return string
-     */
+				/**
+				 * this method send base bundle path related to ribs-admin
+				 * @param string|null $package
+				 * @param bool $dev_mode
+				 * @return string
+				 */
 	public function getBaseBundlePath(string $package = "piou-piou/ribs-admin-bundle", bool $dev_mode = false): string
 	{
 		$path = $this->container->get('kernel')->getProjectDir();
 
-        $dev_mode = $package === "piou-piou/ribs-admin-bundle" ? $this->container->getParameter("ribs_admin.dev_mode"): $dev_mode;
+								$dev_mode = $package === "piou-piou/ribs-admin-bundle" ? $this->container->getParameter("ribs_admin.dev_mode"): $dev_mode;
 
 		if ($dev_mode === true) {
 			$package = "/lib/".$this->getPackageDevName($package);
 		} else {
-            $package = "/vendor/" . $package;
-        }
+												$package = "/vendor/" . $package;
+								}
 		
 		return $path . $package;
 	}

Spacing +2 added lines, -2 removed lines

@@ -48,10 +48,10 @@
 	{
 		$path = $this->container->get('kernel')->getProjectDir();
 
-        $dev_mode = $package === "piou-piou/ribs-admin-bundle" ? $this->container->getParameter("ribs_admin.dev_mode"): $dev_mode;
+        $dev_mode = $package === "piou-piou/ribs-admin-bundle" ? $this->container->getParameter("ribs_admin.dev_mode") : $dev_mode;
 
 		if ($dev_mode === true) {
-			$package = "/lib/".$this->getPackageDevName($package);
+			$package = "/lib/" . $this->getPackageDevName($package);
 		} else {
             $package = "/vendor/" . $package;
         }

Entity/UserLogs.php

Indentation +202 added lines, -202 removed lines

@@ -13,207 +13,207 @@
  */
 class UserLogs
 {
-    use GuidTrait;
-    use CreatedUpdatedTrait;
-
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
-     */
-    private $user;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="method", type="string", length=255, nullable=false)
-     */
-    private $method;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="route", type="string", length=255, nullable=false)
-     */
-    private $route;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="url", type="string", length=255, nullable=false)
-     */
-    private $url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="full_url", type="string", length=255, nullable=false)
-     */
-    private $full_url;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="request_format", type="string", length=255, nullable=false)
-     */
-    private $request_format;
-
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="equest_parameters", type="json", nullable=true)
-     */
-    private $request_parameters;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    /**
-     * @return User
-     */
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    /**
-     * @param \User $user
-     */
-    public function setUser($user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    /**
-     * @param string $method
-     * @return UserLogs
-     */
-    public function setMethod(string $method): UserLogs
-    {
-        $this->method = $method;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRoute(): string
-    {
-        return $this->route;
-    }
-
-    /**
-     * @param string $route
-     * @return UserLogs
-     */
-    public function setRoute(string $route): UserLogs
-    {
-        $this->route = $route;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUrl(): string
-    {
-        return $this->url;
-    }
-
-    /**
-     * @param string $url
-     * @return UserLogs
-     */
-    public function setUrl(string $url): UserLogs
-    {
-        $this->url = $url;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFullUrl(): string
-    {
-        return $this->full_url;
-    }
-
-    /**
-     * @param string $full_url
-     * @return UserLogs
-     */
-    public function setFullUrl(string $full_url): UserLogs
-    {
-        $this->full_url = $full_url;
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestFormat(): string
-    {
-        return $this->request_format;
-    }
-
-    /**
-     * @param string $request_format
-     * @return UserLogs
-     */
-    public function setRequestFormat(string $request_format): UserLogs
-    {
-        $this->request_format = $request_format;
-
-        return $this;
-    }
-
-    public function getRequestParameters()
-    {
-        return $this->request_parameters;
-    }
-
-    /**
-     * @param $request_parameters
-     * @return UserLogs
-     */
-    public function setRequestParameters($request_parameters): UserLogs
-    {
-        $this->request_parameters = $request_parameters;
-
-        return $this;
-    }
+				use GuidTrait;
+				use CreatedUpdatedTrait;
+
+				/**
+				 * @var integer
+				 *
+				 * @ORM\Column(name="id", type="integer", nullable=false)
+				 * @ORM\Id
+				 * @ORM\GeneratedValue(strategy="IDENTITY")
+				 */
+				private $id;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="PiouPiou\RibsAdminBundle\Entity\User")
+				 * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
+				 */
+				private $user;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="method", type="string", length=255, nullable=false)
+				 */
+				private $method;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="route", type="string", length=255, nullable=false)
+				 */
+				private $route;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="url", type="string", length=255, nullable=false)
+				 */
+				private $url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="full_url", type="string", length=255, nullable=false)
+				 */
+				private $full_url;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="request_format", type="string", length=255, nullable=false)
+				 */
+				private $request_format;
+
+				/**
+				 * @var string
+				 *
+				 * @ORM\Column(name="equest_parameters", type="json", nullable=true)
+				 */
+				private $request_parameters;
+
+				/**
+				 * @return int
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param int $id
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+				}
+
+				/**
+				 * @return User
+				 */
+				public function getUser(): User
+				{
+								return $this->user;
+				}
+
+				/**
+				 * @param \User $user
+				 */
+				public function setUser($user)
+				{
+								$this->user = $user;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getMethod(): string
+				{
+								return $this->method;
+				}
+
+				/**
+				 * @param string $method
+				 * @return UserLogs
+				 */
+				public function setMethod(string $method): UserLogs
+				{
+								$this->method = $method;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getRoute(): string
+				{
+								return $this->route;
+				}
+
+				/**
+				 * @param string $route
+				 * @return UserLogs
+				 */
+				public function setRoute(string $route): UserLogs
+				{
+								$this->route = $route;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getUrl(): string
+				{
+								return $this->url;
+				}
+
+				/**
+				 * @param string $url
+				 * @return UserLogs
+				 */
+				public function setUrl(string $url): UserLogs
+				{
+								$this->url = $url;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getFullUrl(): string
+				{
+								return $this->full_url;
+				}
+
+				/**
+				 * @param string $full_url
+				 * @return UserLogs
+				 */
+				public function setFullUrl(string $full_url): UserLogs
+				{
+								$this->full_url = $full_url;
+
+								return $this;
+				}
+
+				/**
+				 * @return string
+				 */
+				public function getRequestFormat(): string
+				{
+								return $this->request_format;
+				}
+
+				/**
+				 * @param string $request_format
+				 * @return UserLogs
+				 */
+				public function setRequestFormat(string $request_format): UserLogs
+				{
+								$this->request_format = $request_format;
+
+								return $this;
+				}
+
+				public function getRequestParameters()
+				{
+								return $this->request_parameters;
+				}
+
+				/**
+				 * @param $request_parameters
+				 * @return UserLogs
+				 */
+				public function setRequestParameters($request_parameters): UserLogs
+				{
+								$this->request_parameters = $request_parameters;
+
+								return $this;
+				}
 }
 

Controller/UserLogsController.php

Indentation +36 added lines, -36 removed lines

@@ -10,44 +10,44 @@
 
 class UserLogsController extends AbstractController
 {
-    /**
-     * list all user logs
-     * @Route("/user-logs/{page}", requirements={"page" = "\d+"}, name="ribsadmin_userlogs")
-     * @param ParameterBagInterface $parameterBag
-     * @param int $page
-     * @return Response
-     */
-    public function list(ParameterBagInterface $parameterBag, int $page = 1): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $max_per_page = $parameterBag->get("ribs_admin.paginator_element_per_page");
+				/**
+				 * list all user logs
+				 * @Route("/user-logs/{page}", requirements={"page" = "\d+"}, name="ribsadmin_userlogs")
+				 * @param ParameterBagInterface $parameterBag
+				 * @param int $page
+				 * @return Response
+				 */
+				public function list(ParameterBagInterface $parameterBag, int $page = 1): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$max_per_page = $parameterBag->get("ribs_admin.paginator_element_per_page");
 
-        $logs = $em->getRepository(UserLogs::class)->findAllPaginated($page, $max_per_page);
-        $pagination = array(
-            "page" => $page,
-            "page_number" => ceil(count($logs) / 20),
-            "route" => "ribsadmin_userlogs",
-            "parameters" => array()
-        );
+								$logs = $em->getRepository(UserLogs::class)->findAllPaginated($page, $max_per_page);
+								$pagination = array(
+												"page" => $page,
+												"page_number" => ceil(count($logs) / 20),
+												"route" => "ribsadmin_userlogs",
+												"parameters" => array()
+								);
 
-        return $this->render("@RibsAdmin/userlogs/list.html.twig", [
-            "logs" => $logs,
-            "pagination" => $pagination
-        ]);
-    }
+								return $this->render("@RibsAdmin/userlogs/list.html.twig", [
+												"logs" => $logs,
+												"pagination" => $pagination
+								]);
+				}
 
-    /**
-     * show detail of a user log
-     * @Route("/user-logs/show/{guid}", name="ribsadmin_userlogs_show")
-     * @param string $guid
-     * @return Response
-     */
-    public function show(string $guid): Response
-    {
-        $log = $this->getDoctrine()->getRepository(UserLogs::class)->findOneByGuid($guid);
+				/**
+				 * show detail of a user log
+				 * @Route("/user-logs/show/{guid}", name="ribsadmin_userlogs_show")
+				 * @param string $guid
+				 * @return Response
+				 */
+				public function show(string $guid): Response
+				{
+								$log = $this->getDoctrine()->getRepository(UserLogs::class)->findOneByGuid($guid);
 
-        return $this->render("@RibsAdmin/userlogs/show.html.twig", [
-            "log" => $log,
-        ]);
-    }
+								return $this->render("@RibsAdmin/userlogs/show.html.twig", [
+												"log" => $log,
+								]);
+				}
 }