change the way it handle the redirect

Author: glena

modules/mod_auth0/tmpl/default.php

@@ -15,6 +15,7 @@
 
     if ($params->get('show-login-form') == 1) {
 
+        $redirectUrl = $params->get('redirect-url');
         $showAsModal = ($params->get('show-as-modal') == 1);
         $bigSocialButtons = ($params->get('big-social-button') == 1);
         $lockURL = $params->get('lock-url');
@@ -55,6 +56,10 @@
             $lockOptions['dict'] = $dict;
         }
 
+        if (!empty($redirectUrl)) {
+            $lockOptions['authParams']['state'] = base64_encode($redirectUrl);
+        }
+
         if (!empty($iconURL)) {
             $lockOptions['icon'] = $iconURL;
         }
@@ -67,16 +72,16 @@
         $lockOptionsJson = json_encode($lockOptions);
 
         $javascript = "
-		var lock;
-		jQuery( document ).ready(function(){
-			lock = new Auth0Lock('$clientid', '$domain');
-		});
+        var lock;
+        jQuery( document ).ready(function(){
+            lock = new Auth0Lock('$clientid', '$domain');
+        });
 
-		function a0ShowLock() {
-			lock.show($lockOptionsJson);
-		}
+        function a0ShowLock() {
+            lock.show($lockOptionsJson);
+        }
 
-	";
+    ";
 
         $auth0js = '<script src="' . $lockURL . '"></script>';
 
@@ -86,11 +91,11 @@ function a0ShowLock() {
         } else {
             $javascript .= "
 
-		jQuery( document ).ready(function(){
-			a0ShowLock();
-		});
+        jQuery( document ).ready(function(){
+            a0ShowLock();
+        });
 
-		";
+        ";
             echo '<div id="auth0-login-form"></div>';
         }
 

site/controller.php

@@ -31,7 +31,7 @@ function display($cachable = false, $urlparams = false)
     }
 
     private function getReturn($key, $type) {
-        $return    = base64_decode($this->app->input->post->get($key, '', $type));
+        $return    = base64_decode($this->app->input->get->get($key, '', $type));
         if (!JUri::isInternal($return))
         {
             $return = '';
@@ -67,7 +67,7 @@ function AuthJUser()
 
         if (empty($return))
         {
-            $return = $mod_params->get('redirect-url', 'index.php?option=com_users&view=profile');
+            $return = 'index.php?option=com_users&view=profile';
         }
 
         // Set the return URL in the user state to allow modification by plugins