Rename Tokens => Token

safatshahin · Jul 19, 2023 · dba7088 · dba7088
1 parent 2d95795
commit dba7088
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/application/src/Controller/BackOfficeController.php b/application/src/Controller/BackOfficeController.php
@@ -8,7 +8,7 @@
 use App\Entity\RoomMember;
 use App\Entity\Room;
 use App\Entity\ThreePID;
-use App\Entity\Tokens;
+use App\Entity\Token;
 use App\Entity\User;
 use App\Traits\GeneralTrait;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -46,11 +46,11 @@ public function backOfficeCreateAdmin(string $serverID, Request $request) : Json
             }
 
             // Process tokens.
-            $token = $entityManager->getRepository(Tokens::class)
+            $token = $entityManager->getRepository(Token::class)
                     ->findOneBy(['userid' => $user->getId()]);
             if (!$token) {
                 // New user, or existing user without any associated Tokens.
-                $token = new Tokens();
+                $token = new Token();
                 $token->setAccesstoken($this->generateToken('access-token'));
                 $token->setRefreshtoken($this->generateToken('refresh-token'));
                 $token->setExpiresinms();

diff --git a/application/src/Controller/MatrixController.php b/application/src/Controller/MatrixController.php
@@ -5,7 +5,7 @@
 use App\Entity\Password;
 use App\Entity\Room;
 use App\Entity\RoomMember;
-use App\Entity\Tokens;
+use App\Entity\Token;
 use App\Entity\User;
 use App\Traits\GeneralTrait;
 use App\Traits\MatrixSynapseTrait;
@@ -137,7 +137,7 @@ public function login(string $serverID, Request $request): JsonResponse {
 
             // Check if user with its password is found.
             if ($user && $password) {
-                $token = $entityManager->getRepository(Tokens::class)->findOneBy(['userid' => $user->getId()]);
+                $token = $entityManager->getRepository(Token::class)->findOneBy(['userid' => $user->getId()]);
 
                 // Assign client server id if the server id is NULL.
                 if (is_null($token->getServerid())) {

diff --git a/application/src/Controller/SynapseController.php b/application/src/Controller/SynapseController.php
@@ -11,7 +11,7 @@
 use App\Entity\ThreePID;
 use App\Entity\RoomMember;
 use App\Entity\Room;
-use App\Entity\Tokens;
+use App\Entity\Token;
 use App\Traits\GeneralTrait;
 use App\Traits\MatrixSynapseTrait;
 
@@ -170,10 +170,10 @@ private function upsertUser(string $serverID, string $userID, Request $request,
         }
 
         // Process access tokens.
-        $token = $entityManager->getRepository(Tokens::class)->findOneBy(['userid' => $user->getId()]);
+        $token = $entityManager->getRepository(Token::class)->findOneBy(['userid' => $user->getId()]);
         if (!$token) {
             // New user, or existing user without any associated Tokens.
-            $token = new Tokens();
+            $token = new Token();
             $token->setAccesstoken($this->generateToken('access-token'));
             $token->setRefreshtoken($this->generateToken('refresh-token'));
             $token->setServerid($serverID);

diff --git a/application/src/Entity/Tokens.php → application/src/Entity/Token.php b/application/src/Entity/Tokens.php → application/src/Entity/Token.php
@@ -2,13 +2,13 @@
 
 namespace App\Entity;
 
-use App\Repository\TokensRepository;
+use App\Repository\TokenRepository;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity(repositoryClass=TokensRepository::class)
+ * @ORM\Entity(repositoryClass=TokenRepository::class)
  */
-class Tokens
+class Token
 {
     /**
      * @ORM\Id

diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
@@ -55,7 +55,7 @@ class User
     private $passwordpattern;
 
     /**
-     * @ORM\OneToMany(targetEntity=Tokens::class, mappedBy="userid", cascade={"persist", "remove"})
+     * @ORM\OneToMany(targetEntity=Token::class, mappedBy="userid", cascade={"persist", "remove"})
      */
     private $tokens;
 
@@ -236,14 +236,14 @@ public function removeExternalid(ExternalId $externalid): self
     }
 
     /**
-     * @return Collection<Tokens>
+     * @return Collection<Token>
      */
     public function getTokens(): Collection
     {
         return $this->tokens;
     }
 
-    public function addToken(Tokens $token): self
+    public function addToken(Token $token): self
     {
         $token->setUserid($this);
         $this->tokens->add($token);

diff --git a/...ation/src/Repository/TokensRepository.php → ...cation/src/Repository/TokenRepository.php b/...ation/src/Repository/TokensRepository.php → ...cation/src/Repository/TokenRepository.php
@@ -2,32 +2,32 @@
 
 namespace App\Repository;
 
-use App\Entity\Tokens;
+use App\Entity\Token;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
- * @extends ServiceEntityRepository<Tokens>
+ * @extends ServiceEntityRepository<Token>
  *
- * @method Tokens|null find($id, $lockMode = null, $lockVersion = null)
- * @method Tokens|null findOneBy(array $criteria, array $orderBy = null)
- * @method Tokens[]    findAll()
- * @method Tokens[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
+ * @method Token|null find($id, $lockMode = null, $lockVersion = null)
+ * @method Token|null findOneBy(array $criteria, array $orderBy = null)
+ * @method Token[]    findAll()
+ * @method Token[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-class TokensRepository extends ServiceEntityRepository
+class TokenRepository extends ServiceEntityRepository
 {
     public function __construct(ManagerRegistry $registry)
     {
-        parent::__construct($registry, Tokens::class);
+        parent::__construct($registry, Token::class);
     }
 
     /**
      * @throws ORMException
      * @throws OptimisticLockException
      */
-    public function add(Tokens $entity, bool $flush = true): void
+    public function add(Token $entity, bool $flush = true): void
     {
         $this->_em->persist($entity);
         if ($flush) {
@@ -39,7 +39,7 @@ public function add(Tokens $entity, bool $flush = true): void
      * @throws ORMException
      * @throws OptimisticLockException
      */
-    public function remove(Tokens $entity, bool $flush = true): void
+    public function remove(Token $entity, bool $flush = true): void
     {
         $this->_em->remove($entity);
         if ($flush) {

diff --git a/application/src/Service/ApiCheck.php b/application/src/Service/ApiCheck.php
@@ -5,7 +5,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use App\Entity\Tokens;
+use App\Entity\Token;
 use Doctrine\ORM\EntityManagerInterface;
 
 class ApiCheck extends AbstractController {
@@ -67,7 +67,7 @@ public function checkAuth($request): array
      */
     private function isValidAuthToken(string $authToken): ?object
     {
-        return $this->entityManger->getRepository(Tokens::class)->findOneBy(['accesstoken' => $authToken]);
+        return $this->entityManger->getRepository(Token::class)->findOneBy(['accesstoken' => $authToken]);
     }
 
     /**

diff --git a/application/src/Traits/MatrixSynapseTrait.php b/application/src/Traits/MatrixSynapseTrait.php
@@ -5,7 +5,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use App\Entity\Room;
 use App\Entity\RoomMember;
-use App\Entity\Tokens;
+use App\Entity\Token;
 use App\Entity\User;
 
 trait MatrixSynapseTrait {
@@ -27,7 +27,7 @@ private function getUnknownRoomResponse(): JsonResponse
     private function getToken(string $serverID, string $refreshToken): ?object
     {
         $entityManager = $this->getDoctrine()->getManager();
-        return $entityManager->getRepository(Tokens::class)->findOneBy([
+        return $entityManager->getRepository(Token::class)->findOneBy([
             'serverid' => $serverID,
             'refreshtoken' => $refreshToken
         ]);