Revert "PHRAS-2086_AdobeCC-AppToken_4.1"

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)

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()) {

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');

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

lib/classes/API/OAuth2/Application/AdobeCCPlugin.php

@@ -1,17 +0,0 @@
-<?php
-
-/*
- * This file is part of Phraseanet
- *
- * (c) 2005-2016 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class API_OAuth2_Application_adobeCCPlugin
-{
-    const CLIENT_ID = '\alchemy\phraseanet\id\YZWUTqNyq8ObG4b0o4sp7NX50ScudqiV';
-    const CLIENT_SECRET = '\alchemy\phraseanet\secret\nEpZd3O6Mk2ijQWiXsm7wPNKnFrbv7MO';
-    const CLIENT_NAME = 'adobe_cc-plugin';
-}

lib/classes/patch/410alpha10a.php

@@ -1,91 +0,0 @@
-<?php
-
-/**
- * This file is part of Phraseanet
- *
- * (c) 2005-2016 Alchemy
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Core\Configuration\PropertyAccess;
-use Alchemy\Phrasea\Model\Manipulator\ApiApplicationManipulator;
-use Alchemy\Phrasea\Model\Entities\ApiApplication;
-use Alchemy\Phrasea\Model\Repositories\ApiApplicationRepository;
-
-
-class patch_410alpha10a implements patchInterface
-{
-    /** @var string */
-    private $release = '4.1.0-alpha.10';
-
-    /** @var array */
-    private $concern = [base::APPLICATION_BOX];
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get_release()
-    {
-        return $this->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;
-    }
-}