From c4e4d1dbe9b0af34072186d31483b0b96581a529 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 6 Jul 2018 18:03:54 +0200 Subject: [PATCH] Revert "PHRAS-2086_AdobeCC-AppToken_4.1" --- .../Command/Developer/RegenerateSqliteDb.php | 15 --- .../Core/Event/Listener/OAuthListener.php | 6 -- .../Subscriber/PhraseaInstallSubscriber.php | 19 ---- lib/Alchemy/Phrasea/Core/Version.php | 2 +- .../API/OAuth2/Application/AdobeCCPlugin.php | 17 ---- lib/classes/patch/410alpha10a.php | 91 ------------------- 6 files changed, 1 insertion(+), 149 deletions(-) delete mode 100644 lib/classes/API/OAuth2/Application/AdobeCCPlugin.php delete mode 100644 lib/classes/patch/410alpha10a.php diff --git a/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php b/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php index 9d1f07394f..a6d9606dee 100644 --- a/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php +++ b/lib/Alchemy/Phrasea/Command/Developer/RegenerateSqliteDb.php @@ -251,21 +251,6 @@ class RegenerateSqliteDb extends Command $application->setClientSecret(\API_OAuth2_Application_OfficePlugin::CLIENT_SECRET); $this->container['manipulator.api-application']->update($application); - - $application = $this->container['manipulator.api-application']->create( - \API_OAuth2_Application_AdobeCCPlugin::CLIENT_NAME, - ApiApplication::DESKTOP_TYPE, - '', - 'http://www.phraseanet.com', - null, - ApiApplication::NATIVE_APP_REDIRECT_URI - ); - - $application->setGrantPassword(true); - $application->setClientId(\API_OAuth2_Application_AdobeCCPlugin::CLIENT_ID); - $application->setClientSecret(\API_OAuth2_Application_AdobeCCPlugin::CLIENT_SECRET); - - $this->container['manipulator.api-application']->update($application); } private function insertAuthFailures(EntityManager $em, \Pimple $DI) diff --git a/lib/Alchemy/Phrasea/Core/Event/Listener/OAuthListener.php b/lib/Alchemy/Phrasea/Core/Event/Listener/OAuthListener.php index 1ccbd0580a..ee8535f834 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Listener/OAuthListener.php +++ b/lib/Alchemy/Phrasea/Core/Event/Listener/OAuthListener.php @@ -89,12 +89,6 @@ class OAuthListener return Result::createError($request, 403, 'The use of Office Plugin is not allowed.')->createResponse(); } - if ($oAuth2App->getClientId() == \API_OAuth2_Application_AdobeCCPlugin::CLIENT_ID - && !$conf->get(['registry', 'api-clients', 'adobe_cc-enabled']) - ) { - return Result::createError($request, 403, 'The use of AdobeCC Plugin is not allowed.')->createResponse(); - } - $authentication = $this->getAuthenticator($app); if ($authentication->isAuthenticated()) { diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaInstallSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaInstallSubscriber.php index 74912721b5..91d7efaaac 100644 --- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaInstallSubscriber.php +++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaInstallSubscriber.php @@ -38,7 +38,6 @@ class PhraseaInstallSubscriber implements EventSubscriberInterface { $this->createNavigatorApplication(); $this->createOfficePluginApplication(); - $this->createAdobeCCPluginApplication(); $this->generateProxies(); } @@ -78,24 +77,6 @@ class PhraseaInstallSubscriber implements EventSubscriberInterface $this->app['manipulator.api-application']->update($application); } - private function createAdobeCCPluginApplication() - { - $application = $this->app['manipulator.api-application']->create( - \API_OAuth2_Application_AdobeCCPlugin::CLIENT_NAME, - ApiApplication::DESKTOP_TYPE, - '', - 'http://www.phraseanet.com', - null, - ApiApplication::NATIVE_APP_REDIRECT_URI - ); - - $application->setGrantPassword(true); - $application->setClientId(\API_OAuth2_Application_adobeCCPlugin::CLIENT_ID); - $application->setClientSecret(\API_OAuth2_Application_adobeCCPlugin::CLIENT_SECRET); - - $this->app['manipulator.api-application']->update($application); - } - private function generateProxies() { $process = new Process('php ' . $this->app['root.path']. '/bin/developer orm:generate:proxies'); diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index f42332439b..1fbafcb5b7 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,7 +16,7 @@ class Version /** * @var string */ - private $number = '4.1.0-alpha.10'; + private $number = '4.1.0-alpha.9'; /** * @var string diff --git a/lib/classes/API/OAuth2/Application/AdobeCCPlugin.php b/lib/classes/API/OAuth2/Application/AdobeCCPlugin.php deleted file mode 100644 index e131df96a2..0000000000 --- a/lib/classes/API/OAuth2/Application/AdobeCCPlugin.php +++ /dev/null @@ -1,17 +0,0 @@ -release; - } - - /** - * {@inheritdoc} - */ - public function getDoctrineMigrations() - { - return []; - } - - /** - * {@inheritdoc} - */ - public function require_all_upgrades() - { - return false; - } - - /** - * {@inheritdoc} - */ - public function concern() - { - return $this->concern; - } - - /** - * {@inheritdoc} - */ - public function apply(base $databox, Application $app) - { - // create an api application for adobeCC - - /** @var ApiApplicationRepository $repo */ - $repo = $app['repo.api-applications']; - if(!$repo->findByClientId(\API_OAuth2_Application_adobeCCPlugin::CLIENT_ID)) { - - /** @var ApiApplicationManipulator $manipulator */ - $manipulator = $app['manipulator.api-application']; - - $application = $manipulator->create( - \API_OAuth2_Application_adobeCCPlugin::CLIENT_NAME, - ApiApplication::DESKTOP_TYPE, - '', - 'http://www.phraseanet.com', - null, - ApiApplication::NATIVE_APP_REDIRECT_URI - ); - - $application->setGrantPassword(true); - $application->setClientId(\API_OAuth2_Application_adobeCCPlugin::CLIENT_ID); - $application->setClientSecret(\API_OAuth2_Application_adobeCCPlugin::CLIENT_SECRET); - - $manipulator->update($application); - } - - return true; - } -}