From 303768dfe9b85f87d043eb225c5c8c3a88d8c051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Mon, 26 Oct 2015 15:49:44 +0100
Subject: - remove importers configuration - add check on userId for
 findOneByURL for entries

---
 .../DependencyInjection/Configuration.php          | 17 ---------------
 .../WallabagImportExtension.php                    |  1 -
 src/Wallabag/ImportBundle/Import/PocketImport.php  | 24 +++++++++-------------
 .../ImportBundle/Resources/config/services.yml     |  1 -
 4 files changed, 10 insertions(+), 33 deletions(-)

(limited to 'src/Wallabag/ImportBundle')

diff --git a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
index 3c14104e..bacaff31 100644
--- a/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/ImportBundle/DependencyInjection/Configuration.php
@@ -2,7 +2,6 @@
 
 namespace Wallabag\ImportBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
@@ -13,22 +12,6 @@ class Configuration implements ConfigurationInterface
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('wallabag_import');
 
-        $rootNode
-            ->children()
-                ->arrayNode('importers')
-                    ->append($this->getURLs())
-                ->end()
-            ->end()
-        ;
-
         return $treeBuilder;
     }
-
-    private function getURLs()
-    {
-        $node = new ArrayNodeDefinition('pocket_urls');
-        $node->prototype('scalar')->end();
-
-        return $node;
-    }
 }
diff --git a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
index 07dc378d..4efcaace 100644
--- a/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
+++ b/src/Wallabag/ImportBundle/DependencyInjection/WallabagImportExtension.php
@@ -13,7 +13,6 @@ class WallabagImportExtension extends Extension
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-        $container->setParameter('wallabag_import.pocket', $config['importers']['pocket_urls']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 51f73f4c..dd1c34ab 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -15,19 +15,15 @@ class PocketImport implements ImportInterface
     private $session;
     private $em;
     private $consumerKey;
-    private $skippedEntries;
-    private $importedEntries;
-    private $pocketURL;
+    private $skippedEntries = 0;
+    private $importedEntries = 0;
 
-    public function __construct($tokenStorage, Session $session, EntityManager $em, $consumerKey, $pocketURL)
+    public function __construct($tokenStorage, Session $session, EntityManager $em, $consumerKey)
     {
         $this->user = $tokenStorage->getToken()->getUser();
         $this->session = $session;
         $this->em = $em;
         $this->consumerKey = $consumerKey;
-        $this->skippedEntries = 0;
-        $this->importedEntries = 0;
-        $this->pocketURL = $pocketURL;
     }
 
     public function getName()
@@ -121,9 +117,9 @@ class PocketImport implements ImportInterface
 
             $existingEntry = $this->em
                 ->getRepository('WallabagCoreBundle:Entry')
-                ->findOneByUrl($url);
+                ->findOneByUrlAndUserId($url, $this->user->getId());
 
-            if (!is_null($existingEntry)) {
+            if (count($existingEntry) > 0) {
                 ++$this->skippedEntries;
                 continue;
             }
@@ -153,7 +149,7 @@ class PocketImport implements ImportInterface
             }
 
             if (!empty($pocketEntry['tags'])) {
-                //   $this->assignTagsToEntry($entry, $pocketEntry['tags']);
+                $this->assignTagsToEntry($entry, $pocketEntry['tags']);
             }
 
             $this->em->persist($entry);
@@ -166,7 +162,7 @@ class PocketImport implements ImportInterface
     public function oAuthRequest($redirectUri, $callbackUri)
     {
         $client = $this->createClient();
-        $request = $client->createRequest('POST', $this->pocketURL['oauth_request'],
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
@@ -181,14 +177,14 @@ class PocketImport implements ImportInterface
         // store code in session for callback method
         $this->session->set('pocketCode', $values['code']);
 
-        return $this->pocketURL['auth_authorize'].'?request_token='.$values['code'].'&redirect_uri='.$callbackUri;
+        return 'https://getpocket.com/auth/authorize?request_token='.$values['code'].'&redirect_uri='.$callbackUri;
     }
 
     public function oAuthAuthorize()
     {
         $client = $this->createClient();
 
-        $request = $client->createRequest('POST', $this->pocketURL['oauth_authorize'],
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
@@ -206,7 +202,7 @@ class PocketImport implements ImportInterface
     {
         $client = $this->createClient();
 
-        $request = $client->createRequest('POST', $this->pocketURL['get'],
+        $request = $client->createRequest('POST', 'https://getpocket.com/v3/get',
             [
                 'body' => json_encode([
                     'consumer_key' => $this->consumerKey,
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index 8f224d88..82628f08 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -6,4 +6,3 @@ services:
             - @session
             - @doctrine.orm.entity_manager
             - %pocket_consumer_key%
-            - %wallabag_import.pocket%
-- 
cgit v1.2.3