improved sessiontoken handling

joomla · Aug 11, 2016 · b1e31cb · b1e31cb
1 parent 209ddb5
commit b1e31cb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/components/com_users/controllers/registration.json.php b/components/com_users/controllers/registration.json.php
@@ -27,7 +27,14 @@ class UsersControllerRegistration extends UsersController
 	public function validate()
 	{
 		// Check for request forgeries.
-		JSession::checkToken('get') or jexit(JText::_('JINVALID_TOKEN'));
+		$checkToken = JSession::checkToken('get');
+
+		if ($checkToken === false)
+		{
+			echo new JResponseJson(null, JText::_('JINVALID_TOKEN'), true);
+
+			return false;
+		}
 
 		// Read username from ajax
 		$username = $this->input->get('username', '', 'username');

diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
@@ -17,8 +17,6 @@
 JHtml::_('jquery.framework');
 JHtml::_('script', 'com_users/validate-user.js', false, true);
 
-
-
 $ajaxUri = JRoute::_('index.php?option=com_users&task=registration.validate&format=json&' . JSession::getFormToken() . '=1');
 ?>
 <div class="registration<?php echo $this->pageclass_sfx?>">

diff --git a/media/com_users/js/validate-user.js b/media/com_users/js/validate-user.js
@@ -11,11 +11,17 @@
                     type: 'POST',
                     url: ajaxUrl + '&username=' + name
                 }).done(function(data){
+                    console.log(data);
                     if(data.success){
                         var message = {
                             'error' : [data.message]
                         };
                         Joomla.renderMessages(message);
+                    }else if(!data.success && data.message){ //Invalid token
+                        var message = {
+                            'error' : [data.message]
+                        };
+                        Joomla.renderMessages(message);
                     }
                 });
             }
@@ -33,6 +39,11 @@
                             'error': [data.message]
                         };
                         Joomla.renderMessages(message);
+                    }else if(!data.success && data.message){ //Invalid token
+                        var message = {
+                            'error' : [data.message]
+                        };
+                        Joomla.renderMessages(message);
                     }
                 });
             }