diff options
Diffstat (limited to 'src/Wallabag/ImportBundle')
5 files changed, 21 insertions, 4 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 7aee302f..1c1b4fa8 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -15,6 +15,7 @@ class PocketController extends Controller | |||
15 | { | 15 | { |
16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ | 16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', [ |
17 | 'import' => $this->get('wallabag_import.pocket.import'), | 17 | 'import' => $this->get('wallabag_import.pocket.import'), |
18 | 'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true, | ||
18 | ]); | 19 | ]); |
19 | } | 20 | } |
20 | 21 | ||
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 617d5514..22932238 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php | |||
@@ -11,6 +11,7 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt | |||
11 | use Wallabag\CoreBundle\Entity\Entry; | 11 | use Wallabag\CoreBundle\Entity\Entry; |
12 | use Wallabag\CoreBundle\Entity\Tag; | 12 | use Wallabag\CoreBundle\Entity\Tag; |
13 | use Wallabag\CoreBundle\Helper\ContentProxy; | 13 | use Wallabag\CoreBundle\Helper\ContentProxy; |
14 | use Craue\ConfigBundle\Util\Config; | ||
14 | 15 | ||
15 | class PocketImport implements ImportInterface | 16 | class PocketImport implements ImportInterface |
16 | { | 17 | { |
@@ -24,12 +25,12 @@ class PocketImport implements ImportInterface | |||
24 | private $importedEntries = 0; | 25 | private $importedEntries = 0; |
25 | protected $accessToken; | 26 | protected $accessToken; |
26 | 27 | ||
27 | public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) | 28 | public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, Config $craueConfig) |
28 | { | 29 | { |
29 | $this->user = $tokenStorage->getToken()->getUser(); | 30 | $this->user = $tokenStorage->getToken()->getUser(); |
30 | $this->em = $em; | 31 | $this->em = $em; |
31 | $this->contentProxy = $contentProxy; | 32 | $this->contentProxy = $contentProxy; |
32 | $this->consumerKey = $consumerKey; | 33 | $this->consumerKey = $craueConfig->get('pocket_consumer_key'); |
33 | $this->logger = new NullLogger(); | 34 | $this->logger = new NullLogger(); |
34 | } | 35 | } |
35 | 36 | ||
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index 6a11892e..e0942b1a 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml | |||
@@ -17,7 +17,7 @@ services: | |||
17 | - "@security.token_storage" | 17 | - "@security.token_storage" |
18 | - "@doctrine.orm.entity_manager" | 18 | - "@doctrine.orm.entity_manager" |
19 | - "@wallabag_core.content_proxy" | 19 | - "@wallabag_core.content_proxy" |
20 | - %pocket_consumer_key% | 20 | - "@craue_config" |
21 | calls: | 21 | calls: |
22 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] | 22 | - [ setClient, [ "@wallabag_import.pocket.client" ] ] |
23 | - [ setLogger, [ "@logger" ]] | 23 | - [ setLogger, [ "@logger" ]] |
diff --git a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig index 643ad775..e0e36f38 100644 --- a/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig +++ b/src/Wallabag/ImportBundle/Resources/views/Pocket/index.html.twig | |||
@@ -5,6 +5,12 @@ | |||
5 | <div class="row"> | 5 | <div class="row"> |
6 | <div class="col s12"> | 6 | <div class="col s12"> |
7 | <div class="card-panel settings"> | 7 | <div class="card-panel settings"> |
8 | {% if not has_consumer_key %} | ||
9 | <div class="card-panel red darken-1"> | ||
10 | {% trans %}Pocket import isn't configured. You need to define pocket_consumer_key.{% endtrans %} | ||
11 | </div> | ||
12 | {% endif %} | ||
13 | |||
8 | <blockquote>{{ import.description|trans }}</blockquote> | 14 | <blockquote>{{ import.description|trans }}</blockquote> |
9 | <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p> | 15 | <p>{% trans %}You can import your data from your Pocket account. You just have to click on the below button and authorize the application to connect to getpocket.com.{% endtrans %}</p> |
10 | <form method="post" action="{{ path('import_pocket_auth') }}"> | 16 | <form method="post" action="{{ path('import_pocket_auth') }}"> |
diff --git a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php index 76225fe4..25359d56 100644 --- a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php +++ b/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php | |||
@@ -55,11 +55,20 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase | |||
55 | ->disableOriginalConstructor() | 55 | ->disableOriginalConstructor() |
56 | ->getMock(); | 56 | ->getMock(); |
57 | 57 | ||
58 | $config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config') | ||
59 | ->disableOriginalConstructor() | ||
60 | ->getMock(); | ||
61 | |||
62 | $config->expects($this->any()) | ||
63 | ->method('get') | ||
64 | ->with('pocket_consumer_key') | ||
65 | ->willReturn($consumerKey); | ||
66 | |||
58 | $pocket = new PocketImportMock( | 67 | $pocket = new PocketImportMock( |
59 | $this->tokenStorage, | 68 | $this->tokenStorage, |
60 | $this->em, | 69 | $this->em, |
61 | $this->contentProxy, | 70 | $this->contentProxy, |
62 | $consumerKey | 71 | $config |
63 | ); | 72 | ); |
64 | 73 | ||
65 | $this->logHandler = new TestHandler(); | 74 | $this->logHandler = new TestHandler(); |