fix return on API call and fix id in clear for user

diff --git a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
index 1df18247235ddb11f9c86d6f87f8addb86e6e5ef..75e5204e4fab4876e544b95dfbab678eac90485d 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/WallabagRestController.php
@@ -43,7 +43,7 @@ class WallabagRestController extends Controller
         $entries = $this
             ->getDoctrine()
             ->getRepository('WallabagCoreBundle:Entry')
-            ->findEntries(1, $isArchived, $isStarred, $isDeleted, $sort, $order);
+            ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order);
 
         if (!is_array($entries)) {
             throw $this->createNotFoundException();
@@ -86,7 +86,7 @@ class WallabagRestController extends Controller
 
         $content = Extractor::extract($url);
         $entry = new Entry();
-        $entry->setUserId(1);
+        $entry->setUserId($this->getUser()->getId());
         $entry->setUrl($url);
         $entry->setTitle($request->request->get('title') ?: $content->getTitle());
         $entry->setContent($content->getBody());

diff --git a/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php b/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
index d815d53623278254c5c48b7b3bf0e73ac58f15a4..1296cb1f94f4a6cb2684d8cec3e0e010003b71f8 100644 (file)
--- a/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
+++ b/src/Wallabag/CoreBundle/Security/Firewall/WsseListener.php
@@ -44,6 +44,8 @@ class WsseListener implements ListenerInterface
             $authToken = $this->authenticationManager->authenticate($token);
 
             $this->securityContext->setToken($authToken);
+
+            return;
         } catch (AuthenticationException $failed) {
             $failedMessage = 'WSSE Login failed for '.$token->getUsername().'. Why ? '.$failed->getMessage();
             $this->logger->err($failedMessage);
@@ -56,10 +58,5 @@ class WsseListener implements ListenerInterface
 
             return;
         }
-
-        // By default deny authorization
-        $response = new Response();
-        $response->setStatusCode(403);
-        $event->setResponse($response);
     }
 }