superdesk / web-publisher

src/SWP/Bundle/UserBundle/Command/CreateUserCommand.php

Spacing +3 added lines, -3 removed lines

@@ -102,7 +102,7 @@ 
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function ($username) {
+            $question->setValidator(function($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -114,7 +114,7 @@ 
 
         if (!$input->getArgument('email')) {
             $question = new Question('Please choose an email:');
-            $question->setValidator(function ($email) {
+            $question->setValidator(function($email) {
                 if (empty($email)) {
                     throw new \Exception('Email can not be empty');
                 }
@@ -126,7 +126,7 @@ 
 
         if (!$input->getArgument('password')) {
             $question = new Question('Please choose a password:');
-            $question->setValidator(function ($password) {
+            $question->setValidator(function($password) {
                 if (empty($password)) {
                     throw new \Exception('Password can not be empty');
                 }

src/SWP/Bundle/UserBundle/Controller/ResetPasswordController.php

Indentation +3 added lines, -3 removed lines

@@ -160,9 +160,9 @@
             $resetToken = $this->resetPasswordHelper->generateResetToken($user);
         } catch (ResetPasswordExceptionInterface $e) {
             $this->addFlash('reset_password_error', sprintf(
-                 'There was a problem handling your password reset request - %s',
-                 $e->getReason()
-             ));
+                    'There was a problem handling your password reset request - %s',
+                    $e->getReason()
+                ));
 
             return $this->redirectToRoute('swp_user_check_email');
         }

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

Indentation -84 removed lines

@@ -133,87 +133,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-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) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $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) {
-                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
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            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');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Switch Indentation -84 removed lines

@@ -133,87 +133,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-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) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $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) {
-                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
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            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');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Spacing -84 removed lines

@@ -133,87 +133,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-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) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $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) {
-                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
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            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');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Braces -84 removed lines

@@ -133,87 +133,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-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) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $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) {
-                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
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            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');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

Upper-Lower-Casing -84 removed lines

@@ -133,87 +133,3 @@
                 return new SingleResourceResponse([
                     'status' => 401,
                     'message' => <<<'MESSAGE'
-Unauthorized (user not found in Superdesk). 
-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) {
-                try {
-                    $publisherUser = $userProvider->loadUserByUsername($superdeskUser['username']);
-                } catch (UsernameNotFoundException $e) {
-                    $publisherUser = null;
-                }
-            }
-
-            if (null === $publisherUser) {
-                /** @var UserInterface $publisherUser */
-                $publisherUser = $userManager->createUser();
-                $publisherUser->setUsername($superdeskUser['username']);
-                $publisherUser->setEmail($superdeskUser['email']);
-                $publisherUser->setRoles(['ROLE_INTERNAL_API']);
-                $publisherUser->setFirstName(\array_key_exists('first_name', $superdeskUser) ? $superdeskUser['first_name'] : 'Anon.');
-                $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) {
-                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
-    {
-        /** @var ApiKeyInterface $apiKey */
-        $apiKey = $this->generateOrGetApiKey($user, $token);
-
-        return new SingleResourceResponse([
-            'token' => [
-                'api_key' => $apiKey->getApiKey(),
-                'valid_to' => $apiKey->getValidTo(),
-            ],
-            'user' => $user,
-        ]);
-    }
-
-    private function generateOrGetApiKey(UserInterface $user, $token): ?ApiKeyInterface
-    {
-        $apiKey = null;
-        if (null !== $token) {
-            $apiKey = $this->apiKeyRepository->getValidToken($token)->getQuery()->getOneOrNullResult();
-        } else {
-            $validKeys = $this->apiKeyRepository->getValidTokenForUser($user)->getQuery()->getResult();
-            if (count($validKeys) > 0) {
-                $apiKey = reset($validKeys);
-            }
-        }
-
-        if (null === $apiKey) {
-            $apiKey = $this->apiKeyFactory->create($user, $token);
-
-            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');
-                }
-                $this->apiKeyRepository->add($apiKey);
-                $lock->release();
-            } catch (RuntimeException $e) {
-                sleep(2);
-
-                return $this->generateOrGetApiKey($user, $token);
-            }
-        }
-
-        return $apiKey;
-    }
-}

src/SWP/Bundle/CoreBundle/DependencyInjection/Compiler/OverrideThemeAssetsInstallerPass.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             AssetsInstaller::class
         );
 
-        if($newDefinition = $this->getDefinitionIfExists($container, AssetsInstallerInterface::class)) {
+        if ($newDefinition = $this->getDefinitionIfExists($container, AssetsInstallerInterface::class)) {
             $newDefinition->setArgument(4, new Reference(ThemeHierarchyProviderInterface::class));
         }
     }

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $tenantCode = $tenant->getCode();
         $themes = array_filter(
             $themeRepository->findAll(),
-            static function ($element) use (&$tenantCode) {
+            static function($element) use (&$tenantCode) {
                 if (strpos($element->getName(), ThemeHelper::SUFFIX_SEPARATOR.$tenantCode)) {
                     return true;
                 }

src/SWP/Bundle/CoreBundle/Theme/Loader/TenantAwareThemeLoader.php

Spacing +4 added lines, -4 removed lines

@@ -142,7 +142,7 @@ 
             }
             $themes[$themeName] = $theme;
 
-            if(isset($configuration['generatedData'])) {
+            if (isset($configuration['generatedData'])) {
                 $theme->setGeneratedData($configuration['generatedData']);
             }
         }
@@ -175,7 +175,7 @@ 
     {
         $tenantCode = substr($themeName, strpos($themeName, '@') + 1);
 
-        return array_map(function ($parentName) use ($themeName, $existingThemes, $tenantCode) {
+        return array_map(function($parentName) use ($themeName, $existingThemes, $tenantCode) {
             $parentName .= '@'.$tenantCode;
             if (!isset($existingThemes[$parentName])) {
                 throw new ThemeLoadingFailedException(sprintf(
@@ -196,7 +196,7 @@ 
      */
     private function convertAuthorsArraysToAuthorsObjects(array $authorsArrays)
     {
-        return array_map(function (array $authorArray) {
+        return array_map(function(array $authorArray) {
             return $this->themeAuthorFactory->createFromArray($authorArray);
         }, $authorsArrays);
     }
@@ -208,7 +208,7 @@ 
      */
     private function convertScreenshotsArraysToScreenshotsObjects(array $screenshotsArrays)
     {
-        return array_map(function (array $screenshotArray) {
+        return array_map(function(array $screenshotArray) {
             return $this->themeScreenshotFactory->createFromArray($screenshotArray);
         }, $screenshotsArrays);
     }