Piou-piou / RibsAdminBundle

Service/ModuleService.php

Indentation +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 	}
 	
 	/**
-     * method that return all infos needed in access right management page
+	 * method that return all infos needed in access right management page
 	 * @return array
 	 */
 	public function getAllInfosModules()
@@ -44,7 +44,7 @@ 
 	}
 	
 	/**
-     * function that return all modules rights
+	 * function that return all modules rights
 	 * @return object
 	 */
 	public function getModuleRights()

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 		foreach ($modules as $module) {
 			$modules_data[] = [
 				"name" => $module->getTitle(),
-				"rights" => (array)json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
+				"rights" => (array) json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"))
 			];
 		}
 		
@@ -59,6 +59,6 @@ 
 			$rights[] = json_decode(file_get_contents($this->globals->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/ribsadmin_rights.json"));
 		}
 		
-		return (object)$rights;
+		return (object) $rights;
 	}
 }

Service/AccessRights.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,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 !== "api" && strpos($route, "login") === false && strpos($route, "register") === false) {
 			//redirection if user not connected

Indentation +31 added lines, -31 removed lines

@@ -42,10 +42,10 @@ 
 	 */
 	private $module;
 
-    /**
-     * @var Api
-     */
-    private $api;
+				/**
+				 * @var Api
+				 */
+				private $api;
 	
 	/**
 	 * @var User
@@ -55,17 +55,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;
@@ -77,8 +77,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()
@@ -119,14 +119,14 @@ 
 			
 			throw new AccessDeniedException("No access");
 		} else if ($api === "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
 	 */
@@ -137,9 +137,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;
@@ -149,7 +149,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
 	 */
@@ -161,8 +161,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)) {
@@ -174,7 +174,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
@@ -198,7 +198,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
@@ -213,7 +213,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/Jwt.php

Indentation +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 class Jwt
 {
 	/**
-     * encode an array in jwt
+	 * encode an array in jwt
 	 * @param array $values
 	 * @param string $token
 	 * @return string
@@ -18,7 +18,7 @@ 
 	}
 	
 	/**
-     * encode a jwt in array
+	 * encode a jwt in array
 	 * @param string $encoded_json
 	 * @param string $token
 	 * @return bool|object

Command/ImportModuleCommand.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $output->writeln("Start composer require " . $pacakge_name);
 
         $process = new Process("composer require " . $pacakge_name);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             echo $buffer;
         });
 

Indentation +51 added lines, -51 removed lines

@@ -13,64 +13,64 @@
 
 class ImportModuleCommand extends Command
 {
-    private $em;
+				private $em;
 
-    /**
-     * ImportModuleCommand constructor.
-     * @param EntityManagerInterface $em
-     * @param string|null $name
-     */
-    public function __construct(EntityManagerInterface $em, string $name = null)
-    {
-        parent::__construct($name);
-        $this->em = $em;
-    }
+				/**
+				 * ImportModuleCommand constructor.
+				 * @param EntityManagerInterface $em
+				 * @param string|null $name
+				 */
+				public function __construct(EntityManagerInterface $em, string $name = null)
+				{
+								parent::__construct($name);
+								$this->em = $em;
+				}
 
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:import-module')
-            ->setDescription('Import a module in ribs admin')
-            ->addArgument(
-                'package-name',
-                InputArgument::REQUIRED,
-                'Name of composer package to import'
-            )
-            ->addArgument(
-                'module-name',
-                InputArgument::REQUIRED,
-                'Name of package to display in app'
-            )
-        ;
-    }
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:import-module')
+												->setDescription('Import a module in ribs admin')
+												->addArgument(
+																'package-name',
+																InputArgument::REQUIRED,
+																'Name of composer package to import'
+												)
+												->addArgument(
+																'module-name',
+																InputArgument::REQUIRED,
+																'Name of package to display in app'
+												)
+								;
+				}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $pacakge_name = $input->getArgument('package-name');
-        $output->writeln("Start composer require " . $pacakge_name);
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$pacakge_name = $input->getArgument('package-name');
+								$output->writeln("Start composer require " . $pacakge_name);
 
-        $process = new Process("composer require " . $pacakge_name);
-        $process->run(function ($type, $buffer) {
-            echo $buffer;
-        });
+								$process = new Process("composer require " . $pacakge_name);
+								$process->run(function ($type, $buffer) {
+												echo $buffer;
+								});
 
-        if (!$process->isSuccessful()) {
-            throw new ProcessFailedException($process);
-        }
+								if (!$process->isSuccessful()) {
+												throw new ProcessFailedException($process);
+								}
 
-        $output->writeln("End composer require " . $pacakge_name);
-        $output->writeln("Start insertion of module in database " . $pacakge_name);
+								$output->writeln("End composer require " . $pacakge_name);
+								$output->writeln("Start insertion of module in database " . $pacakge_name);
 
-        $module = new Module();
-        $module->setPackageName($pacakge_name);
-        $module->setTitle($input->getArgument('module-name'));
-        $module->setActive(false);
-        $module->setDisplayed(true);
-        $this->em->persist($module);
-        $this->em->flush();
+								$module = new Module();
+								$module->setPackageName($pacakge_name);
+								$module->setTitle($input->getArgument('module-name'));
+								$module->setActive(false);
+								$module->setDisplayed(true);
+								$this->em->persist($module);
+								$this->em->flush();
 
-        $output->writeln("Installation of " . $pacakge_name . " is finished. You have now to configure this module in your administration interface");
+								$output->writeln("Installation of " . $pacakge_name . " is finished. You have now to configure this module in your administration interface");
 
-        return 0;
-    }
+								return 0;
+				}
 }

RibsAdminBundle.php

Indentation +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@
 
 class RibsAdminBundle extends Bundle
 {
-    public function getContainerExtension()
-    {
-        return new RibsAdminExtension();
-    }
+				public function getContainerExtension()
+				{
+								return new RibsAdminExtension();
+				}
 }

Command/CreateAdminCommand.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         $account->setPassword($temp_password);
         $account->setUser($user);
         $account->setEmail($email);
-        $account->setUsername(substr($firstname, 0, 1).".".$lastname);
+        $account->setUsername(substr($firstname, 0, 1) . "." . $lastname);
         $this->em->persist($account);
 
         $this->em->flush();

Indentation +66 added lines, -66 removed lines

@@ -13,80 +13,80 @@
 
 class CreateAdminCommand extends Command
 {
-    /** @var EntityManagerInterface */
-    private $em;
+				/** @var EntityManagerInterface */
+				private $em;
 
-    /** @var UserPasswordEncoderInterface */
-    private $passwordEncoder;
+				/** @var UserPasswordEncoderInterface */
+				private $passwordEncoder;
 
-    /**
-     * CreateAdminCommand constructor.
-     * @param EntityManagerInterface $em
-     * @param UserPasswordEncoderInterface $passwordEncoder
-     * @param string|null $name
-     */
-    public function __construct(EntityManagerInterface $em, UserPasswordEncoderInterface $passwordEncoder, string $name = null)
-    {
-        parent::__construct($name);
-        $this->em = $em;
-        $this->passwordEncoder = $passwordEncoder;
-    }
+				/**
+				 * CreateAdminCommand constructor.
+				 * @param EntityManagerInterface $em
+				 * @param UserPasswordEncoderInterface $passwordEncoder
+				 * @param string|null $name
+				 */
+				public function __construct(EntityManagerInterface $em, UserPasswordEncoderInterface $passwordEncoder, string $name = null)
+				{
+								parent::__construct($name);
+								$this->em = $em;
+								$this->passwordEncoder = $passwordEncoder;
+				}
 
-    protected function configure()
-    {
-        $this
-            ->setName('ribsadmin:create-admin')
-            ->setDescription('Create an admin in ribs admin')
-            ->addArgument(
-                'firstname',
-                InputArgument::REQUIRED,
-                'Firstname of admin to create'
-            )
-            ->addArgument(
-                'lastname',
-                InputArgument::REQUIRED,
-                'Lastname of admin to create'
-            )
-            ->addArgument(
-                'email',
-                InputArgument::REQUIRED,
-                'email of admin to create'
-            )
-            ->addArgument(
-                'password',
-                InputArgument::REQUIRED,
-                'password of admin to create'
-            )
-        ;
-    }
+				protected function configure()
+				{
+								$this
+												->setName('ribsadmin:create-admin')
+												->setDescription('Create an admin in ribs admin')
+												->addArgument(
+																'firstname',
+																InputArgument::REQUIRED,
+																'Firstname of admin to create'
+												)
+												->addArgument(
+																'lastname',
+																InputArgument::REQUIRED,
+																'Lastname of admin to create'
+												)
+												->addArgument(
+																'email',
+																InputArgument::REQUIRED,
+																'email of admin to create'
+												)
+												->addArgument(
+																'password',
+																InputArgument::REQUIRED,
+																'password of admin to create'
+												)
+								;
+				}
 
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $firstname = $input->getArgument('firstname');
-        $lastname = $input->getArgument('lastname');
-        $email = $input->getArgument('email');
-        $password = $input->getArgument('password');
+				protected function execute(InputInterface $input, OutputInterface $output)
+				{
+								$firstname = $input->getArgument('firstname');
+								$lastname = $input->getArgument('lastname');
+								$email = $input->getArgument('email');
+								$password = $input->getArgument('password');
 
-        $output->writeln("Create admin " . $firstname . " " . $lastname);
+								$output->writeln("Create admin " . $firstname . " " . $lastname);
 
-        $user = new User();
-        $user->setFirstname($firstname);
-        $user->setLastname($lastname);
-        $user->setAccessRights("*");
-        $this->em->persist($user);
+								$user = new User();
+								$user->setFirstname($firstname);
+								$user->setLastname($lastname);
+								$user->setAccessRights("*");
+								$this->em->persist($user);
 
-        $account = new Account();
-        $temp_password = $this->passwordEncoder->encodePassword($account, $password);
-        $account->setPassword($temp_password);
-        $account->setUser($user);
-        $account->setEmail($email);
-        $account->setUsername(substr($firstname, 0, 1).".".$lastname);
-        $this->em->persist($account);
+								$account = new Account();
+								$temp_password = $this->passwordEncoder->encodePassword($account, $password);
+								$account->setPassword($temp_password);
+								$account->setUser($user);
+								$account->setEmail($email);
+								$account->setUsername(substr($firstname, 0, 1).".".$lastname);
+								$this->em->persist($account);
 
-        $this->em->flush();
+								$this->em->flush();
 
-        $output->writeln("End Create admin " . $firstname . " " . $lastname);
+								$output->writeln("End Create admin " . $firstname . " " . $lastname);
 
-        return 0;
-    }
+								return 0;
+				}
 }

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 +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         $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;
         }

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();
+				}
 }

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'