diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index 79eb29aba4c..052e97630ba 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -44,10 +44,7 @@ sub general : Path : Args(0) { # decide which action to take $c->detach('code_sign_in') if $clicked_sign_in_by_code || ($data_email && !$data_password); - if (!$data_username && !$data_password && !$data_email && $c->get_param('social_sign_in')) { - $c->forward('social/handle_sign_in'); - } - + $c->detach('social/handle_sign_in') if $c->get_param('social_sign_in'); $c->forward( 'sign_in', [ $data_username ] ) && $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] ); diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index 89d2c3d427c..c5de7862068 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -18,11 +18,9 @@
[% loc('Sorry, we could not log you in. Please fill in the form below.') %]
[% END %] +[% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %] diff --git a/templates/web/camden/auth/general.html b/templates/web/camden/auth/general.html index cf916b5e89f..de0ee01556a 100644 --- a/templates/web/camden/auth/general.html +++ b/templates/web/camden/auth/general.html @@ -42,11 +42,19 @@