X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FImportBundle%2FController%2FPocketController.php;h=1c1b4fa889f6a1919f722cba934d07098e8a196f;hb=b60bff0c2a25b05399b53579e660abc41a7ba6d5;hp=9602c2823b621092bbefc6ce8e31402b0bb0cf30;hpb=557e549db7932e9101f60bfda64238a235a0ce3b;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php
index 9602c282..1c1b4fa8 100644
--- a/src/Wallabag/ImportBundle/Controller/PocketController.php
+++ b/src/Wallabag/ImportBundle/Controller/PocketController.php
@@ -3,38 +3,65 @@
 namespace Wallabag\ImportBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Wallabag\ImportBundle\Import\PocketImport;
 
 class PocketController extends Controller
 {
     /**
-     * @Route("/import", name="import")
+     * @Route("/pocket", name="import_pocket")
      */
-    public function importAction()
+    public function indexAction()
     {
-        return $this->render('WallabagImportBundle:Pocket:index.html.twig', array());
+        return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
+            'import' => $this->get('wallabag_import.pocket.import'),
+            'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true,
+        ]);
     }
 
     /**
-     * @Route("/auth-pocket", name="authpocket")
+     * @Route("/pocket/auth", name="import_pocket_auth")
      */
     public function authAction()
     {
-        $pocket = $this->get('wallabag_import.import.pocket_import');
-        $authUrl = $pocket->oAuthRequest($this->generateUrl('import', array(), true), $this->generateUrl('callbackpocket', array(), true));
+        $requestToken = $this->get('wallabag_import.pocket.import')
+            ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
 
-        return $this->redirect($authUrl, 301);
+        $this->get('session')->set('import.pocket.code', $requestToken);
+
+        return $this->redirect(
+            'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
+            301
+        );
     }
 
     /**
-     * @Route("/callback-pocket", name="callbackpocket")
+     * @Route("/pocket/callback", name="import_pocket_callback")
      */
     public function callbackAction()
     {
-        $pocket = $this->get('wallabag_import.import.pocket_import');
-        $accessToken = $pocket->oAuthAuthorize();
-        $pocket->import($accessToken);
+        $message = 'Import failed, please try again.';
+        $pocket = $this->get('wallabag_import.pocket.import');
+
+        // something bad happend on pocket side
+        if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) {
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                $message
+            );
+
+            return $this->redirect($this->generateUrl('import_pocket'));
+        }
+
+        if (true === $pocket->import()) {
+            $summary = $pocket->getSummary();
+            $message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.';
+        }
+
+        $this->get('session')->getFlashBag()->add(
+            'notice',
+            $message
+        );
 
         return $this->redirect($this->generateUrl('homepage'));
     }