From 02e30c84d36d15db5c7326d14dc5a5187ed3cefc Mon Sep 17 00:00:00 2001
From: Pawel Mikolajczuk <mikolajczuk.private@gmail.com>
Date: Tue, 28 Apr 2015 09:26:59 +0200
Subject: [PATCH] share security context between api and frontend, update
 somposer.json

---
 newscoop/application/configs/symfony/security.yml | 7 ++-----
 newscoop/composer.json                            | 4 ++--
 newscoop/themes/system_templates/oauth_login.tpl  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/newscoop/application/configs/symfony/security.yml b/newscoop/application/configs/symfony/security.yml
index 87efc28d72..94bda9a041 100644
--- a/newscoop/application/configs/symfony/security.yml
+++ b/newscoop/application/configs/symfony/security.yml
@@ -43,15 +43,11 @@ security:
         oauth_authorize:
             pattern:    ^/oauth/v2/auth
             provider: backend_db
+            context: shared_with_api
             form_login:
                 use_forward: true
                 login_path: /oauth/v2/auth_login
                 check_path: /oauth/v2/auth_login_check
-            remember_me:
-                key: "changeme"
-                lifetime: 31536000
-                path: / 
-                domain: ~ 
 
         api:
             pattern:    ^/(api|content\-api)
@@ -81,6 +77,7 @@ security:
         frontend_area:
             pattern:    ^/
             provider: frontend_db
+            context: shared_with_api
             form_login:
                 login_path:  /auth
                 check_path:  /auth/login_check
diff --git a/newscoop/composer.json b/newscoop/composer.json
index 63c18531ed..3ed9128356 100755
--- a/newscoop/composer.json
+++ b/newscoop/composer.json
@@ -42,7 +42,7 @@
         "hybridauth\/hybridauth":"dev-master",
         "smarty\/smarty":"3.1.21",
         "knplabs\/knp-menu-bundle":"2.0.*@dev",
-        "knplabs\/knp-menu":"2.0.*@dev",
+        "knplabs\/knp-menu":"2.0.1",
         "friendsofsymfony\/jsrouting-bundle":"~1.1",
         "willdurand\/js-translation-bundle":"2.2.0",
         "recaptcha\/php5":"v1.0.0",
@@ -113,4 +113,4 @@
     "branch-alias":{
         "dev-master":"2.3-dev"
     }
-}
\ No newline at end of file
+}
diff --git a/newscoop/themes/system_templates/oauth_login.tpl b/newscoop/themes/system_templates/oauth_login.tpl
index 4b771bd9aa..0ea253c705 100644
--- a/newscoop/themes/system_templates/oauth_login.tpl
+++ b/newscoop/themes/system_templates/oauth_login.tpl
@@ -96,7 +96,7 @@
 
             <input type="text" class="form-control" placeholder="Login" value="{{ $lastUsername }}" name="_username" required="" autofocus="">
             <input type="password" class="form-control" placeholder="Password" name="_password" required="">
-            <input type="hidden" name="_target_path" value="{{ $targetPath }}" />
+            <input type="hidden" name="_failure_path" value="{{ $targetPath }}" />
             <a class="forgot-password pull-left" href="{{ $view->url(['controller' => 'auth', 'action' => 'password-restore']) }}">Forgot password?</a>
             <button class="btn btn-lg btn-primary btn-block" type="submit">
                 Sign In