diff --git a/lib/Lystyng.pm b/lib/Lystyng.pm index 24ad1a3..ffe5f9c 100644 --- a/lib/Lystyng.pm +++ b/lib/Lystyng.pm @@ -387,18 +387,12 @@ post '/passreset' => sub { my $code = body_parameters->{'code'}; unless ($code) { - return { - status => 400, - message => 'Reset code missing', - } + send_error 'Reset code missing', 400; } my $ps = $model->get_passreset_from_code($code); unless ($ps) { - return { - status => 400, - message => "Code $code is no longer valid", - }; + send_error "Code $code is no longer valid", 400; } my ($pass1, $pass2) = ( @@ -406,16 +400,10 @@ post '/passreset' => sub { ); unless ($pass1 and $pass2) { - return { - status => 400, - message => 'Must fill in both password fields', - } + send_error 'Must fill in both password fields', 400; } unless ($pass1 eq $pass2) { - return { - status => 400, - message => 'Password values are not the same', - }; + send_error 'Password values are not the same', 400; } $model->update_user_password( diff --git a/t/003_user_admin.t b/t/003_user_admin.t index 569dfe4..ba86414 100644 --- a/t/003_user_admin.t +++ b/t/003_user_admin.t @@ -99,14 +99,14 @@ $res = $test->request(POST '/passreset', Content_type => 'application/json', Content => encode_json({ code => $code, - password1 => 'Newpass', + password => 'Newpass', password2 => 'Newpass', }), ); ok $res, 'Got a response from /passreset'; -is $res->code, 200, 'Response is 200' - or diag $res->content; +is $res->code, 200, 'Response is 200'; +diag $res->content; # Clean up after ourselves $user->password_resets->delete;