superdesk / web-publisher

src/SWP/Bundle/CoreBundle/Controller/AuthController.php

Indentation +100 added lines, -100 removed lines

@@ -38,117 +38,117 @@ 
 
 class AuthController extends AbstractController
 {
-  protected FormFactoryInterface $formFactory;
-  protected ApiKeyRepositoryInterface $apiKeyRepository;
-  protected ApiKeyFactory $apiKeyFactory;
-  protected LockFactory $lockFactory;
-
-  /**
-   * @param FormFactoryInterface $formFactory
-   * @param ApiKeyRepositoryInterface $apiKeyRepository
-   * @param ApiKeyFactory $apiKeyFactory
-   * @param LockFactory $lockFactory
-   */
-  public function __construct(
-      FormFactoryInterface $formFactory,
-      ApiKeyRepositoryInterface $apiKeyRepository,
-      ApiKeyFactory$apiKeyFactory,
-      LockFactory $lockFactory
-  ) {
+    protected FormFactoryInterface $formFactory;
+    protected ApiKeyRepositoryInterface $apiKeyRepository;
+    protected ApiKeyFactory $apiKeyFactory;
+    protected LockFactory $lockFactory;
+
+    /**
+     * @param FormFactoryInterface $formFactory
+     * @param ApiKeyRepositoryInterface $apiKeyRepository
+     * @param ApiKeyFactory $apiKeyFactory
+     * @param LockFactory $lockFactory
+     */
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        ApiKeyRepositoryInterface $apiKeyRepository,
+        ApiKeyFactory$apiKeyFactory,
+        LockFactory $lockFactory
+    ) {
     $this->formFactory = $formFactory;
     $this->apiKeyRepository = $apiKeyRepository;
     $this->apiKeyFactory = $apiKeyFactory;
     $this->lockFactory = $lockFactory;
-  }
-
-
-  /**
-   * @Route(
-   *     "/api/{version}/auth/",
-   *     options={"expose"=true},
-   *     defaults={"version"="v2"},
-   *     methods={"POST"},
-   *     name="swp_api_auth"
-   * )
-   */
-  public function authenticateAction(
-      Request $request,
-      UserProviderInterface $userProvider,
-      UserPasswordHasherInterface $userPasswordEncoder
-  ) {
+    }
+
+
+    /**
+     * @Route(
+     *     "/api/{version}/auth/",
+     *     options={"expose"=true},
+     *     defaults={"version"="v2"},
+     *     methods={"POST"},
+     *     name="swp_api_auth"
+     * )
+     */
+    public function authenticateAction(
+        Request $request,
+        UserProviderInterface $userProvider,
+        UserPasswordHasherInterface $userPasswordEncoder
+    ) {
     $form = $this->formFactory->createNamed('', UserAuthenticationType::class, []);
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $formData = $form->getData();
+        $formData = $form->getData();
 
-      try {
+        try {
         $user = $userProvider->loadUserByIdentifier($formData['username']);
-      } catch (AuthenticationException $e) {
+        } catch (AuthenticationException $e) {
         $user = null;
-      }
+        }
 
-      if ((null !== $user) && $userPasswordEncoder->isPasswordValid($user, $formData['password'])) {
+        if ((null !== $user) && $userPasswordEncoder->isPasswordValid($user, $formData['password'])) {
         return $this->returnApiTokenResponse($user);
-      }
+        }
     }
 
     return new SingleResourceResponse([
         'status' => 401,
         'message' => 'Unauthorized',
     ], new ResponseContext(401));
-  }
-
-  /**
-   * @Route(
-   *     "/api/{version}/auth/superdesk/",
-   *     options={"expose"=true},
-   *     methods={"POST"},
-   *     defaults={"version"="v2"},
-   *     name="swp_api_auth_superdesk"
-   * )
-   */
-  public function authenticateWithSuperdeskAction(
-      Request               $request,
-      LoggerInterface       $logger,
-      array                 $superdeskServers,
-      UserProviderInterface $userProvider,
-      UserManagerInterface  $userManager
-  ) {
+    }
+
+    /**
+     * @Route(
+     *     "/api/{version}/auth/superdesk/",
+     *     options={"expose"=true},
+     *     methods={"POST"},
+     *     defaults={"version"="v2"},
+     *     name="swp_api_auth_superdesk"
+     * )
+     */
+    public function authenticateWithSuperdeskAction(
+        Request               $request,
+        LoggerInterface       $logger,
+        array                 $superdeskServers,
+        UserProviderInterface $userProvider,
+        UserManagerInterface  $userManager
+    ) {
     $form = $this->formFactory->createNamed('', SuperdeskCredentialAuthenticationType::class, []);
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $formData = $form->getData();
-      $authorizedSuperdeskHosts = $superdeskServers;
-      $superdeskUser = null;
-      $client = new GuzzleHttp\Client();
+        $formData = $form->getData();
+        $authorizedSuperdeskHosts = $superdeskServers;
+        $superdeskUser = null;
+        $client = new GuzzleHttp\Client();
 
-      foreach ($authorizedSuperdeskHosts as $baseUrl) {
+        foreach ($authorizedSuperdeskHosts as $baseUrl) {
         try {
-          $apiRequest = new GuzzleHttp\Psr7\Request('GET', sprintf('%s/api/sessions/%s', $baseUrl, $formData['sessionId']), [
-              'Authorization' => $formData['token'],
-          ]);
+            $apiRequest = new GuzzleHttp\Psr7\Request('GET', sprintf('%s/api/sessions/%s', $baseUrl, $formData['sessionId']), [
+                'Authorization' => $formData['token'],
+            ]);
 
-          $apiResponse = $client->send($apiRequest);
-          if (200 !== $apiResponse->getStatusCode()) {
+            $apiResponse = $client->send($apiRequest);
+            if (200 !== $apiResponse->getStatusCode()) {
             $logger->warning(sprintf('[%s] Unsuccessful response from Superdesk Server: %s', $apiResponse->getStatusCode(), $apiResponse->getBody()->getContents()));
 
             continue;
-          }
+            }
 
-          $content = json_decode($apiResponse->getBody()->getContents(), true);
-          if (is_array($content) && array_key_exists('user', $content)) {
+            $content = json_decode($apiResponse->getBody()->getContents(), true);
+            if (is_array($content) && array_key_exists('user', $content)) {
             $superdeskUser = $content['user'];
 
             break;
-          }
+            }
         } catch (GuzzleHttp\Exception\ClientException $e) {
-          $logger->warning(sprintf('Error when logging in Superdesk: %s', $e->getMessage()));
+            $logger->warning(sprintf('Error when logging in Superdesk: %s', $e->getMessage()));
 
-          continue;
+            continue;
+        }
         }
-      }
 
-      if (null === $superdeskUser) {
+        if (null === $superdeskUser) {
         return new SingleResourceResponse([
             'status' => 401,
             'message' => <<<'MESSAGE'
@@ -156,18 +156,18 @@ 
 Make sure that Publisher can talk to Superdesk instance. Set it's address in "SUPERDESK_SERVERS" environment variable.
 MESSAGE,
         ], new ResponseContext(401));
-      }
+        }
 
-      $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
-      if (null === $publisherUser) {
+        $publisherUser = $userProvider->findOneByEmail($superdeskUser['email']);
+        if (null === $publisherUser) {
         try {
-          $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
+            $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
         } catch (AuthenticationException $e) {
-          $publisherUser = null;
+            $publisherUser = null;
+        }
         }
-      }
 
-      if (null === $publisherUser) {
+        if (null === $publisherUser) {
         /** @var UserInterface $publisherUser */
         $publisherUser = $userManager->createUser();
         $publisherUser->setUsername($superdeskUser['username']);
@@ -177,20 +177,20 @@ 
         $publisherUser->setLastName(\array_key_exists('last_name', $superdeskUser) ? $superdeskUser['last_name'] : '');
         $publisherUser->setPassword(password_hash(random_bytes(36), PASSWORD_BCRYPT));
         $userManager->updateUser($publisherUser);
-      }
+        }
 
-      if (null !== $publisherUser) {
+        if (null !== $publisherUser) {
         return $this->returnApiTokenResponse($publisherUser, str_replace('Basic ', '', $formData['token']));
-      }
+        }
     }
 
     return new SingleResourceResponse([
         'status' => 401,
         'message' => 'Unauthorized',
     ], new ResponseContext(401));
-  }
+    }
 
-  private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface {
+    private function returnApiTokenResponse(UserInterface $user, string $token = null): SingleResourceResponseInterface {
     /** @var ApiKeyInterface $apiKey */
     $apiKey = $this->generateOrGetApiKey($user, $token);
 
@@ -201,36 +201,36 @@ 
         ],
         'user' => $user,
     ]);
-  }
+    }
 
-  private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface {
+    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface {
     $apiKey = null;
     if (null !== $token) {
-      $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
+        $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
     } else {
-      $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-      if (count($validKeys) > 0) {
+        $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
+        if (count($validKeys) > 0) {
         $apiKey = reset($validKeys);
-      }
+        }
     }
 
     if (null === $apiKey) {
-      $apiKey = $this->apiKeyFactory->create($user, $token);
+        $apiKey = $this->apiKeyFactory->create($user, $token);
 
-      try {
+        try {
         $lock = $this->lockFactory->createLock(md5(json_encode(['type' => 'user_api_key', 'user' => $user->getId()])), 2);
         if (!$lock->acquire()) {
-          throw new RuntimeException('Other api key is created right now for this user');
+            throw new RuntimeException('Other api key is created right now for this user');
         }
         $this->apiKeyRepository->add($apiKey);
         $lock->release();
-      } catch (RuntimeException $e) {
+        } catch (RuntimeException $e) {
         sleep(2);
 
         return $this->generateOrGetApiKey($user, $token);
-      }
+        }
     }
 
     return $apiKey;
-  }
+    }
 }

src/SWP/Bundle/CoreBundle/Controller/ContentListItemController.php

Indentation +91 added lines, -91 removed lines

@@ -44,35 +44,35 @@ 
 use FOS\RestBundle\Controller\Annotations\Route;
 
 class ContentListItemController extends AbstractController {
-  private ContentListItemRepositoryInterface $contentListItemRepository;
-  private EntityManagerInterface $entityManager;
-  private ContentListServiceInterface $contentListService;
-  private EventDispatcherInterface $eventDispatcher;
-
-  /**
-   * @param ContentListItemRepositoryInterface $contentListItemRepository
-   * @param EntityManagerInterface $entityManager
-   * @param ContentListServiceInterface $contentListService
-   * @param EventDispatcherInterface $eventDispatcher
-   */
-  public function __construct(ContentListItemRepositoryInterface                          $contentListItemRepository,
-                              EntityManagerInterface                                      $entityManager,
-                              ContentListServiceInterface                                 $contentListService,
-                              EventDispatcherInterface $eventDispatcher) {
+    private ContentListItemRepositoryInterface $contentListItemRepository;
+    private EntityManagerInterface $entityManager;
+    private ContentListServiceInterface $contentListService;
+    private EventDispatcherInterface $eventDispatcher;
+
+    /**
+     * @param ContentListItemRepositoryInterface $contentListItemRepository
+     * @param EntityManagerInterface $entityManager
+     * @param ContentListServiceInterface $contentListService
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(ContentListItemRepositoryInterface                          $contentListItemRepository,
+                                EntityManagerInterface                                      $entityManager,
+                                ContentListServiceInterface                                 $contentListService,
+                                EventDispatcherInterface $eventDispatcher) {
     $this->contentListItemRepository = $contentListItemRepository;
     $this->entityManager = $entityManager;
     $this->contentListService = $contentListService;
     $this->eventDispatcher = $eventDispatcher;
-  }
+    }
 
 
-  /**
-   * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"})
-   */
-  public function listAction(Request $request, int $id): ResourcesListResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{id}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_items", requirements={"id"="\d+"})
+     */
+    public function listAction(Request $request, int $id): ResourcesListResponseInterface {
     $sort = $request->query->all('sorting');
     if (empty($sort)) {
-      $sort = ['sticky' => 'desc'];
+        $sort = ['sticky' => 'desc'];
     }
 
     $items = $this->contentListItemRepository->getPaginatedByCriteria(
@@ -105,20 +105,20 @@ 
     );
 
     return new ResourcesListResponse($items, $responseContext);
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"})
-   */
-  public function getAction($listId, $id) {
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_show_lists_item", requirements={"id"="\d+"})
+     */
+    public function getAction($listId, $id) {
     return new SingleResourceResponse($this->findOr404($listId, $id));
-  }
+    }
 
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"})
-   */
-  public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId,
-                                       $id): SingleResourceResponseInterface {
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_lists_item", requirements={"id"="\d+", "listId"="\d+"})
+     */
+    public function updateAction(Request $request, FormFactoryInterface $formFactory, $listId,
+                                        $id): SingleResourceResponseInterface {
     $contentListItem = $this->findOr404($listId, $id);
     $form = $formFactory->createNamed(
         '',
@@ -130,59 +130,59 @@ 
     $form->handleRequest($request);
 
     if ($form->isSubmitted() && $form->isValid()) {
-      $contentListItem->getContentList()->setUpdatedAt(new DateTime());
+        $contentListItem->getContentList()->setUpdatedAt(new DateTime());
 
-      if (null !== $contentListItem->getStickyPosition()) {
+        if (null !== $contentListItem->getStickyPosition()) {
         $contentListItem->setPosition($contentListItem->getStickyPosition());
-      }
+        }
 
-      $this->entityManager->flush();
+        $this->entityManager->flush();
 
-      return new SingleResourceResponse($contentListItem);
+        return new SingleResourceResponse($contentListItem);
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
-
-  /**
-   * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"})
-   */
-  public function batchUpdateAction(
-      Request                        $request,
-      FormFactoryInterface           $formFactory,
-      ContentListRepositoryInterface $contentListRepository,
-      ArticleRepositoryInterface     $articleRepository,
-      EventDispatcherInterface       $eventDispatcher,
-      int                            $listId
-  ): SingleResourceResponseInterface {
+    }
+
+    /**
+     * @Route("/api/{version}/content/lists/{listId}/items/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_batch_update_lists_item", requirements={"listId"="\d+"})
+     */
+    public function batchUpdateAction(
+        Request                        $request,
+        FormFactoryInterface           $formFactory,
+        ContentListRepositoryInterface $contentListRepository,
+        ArticleRepositoryInterface     $articleRepository,
+        EventDispatcherInterface       $eventDispatcher,
+        int                            $listId
+    ): SingleResourceResponseInterface {
     /** @var ContentListInterface $list */
     $list = $contentListRepository->findOneBy(['id' => $listId]);
     if (null === $list) {
-      throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list));
+        throw new NotFoundHttpException(sprintf('Content list with id "%s" was not found.', $list));
     }
 
     $form = $formFactory->createNamed('', ContentListItemsType::class, [], ['method' => $request->getMethod()]);
 
     $form->handleRequest($request);
     if ($form->isSubmitted() && $form->isValid()) {
-      $data = $form->getData();
-      $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC'));
-      $updatedAt->setTimezone(new DateTimeZone('UTC'));
-      $listUpdatedAt = $list->getUpdatedAt();
-      $listUpdatedAt->setTimezone(new DateTimeZone('UTC'));
-      if ($updatedAt < $listUpdatedAt) {
+        $data = $form->getData();
+        $updatedAt = DateTime::createFromFormat(DateTime::RFC3339, $data['updatedAt'], new DateTimeZone('UTC'));
+        $updatedAt->setTimezone(new DateTimeZone('UTC'));
+        $listUpdatedAt = $list->getUpdatedAt();
+        $listUpdatedAt->setTimezone(new DateTimeZone('UTC'));
+        if ($updatedAt < $listUpdatedAt) {
         throw new ConflictHttpException('List was already updated');
-      }
+        }
 
-      $updatedArticles = [];
-      /** @var ContentListAction $item */
-      foreach ($data['items'] as $item) {
+        $updatedArticles = [];
+        /** @var ContentListAction $item */
+        foreach ($data['items'] as $item) {
         $position = $item->getPosition();
         $isSticky = $item->isSticky();
         $contentId = $item->getContentId();
 
         switch ($item->getAction()) {
-          case ContentListAction::ACTION_MOVE:
+            case ContentListAction::ACTION_MOVE:
             $updated = false;
             $contentListItem = $this->findByContentOr404($list, $contentId);
 
@@ -210,7 +210,7 @@ 
             $updatedArticles[$contentId] = $contentListItem->getContent();
 
             break;
-          case ContentListAction::ACTION_ADD:
+            case ContentListAction::ACTION_ADD:
             $this->ensureThereIsNoItemOnPositionOrThrow409(
                 $listId,
                 $position,
@@ -224,7 +224,7 @@ 
             $updatedArticles[$contentId] = $contentListItem->getContent();
 
             break;
-          case ContentListAction::ACTION_DELETE:
+            case ContentListAction::ACTION_DELETE:
             $contentListItem = $this->findByContentOr404($list, $contentId);
             $this->entityManager->remove($contentListItem);
             $list->setUpdatedAt(new DateTime('now'));
@@ -233,25 +233,25 @@ 
 
             break;
         }
-      }
+        }
 
-      $this->contentListService->repositionStickyItems($list);
+        $this->contentListService->repositionStickyItems($list);
 
-      foreach ($updatedArticles as $updatedArticle) {
+        foreach ($updatedArticles as $updatedArticle) {
         $eventDispatcher->dispatch(new ArticleEvent(
             $updatedArticle,
             $updatedArticle->getPackage(),
             ArticleEvents::POST_UPDATE
         ), ArticleEvents::POST_UPDATE);
-      }
+        }
 
-      return new SingleResourceResponse($list, new ResponseContext(201));
+        return new SingleResourceResponse($list, new ResponseContext(201));
     }
 
     return new SingleResourceResponse($form, new ResponseContext(400));
-  }
+    }
 
-  private function findByContentOr404($listId, $contentId): ContentListItemInterface {
+    private function findByContentOr404($listId, $contentId): ContentListItemInterface {
     /** @var ContentListItemInterface $listItem */
     $listItem = $this->contentListItemRepository->findOneBy([
         'contentList' => $listId,
@@ -259,13 +259,13 @@ 
     ]);
 
     if (null === $listItem) {
-      throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId));
+        throw new NotFoundHttpException(sprintf('Content list item with content_id "%s" was not found on that list. If You want to add new item - use action type "add".', $contentId));
     }
 
     return $listItem;
-  }
+    }
 
-  private function findOr404($listId, $id): ContentListItemInterface {
+    private function findOr404($listId, $id): ContentListItemInterface {
     /** @var ContentListItemInterface $listItem */
     $listItem = $this->contentListItemRepository->findOneBy([
         'contentList' => $listId,
@@ -273,29 +273,29 @@ 
     ]);
 
     if (null === $listItem) {
-      throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id));
+        throw new NotFoundHttpException(sprintf('Content list item with id "%s" was not found.', $id));
     }
 
     return $listItem;
-  }
+    }
 
-  private function ensureThereIsNoItemOnPositionOrThrow409(
-      int $listId,
-      int $position,
-      bool $isSticky,
-      string $action): void {
-      $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position);
+    private function ensureThereIsNoItemOnPositionOrThrow409(
+        int $listId,
+        int $position,
+        bool $isSticky,
+        string $action): void {
+        $existingContentListItem = $this->contentListService->isAnyItemPinnedOnPosition($listId, $position);
 
-      if (!$existingContentListItem && !$isSticky) {
-          return;
-      }
+        if (!$existingContentListItem && !$isSticky) {
+            return;
+        }
 
-      if ($existingContentListItem && $existingContentListItem->isSticky()) {
+        if ($existingContentListItem && $existingContentListItem->isSticky()) {
         throw new ConflictHttpException('There is already an item pinned on that position. Unpin it first.');
-      }
+        }
 
-      if ($action === ContentListAction::ACTION_MOVE && $isSticky) {
-          throw new ConflictHttpException('Cannot move pinned item. Unpin it first.');
-      }
-  }
+        if ($action === ContentListAction::ACTION_MOVE && $isSticky) {
+            throw new ConflictHttpException('Cannot move pinned item. Unpin it first.');
+        }
+    }
 }