fixed error message display bug in Reset Password

3 files changed, 14 insertions, 6 deletions

diff --git a/lib/Reaction/InterfaceModel/Action/User/ResetPassword.pm b/lib/Reaction/InterfaceModel/Action/User/ResetPassword.pm
index fc57cc2..fdb76a0 100644
--- a/lib/Reaction/InterfaceModel/Action/User/ResetPassword.pm
+++ b/lib/Reaction/InterfaceModel/Action/User/ResetPassword.pm
@@ -15,10 +15,19 @@ has 'user' => (
     predicate => 'has_user',
 );
 
+# verification needs to be done here, since there are cases where
+# can_apply doesn't run, such as fields being left blank, invalid, etc.
+around sync_all => sub {
+  my $super = shift;
+  my ($self) = @_;
+  $self->verify_confirmation_code;
+  $self->$super(@_);
+};
+
 around can_apply => sub {
     my $super = shift;
     my ($self) = @_;
-    return 0 unless $self->verify_confirmation_code;
+    return 0 unless $self->has_user;
     return $super->(@_);
 };
 
@@ -29,9 +38,7 @@ sub verify_confirmation_code {
   my $supplied_code = $self->confirmation_code;
   if (defined(my $user = $model->find_by_confirmation_code($supplied_code))) {
     $self->user($user);
-    return 1;
   }
-  return;
 }
 
 around error_for_attribute => sub {
diff --git a/lib/Reaction/InterfaceModel/Action/User/SetPassword.pm b/lib/Reaction/InterfaceModel/Action/User/SetPassword.pm
index b9aa5d5..06e56c6 100644
--- a/lib/Reaction/InterfaceModel/Action/User/SetPassword.pm
+++ b/lib/Reaction/InterfaceModel/Action/User/SetPassword.pm
@@ -26,8 +26,7 @@ around error_for_attribute => sub {
 around can_apply => sub {
   my $super = shift;
   my ($self) = @_;
-  return 0 unless $self->verify_confirm_new_password;
-  return $super->(@_);
+  return $super->(@_) && $self->verify_confirm_new_password;;
 };
 sub verify_confirm_new_password {
   my $self = shift;
diff --git a/lib/Reaction/InterfaceModel/Object/User/Role/ConfirmationCodeSupport.pm b/lib/Reaction/InterfaceModel/Object/User/Role/ConfirmationCodeSupport.pm
index 7538119..4830d08 100644
--- a/lib/Reaction/InterfaceModel/Object/User/Role/ConfirmationCodeSupport.pm
+++ b/lib/Reaction/InterfaceModel/Object/User/Role/ConfirmationCodeSupport.pm
@@ -4,6 +4,8 @@ use Reaction::Role;
 use Crypt::Eksblowfish::Bcrypt ();
 use namespace::clean -except => [ qw(meta) ];
 
+requires 'identity_string';
+
 sub generate_confirmation_code {
     my $self = shift;
     my $salt = join(q{}, map { chr(int(rand(256))) } 1 .. 16);
@@ -14,4 +16,4 @@ sub generate_confirmation_code {
     );
 }
 
-1;
\ No newline at end of file
+1;