7 files changed, 202 insertions, 105 deletions

diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Wallabag/CoreBundle/Tools/Utils.php
index b146d98b..b501ce65 100644
--- a/src/Wallabag/CoreBundle/Tools/Utils.php
+++ b/src/Wallabag/CoreBundle/Tools/Utils.php
@@ -28,6 +28,7 @@ class Utils
 
     /**
      * @param $words
+     *
      * @return float
      */
     public static function convertWordsToMinutes($words)
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index ffd0c9ab..76d8417b 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -4,10 +4,7 @@ namespace Wallabag\ImportBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Symfony\Component\HttpFoundation\Request;
-use GuzzleHttp\Client;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\ImportBundle\Import\PocketImport;
 
 class PocketController extends Controller
 {
@@ -20,48 +17,14 @@ class PocketController extends Controller
     }
 
     /**
-     * Create a new Client.
-     *
-     * @return Client
-     */
-    private function createClient()
-    {
-        return new Client([
-            'defaults' => [
-                'headers' => [
-                    'content-type' => 'application/json',
-                    'X-Accept' => 'application/json',
-                ],
-            ],
-        ]);
-    }
-
-    /**
      * @Route("/auth-pocket", name="authpocket")
      */
     public function authAction()
     {
-        $client = $this->createClient();
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'redirect_uri' => $this->generateUrl('import', array(), true),
-                ]),
-            ]
-        );
-
-        $response = $client->send($request);
-        $values = $response->json();
-        $code = $values['code'];
-
-        // store code in session for callback method
-        $session = $this->get('session');
-        $session->set('pocketCode',  $code);
+        $pocket = new PocketImport($this->get('security.token_storage'), $this->get('session'), $this->getDoctrine()->getManager(), $this->container->getParameter('pocket_consumer_key'));
+        $authUrl = $pocket->oAuthRequest($this->generateUrl('import', array(), true), $this->generateUrl('callbackpocket', array(), true));
 
-        $url = 'https://getpocket.com/auth/authorize?request_token='.$code.'&redirect_uri='.$this->generateUrl('callbackpocket', array(), true);
-
-        return $this->redirect($url, 301);
+        return $this->redirect($authUrl, 301);
     }
 
     /**
@@ -69,71 +32,10 @@ class PocketController extends Controller
      */
     public function callbackAction()
     {
-        $client = $this->createClient();
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'code' => $this->get('session')->get('pocketCode'),
-                ]),
-            ]
-        );
-
-        $response = $client->send($request);
-        $values = $response->json();
-        $accessToken = $values['access_token'];
-
-        $request = $client->createRequest('POST', 'https://getpocket.com/v3/get',
-            [
-                'body' => json_encode([
-                    'consumer_key' => $this->container->getParameter('pocket_consumer_key'),
-                    'access_token' => $accessToken,
-                    'detailType' => 'complete',
-                ]),
-            ]
-        );
-
-        $response = $client->send($request);
-        $entries = $response->json();
-
-        $this->parsePocketEntries($entries['list']);
-
-        $this->get('session')->getFlashBag()->add(
-            'notice',
-            count($entries['list']).' entries imported'
-        );
+        $pocket = new PocketImport($this->get('security.token_storage'), $this->get('session'), $this->getDoctrine()->getManager(), $this->container->getParameter('pocket_consumer_key'));
+        $accessToken = $pocket->oAuthAuthorize();
+        $pocket->import($accessToken);
 
         return $this->redirect($this->generateUrl('homepage'));
     }
-
-    /**
-     * @param $entries
-     */
-    private function parsePocketEntries($entries)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        foreach ($entries as $entry) {
-            $newEntry = new Entry($this->getUser());
-            $newEntry->setUrl($entry['given_url']);
-            $newEntry->setTitle(isset($entry['resolved_title']) ? $entry['resolved_title'] : (isset($entry['given_title']) ? $entry['given_title'] : 'Untitled'));
-
-            if (isset($entry['excerpt'])) {
-                $newEntry->setContent($entry['excerpt']);
-            }
-
-            if (isset($entry['has_image']) && $entry['has_image'] > 0) {
-                $newEntry->setPreviewPicture($entry['image']['src']);
-            }
-
-            if (isset($entry['word_count'])) {
-                $newEntry->setReadingTime(Utils::convertWordsToMinutes($entry['word_count']));
-            }
-
-            $em->persist($newEntry);
-        }
-
-        $em->flush();
-    }
 }
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
new file mode 100644
index 00000000..bacaff31
--- /dev/null
+++ b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Wallabag\ImportBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('wallabag_import');
+
+        return $treeBuilder;
+    }
+}
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
new file mode 100644
index 00000000..4efcaace
--- /dev/null
+++ b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Wallabag\ImportBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+
+class WallabagImportExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader->load('services.yml');
+    }
+
+    public function getAlias()
+    {
+        return 'wallabag_import';
+    }
+}
diff --git a/src/Wallabag/ImportBundle/Import/ImportInterface.php b/src/Wallabag/ImportBundle/Import/ImportInterface.php
new file mode 100644
index 00000000..88de3fa8
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Import/ImportInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Wallabag\ImportBundle\Import;
+
+interface ImportInterface
+{
+    public function oAuthRequest($redirectUri, $callbackUri);
+    public function oAuthAuthorize();
+    public function import($accessToken);
+}
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
new file mode 100644
index 00000000..413c9ccc
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Wallabag\ImportBundle\Import;
+
+use Doctrine\ORM\EntityManager;
+use GuzzleHttp\Client;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Tools\Utils;
+
+class PocketImport implements ImportInterface
+{
+    private $user;
+    private $session;
+    private $em;
+    private $consumerKey;
+
+    public function __construct($tokenStorage, Session $session, EntityManager $em, $consumerKey)
+    {
+        $this->user = $tokenStorage->getToken()->getUser();
+        $this->session = $session;
+        $this->em = $em;
+        $this->consumerKey = $consumerKey;
+    }
+
+    /**
+     * Create a new Client.
+     *
+     * @return Client
+     */
+    private function createClient()
+    {
+        return new Client([
+            'defaults' => [
+                'headers' => [
+                    'content-type' => 'application/json',
+                    'X-Accept' => 'application/json',
+                ],
+            ],
+        ]);
+    }
+
+    /**
+     * @param $entries
+     */
+    private function parsePocketEntries($entries)
+    {
+        foreach ($entries as $entry) {
+            $newEntry = new Entry($this->user);
+            $newEntry->setUrl($entry['given_url']);
+            $newEntry->setTitle(isset($entry['resolved_title']) ? $entry['resolved_title'] : (isset($entry['given_title']) ? $entry['given_title'] : 'Untitled'));
+
+            if (isset($entry['excerpt'])) {
+                $newEntry->setContent($entry['excerpt']);
+            }
+
+            if (isset($entry['has_image']) && $entry['has_image'] > 0) {
+                $newEntry->setPreviewPicture($entry['image']['src']);
+            }
+
+            if (isset($entry['word_count'])) {
+                $newEntry->setReadingTime(Utils::convertWordsToMinutes($entry['word_count']));
+            }
+
+            $this->em->persist($newEntry);
+        }
+
+        $this->em->flush();
+    }
+
+    public function oAuthRequest($redirectUri, $callbackUri)
+    {
+        $client = $this->createClient();
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
+            [
+                'body' => json_encode([
+                    'consumer_key' => $this->consumerKey,
+                    'redirect_uri' => $redirectUri,
+                ]),
+            ]
+        );
+
+        $response = $client->send($request);
+        $values = $response->json();
+
+        // store code in session for callback method
+        $this->session->set('pocketCode', $values['code']);
+
+        return 'https://getpocket.com/auth/authorize?request_token='.$values['code'].'&redirect_uri='.$callbackUri;
+    }
+
+    public function oAuthAuthorize()
+    {
+        $client = $this->createClient();
+
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
+            [
+                'body' => json_encode([
+                    'consumer_key' => $this->consumerKey,
+                    'code' => $this->session->get('pocketCode'),
+                ]),
+            ]
+        );
+
+        $response = $client->send($request);
+
+        return $response->json()['access_token'];
+    }
+
+    public function import($accessToken)
+    {
+        $client = $this->createClient();
+
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/get',
+            [
+                'body' => json_encode([
+                    'consumer_key' => $this->consumerKey,
+                    'access_token' => $accessToken,
+                    'detailType' => 'complete',
+                ]),
+            ]
+        );
+
+        $response = $client->send($request);
+        $entries = $response->json();
+
+        $this->parsePocketEntries($entries['list']);
+
+        $this->session->getFlashBag()->add(
+            'notice',
+            count($entries['list']).' entries imported'
+        );
+    }
+}
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
new file mode 100644
index 00000000..82628f08
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -0,0 +1,8 @@
+services:
+    wallabag_import.import.pocket_import:
+        class: Wallabag\ImportBundle\Import\PocketImport
+        arguments:
+            - @security.token_storage
+            - @session
+            - @doctrine.orm.entity_manager
+            - %pocket_consumer_key%