superdesk / web-publisher

src/SWP/Bundle/CoreBundle/MessageHandler/Message/ContentPushMessage.php

Indentation +2 added lines, -2 removed lines

@@ -43,8 +43,8 @@
     public function toArray(): array
     {
         return [
-          'tenant' => $this->tenantId,
-          'content' => $this->content,
+            'tenant' => $this->tenantId,
+            'content' => $this->content,
         ];
     }
 }

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;
-    }
-}