Evolution #710: Confirmation de l'email: si pas connecté ?

src/Muzich/CoreBundle/Resources/config/security.yml

@@ -19,7 +19,7 @@ security:
             pattern:      .*
             form_login:
                 provider:       fos_userbundle
-                login_path:     home
+                login_path:     home_login
                 use_forward:    false
                 check_path:     /login_check
                 failure_path:   null
@@ -98,6 +98,8 @@ security:
         - { path: ^/(?:fr|en)/event/view/elements, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/test-error, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/share-from, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(?:fr|en)/login, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/(?:fr|en)/account/email/confirm/, role: IS_AUTHENTICATED_ANONYMOUSLY }
         
         ## New public roads for visitors
         - { path: ^/(?:fr|en)$, role: IS_AUTHENTICATED_ANONYMOUSLY }

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -3271,7 +3271,7 @@ $(document).ready(function(){
    
 });
 
-function open_ajax_popin(url, callback)
+function open_ajax_popin(url, callback, data)
 {
   if (!popin_opened)
   {
@@ -3280,7 +3280,7 @@ function open_ajax_popin(url, callback)
       '<div id="helpbox" class="popin_block"><img src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>'
     );
     open_popin_dialog('helpbox');
-    JQueryJson(url, {}, function(response){
+    JQueryJson(url, data, function(response){
       if (response.status == 'success')
       {
         $('div#helpbox').html(
@@ -3300,7 +3300,7 @@ function open_ajax_popin(url, callback)
   }
 }
 
-function open_connection_or_subscription_window(open_login_part)
+function open_connection_or_subscription_window(open_login_part, data)
 {
   if (window_login_or_subscription_opened == false)
   {
@@ -3310,6 +3310,7 @@ function open_connection_or_subscription_window(open_login_part)
       {
         $('div#helpbox div#login_box').show();
         $('a#registration_link').show();
+        $('input#username').focus();
       }
       else
       {
@@ -3328,7 +3329,7 @@ function open_connection_or_subscription_window(open_login_part)
         $('div.login form').find('img.loader').hide();
         if (response.status == 'success')
         {
-          $(location).attr('href', url_home);
+          $(location).attr('href', response.data.redirect_url);
         }
         else if (response.status == 'error')
         {
@@ -3356,7 +3357,7 @@ function open_connection_or_subscription_window(open_login_part)
       $('div#facebook_login').prependTo('div#helpbox');
       $('div#facebook_login').show();
       
-    });
+    }, data);
   }
 }
 

src/Muzich/CoreBundle/Security/Http/Authentication/AuthenticationSuccessHandler.php

@@ -41,12 +41,29 @@ class AuthenticationSuccessHandler implements AuthenticationSuccessHandlerInterf
    function onAuthenticationSuccess(Request $request, TokenInterface $token)
    {
       if ($request->isXmlHttpRequest())
-      {
-        $response = new Response(json_encode(array('status' => 'success')));
+      {        
+        $response = new Response(json_encode(array(
+          'status' => 'success',
+          'data'   => array(
+            'redirect_url' => $this->getRedirectionUrl($request)
+          )
+        )));
         $response->headers->set('Content-Type', 'application/json; charset=utf-8');
         return $response;
       }
       
-      return new RedirectResponse($this->router->generate('home'));
+      return new RedirectResponse($this->getRedirectionUrl($request));
+   }
+   
+   protected function getRedirectionUrl(Request $request)
+   {
+     if ($request->get('email_confirmation_token'))
+     {
+       return $this->router->generate('email_confirm', array(
+         'token' => $request->get('email_confirmation_token')
+       ));
+     }
+     
+     return $this->router->generate('home');
    }
 }

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -15,7 +15,7 @@ class HomeController extends Controller
    * 
    * @Template()
    */
-  public function indexAction($count = null, $network = 'public')
+  public function indexAction($count = null, $network = 'public', $login = false)
   {
     $search_object = $this->getElementSearcher($count);
     $user = $this->getUser(true, array('join' => array(
@@ -26,8 +26,7 @@ class HomeController extends Controller
     $add_form = $this->getAddForm();
     
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId(true));
-    //$count_elements = count($elements);
-        
+    
     return array(
       'search_tags_id'   => $search_object->getTags(),
       'ids_display'      => $search_object->getIdsDisplay(),
@@ -39,10 +38,22 @@ class HomeController extends Controller
       'network_public'   => $search_object->isNetworkPublic(),
       'elements'         => $elements,
       'from_url'         => $this->getRequest()->get('from_url'),
-      'display_launch_demo' => true
+      'display_launch_demo' => true,
+      'login'            => $login,
+      'email_token'      => $this->getEmailTokenIfExist()
     );
   }
   
+  protected function getEmailTokenIfExist()
+  {
+    if ($this->get("session")->get('user.confirm_email.token'))
+    {
+      return $this->get("session")->get('user.confirm_email.token');
+    }
+    
+    return null;
+  }
+  
   public function needTagsAction()
   {
     $es = $this->getNewElementSearcher();

src/Muzich/HomeBundle/Resources/config/routing.yml

@@ -2,11 +2,15 @@
 
 home:
   pattern:  /
-  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_public }
+  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_public, login: false }
+  
+home_login:
+  pattern:  /login
+  defaults: { _controller: MuzichHomeBundle:Home:index, network: network_public, login: true }
   
 home_more:
   pattern:  /more/{count}
-  defaults: { _controller: MuzichHomeBundle:Home:index, count: null }
+  defaults: { _controller: MuzichHomeBundle:Home:index, count: null, login: false }
   
 show_user:
   pattern: /user/{slug}

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -35,6 +35,18 @@
     </script>
   {% endif %}
   {% endif %}
+    
+  {% if login %}
+    <script type="text/javascript">
+      $(document).ready(function(){
+        {% if not email_token %}
+          open_connection_or_subscription_window(true);
+        {% else %}
+          open_connection_or_subscription_window(true, {"email_confirmation_token":"{{ email_token }}"});
+        {% endif %}
+      });
+    </script>
+  {% endif %}
 
   <div class="top_tools" {% if search_tags_id|length == 0 %}style="display: none;"{% endif %}>
   

src/Muzich/UserBundle/Controller/UserController.php

@@ -743,6 +743,12 @@ class UserController extends Controller
   
   public function confirmEmailAction(Request $request, $token)
   {
+    if ($this->isVisitor())
+    {
+      $this->get("session")->set('user.confirm_email.token', $token);
+      return $this->redirect($this->generateUrl('home_login'));
+    }
+    
     $user = $this->getUser();
     
     if ($token == hash('sha256', $user->getConfirmationToken().$user->getEmail()))

src/Muzich/UserBundle/Resources/views/Security/login.html.twig

@@ -12,6 +12,10 @@
 
   <form action="{{ path("fos_user_security_check") }}" method="post">
     
+    {% if app.request.get('email_confirmation_token') %}
+      <input type="hidden" name="email_confirmation_token" value="{{ app.request.get('email_confirmation_token') }}" />
+    {% endif %}
+    
     <input type="text" id="username" name="_username" value="{{ last_username }}"
       class="niceinput"
       placeholder="{{ 'security.login.username'|trans({}, 'userui') }}"