Make password reset more robust

app/controllers/authentication_controller.rb

@@ -99,11 +99,15 @@ class AuthenticationController < ApplicationController
 
   def reset_password
     token = Token.find_by(token: params[:token], tokentype: Token::TYPES[:password_reset])
-    if not token_valid? token
+    return unless token_valid? token
+
+    if params[:password_reset][:password].blank?
+      flash_message :warning, I18n.t('authentication.password_blank')
+      render 'authentication/reset_password_form', layout: 'void'
       return
     end
 
-    if not params[:password] == params[:password_confirmation]
+    unless params[:password_reset][:password] == params[:password_reset][:password_confirmation]
       flash_message(:warning, I18n.t('authentication.password_repeat_mismatch'))
       redirect_to action: 'reset_password_form', token: params[:token]
       return

app/views/authentication/reset_password_form.html.haml

@@ -1,11 +1,13 @@
 - content_for :title do
   = t 'authentication.reset_password'
+
+= render 'shared/alerts'
 .container
-  = render 'shared/alerts'
   = form_for :password_reset, url: {action: 'reset_password', token: params[:token]}, html: { class: 'central-form'} do |f|
     %h2.central-form-header.text-center
       = t 'authentication.reset_password'
 
+
     = f.password_field :password, placeholder: t('authentication.new_password'), class: 'form-control input-top'
     = f.password_field :password_confirmation, placeholder: t('authentication.new_password_confirm'), class: 'form-control input-bottom'
     = f.submit t('authentication.reset_password'), class: 'btn btn-primary btn-lg btn-block'

config/locales/translation_nl.yml

@@ -20,9 +20,17 @@ nl:
         one: Persoon  #g
         other: Personen  #g
 
-      session: Sessie  #g
-      token: Token  #g
-      user: Gebruiker  #g
+      session:
+        one: Sessie
+        other: Sessies
+
+      token:
+        one: Token
+        other: Tokens
+
+      user:
+        one: Gebruiker
+        other: Gebruikers
 
       default_subgroup:
         one: Standaardgroep
@@ -96,10 +104,12 @@ nl:
         user: :activerecord.models.user  #g
 
       user:
-        confirmed: Bevestigd  #g
-        email: E-mail  #g
-        password_digest: Wachtwoord-digest  #g
-        person: :activerecord.models.person  #g
+        confirmed: Bevestigd
+        email: E-mail
+        password: Wachtwoord
+        password_confirmation: Wachtwoordcontrole
+        password_digest: Wachtwoord-digest
+        person: :activerecord.models.person
 
       default_subgroup:
         name: Naam