namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
class PocketController extends Controller
{
/**
- * @Route("/import/pocket", name="import_pocket")
+ * @Route("/pocket", name="import_pocket")
*/
public function indexAction()
{
- return $this->render('WallabagImportBundle:Pocket:index.html.twig', []);
+ return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
+ 'import' => $this->get('wallabag_import.pocket.import'),
+ ]);
}
/**
- * @Route("/import/pocket/auth", name="import_pocket_auth")
+ * @Route("/pocket/auth", name="import_pocket_auth")
*/
public function authAction()
{
$requestToken = $this->get('wallabag_import.pocket.import')
- ->getRequestToken($this->generateUrl('import', [], true));
+ ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
$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', [], true),
+ 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
301
);
}
/**
- * @Route("/import/pocket/callback", name="import_pocket_callback")
+ * @Route("/pocket/callback", name="import_pocket_callback")
*/
public function callbackAction()
{