Merge tag 'v1.7' into fiksgatami-dev

1 files changed, 10 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm
index 63bf91ff5..6de416c53 100644
--- a/perllib/FixMyStreet/App/Controller/Auth.pm
+++ b/perllib/FixMyStreet/App/Controller/Auth.pm
@@ -36,16 +36,23 @@ sub general : Path : Args(0) {
     return unless $c->req->method eq 'POST';
 
     # decide which action to take
-    my $has_password = $c->get_param('sign_in') || $c->get_param('password_sign_in');
-    my $has_email = $c->get_param('email_sign_in') || $c->get_param('name') || $c->get_param('password_register');
+    my $clicked_password = $c->get_param('sign_in');
+    my $clicked_email = $c->get_param('email_sign_in');
+    my $data_password = $c->get_param('password_sign_in');
+    my $data_email = $c->get_param('name') || $c->get_param('password_register');
 
-    $c->detach('email_sign_in') if $has_email && !$has_password;
+    $c->detach('email_sign_in') if $clicked_email || ($data_email && !$data_password);
 
        $c->forward( 'sign_in' )
     && $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] );
 
 }
 
+sub general_test : Path('_test_') : Args(0) {
+    my ( $self, $c ) = @_;
+    $c->stash->{template} = 'auth/token.html';
+}
+
 =head2 sign_in
 
 Allow the user to sign in with a username and a password.