Preserve username and "remember me" when login fails

Fixes openstreetmap#1159
tomhughes · Feb 26, 2016 · 480c17b · 480c17b
1 parent 0fe1780
commit 480c17b
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 473 deletions.
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
@@ -559,9 +559,9 @@ def password_authentication(username, password)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
-      failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org")
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:webmaster@openstreetmap.org"), username
     else
-      failed_login t("user.login.auth failure")
+      failed_login t("user.login.auth failure"), username
     end
   end
 
@@ -627,10 +627,11 @@ def successful_login(user, referer = nil)
 
   ##
   # process a failed login
-  def failed_login(message)
+  def failed_login(message, username = nil)
     flash[:error] = message
 
-    redirect_to :action => "login", :referer => session[:referer]
+    redirect_to :action => "login", :referer => session[:referer],
+                :username => username, :remember_me => session[:remember_me]
 
     session.delete(:remember_me)
     session.delete(:referer)

diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb
@@ -33,7 +33,7 @@
       </fieldset>
 
       <fieldset>
-        <%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %>
+        <%= check_box_tag "remember_me", "yes", params[:remember_me] == "yes", :tabindex => 3 %>
         <label for="remember_me" class="standard-label">
           <%= t 'user.login.remember' %>
         </label>