Merge pull request #46 from daveriess/master

Eliminates appended '?' to redirects that have no query string
Houdini · Dec 29, 2014 · 9c71601 · 9c71601
2 parents 2e18e6c + 10e0ebb
commit 9c71601
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ capybara-*.html
 dump.rdb
 *.ids
 .rbenv-version
+.ruby-gemset
+.ruby-version
diff --git a/lib/two_factor_authentication/controllers/helpers.rb b/lib/two_factor_authentication/controllers/helpers.rb
@@ -21,7 +21,7 @@ def handle_two_factor_authentication
 
       def handle_failed_second_factor(scope)
         if request.format.present? and request.format.html?
-          session["#{scope}_return_to"] = "#{request.path}?#{request.query_string}" if request.get?
+          session["#{scope}_return_to"] = request.original_fullpath if request.get?
           redirect_to two_factor_authentication_path_for(scope)
         else
           render nothing: true, status: :unauthorized