Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make SSO button use separate form. #5178

Merged
merged 1 commit into from
Sep 23, 2024
Merged

Make SSO button use separate form. #5178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions perllib/FixMyStreet/App/Controller/Auth.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ] );

Expand Down
1 change: 1 addition & 0 deletions t/app/controller/auth_social.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ for my $state ( 'refused', 'no email', 'existing UID', 'okay' ) {
update => 'Test update',
};
}
$mech->form_with_fields('social_sign_in');
$mech->submit_form(with_fields => $fields, button => 'social_sign_in');

# As well as the cookie issue above, caused by this external
Expand Down
53 changes: 25 additions & 28 deletions templates/web/base/auth/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ <h1>
<p class="form-error">[% loc('Sorry, we could not log you in. Please fill in the form below.') %]</p>
[% END %]

<form action="/auth" method="post" name="general_auth" class="validate">

<input type="hidden" name="r" value="[% c.req.params.r | html %]">

[% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %]
<form action="/auth" method="post" name="sso_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
[% IF c.config.FACEBOOK_APP_ID %]
<div class="form-box">
<button name="social_sign_in" id="facebook_sign_in" value="facebook" class="btn btn--block btn--social btn--facebook">
<button name="social_sign_in" value="facebook" class="btn btn--block btn--social btn--facebook">
<img alt="" src="/i/facebook-icon-32.png" width="17" height="32">
[% loc('Log in with Facebook') %]
</button>
Expand All @@ -34,23 +32,26 @@ <h1>
[% oidc_config = c.cobrand.call_hook('oidc_config') OR c.cobrand.feature('oidc_login') %]
[% IF oidc_config %]
<div class="form-box">
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
<button name="social_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
[% tprintf(loc('Login with %s'), oidc_config.display_name) %]
</button>
</div>
[% END %]
[% IF c.config.TWITTER_KEY %]
<div class="form-box">
<button name="social_sign_in" id="twitter_sign_in" value="twitter" class="btn btn--block btn--social btn--twitter">
<button name="social_sign_in" value="twitter" class="btn btn--block btn--social btn--twitter">
<img alt="" src="/i/twitter-icon-32.png" width="17" height="32">
[% loc('Log in with Twitter') %]
</button>
</div>
[% END %]
<div id="js-social-email-hide">
</form>
[% END %]

[% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]
<form action="/auth" method="post" name="general_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">

[% loc_username_error = INCLUDE 'auth/_username_error.html' default='email' %]

[% IF c.cobrand.sms_authentication %]
[% SET username_label = loc('Your email or mobile') %]
Expand All @@ -60,26 +61,22 @@ <h1>
[% SET username_type = 'email' %]
[% END %]

<label class="n" for="username">[% username_label %]</label>
[% IF loc_username_error %]
<div class="form-error">[% loc_username_error %]</div>
<label class="n" for="username">[% username_label %]</label>
[% IF loc_username_error %]
<div class="form-error">[% loc_username_error %]</div>
[% END %]
<input type="[% username_type %]" class="form-control required" id="username" name="username" value="[% username | html %]" autocomplete="username"
[%~ IF c.cobrand.moniker != 'borsetshire' %] autofocus[% END %]>

<div id="form_sign_in">
[% IF oauth_need_email %]
[% INCLUDE form_sign_in_no %]
<input type="hidden" name="oauth_need_email" value="1">
[% ELSE %]
[% INCLUDE form_sign_in_yes %]
[% INCLUDE form_sign_in_no %]
[% END %]
<input type="[% username_type %]" class="form-control required" id="username" name="username" value="[% username | html %]" autocomplete="username"
[%~ IF c.cobrand.moniker != 'borsetshire' %] autofocus[% END %]>

<div id="form_sign_in">
[% IF oauth_need_email %]
[% INCLUDE form_sign_in_no %]
<input type="hidden" name="oauth_need_email" value="1">
[% ELSE %]
[% INCLUDE form_sign_in_yes %]
[% INCLUDE form_sign_in_no %]
[% END %]
</div>

[% IF NOT oauth_need_email AND c.cobrand.social_auth_enabled %]
</div>
[% END %]
</div>

</form>

Expand Down
2 changes: 1 addition & 1 deletion templates/web/brent/errors/generic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>My Account login</h1>
<form action="/auth" method="post" name="general_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
<div class="form-box">
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
<button name="social_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
Click here to continue...
</button>
</div>
Expand Down
18 changes: 9 additions & 9 deletions templates/web/camden/auth/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,19 @@ <h1>
[% ELSE %]
[% INCLUDE form_sign_in_yes %]
[% INCLUDE form_sign_in_no %]
[% INCLUDE form_sign_in_camden_staff %]
[% END %]
</div>
</form>

[% IF c.cobrand.feature('oidc_login') AND NOT oauth_need_email %]
<form action="/auth" method="post" name="sso_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
Camden Staff Sign-in
</button>
</form>
[% END %]

[% INCLUDE 'footer.html' %]

[% BLOCK form_sign_in_yes %]
Expand Down Expand Up @@ -76,11 +84,3 @@ <h1>
[%~ END ~%]
"></p>
[% END %]

[% BLOCK form_sign_in_camden_staff %]
[% IF c.cobrand.feature('oidc_login') %]
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
Camden Staff Sign-in
</button>
[% END %]
[% END %]
18 changes: 9 additions & 9 deletions templates/web/hackney/auth/general.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,19 @@ <h1>
[% ELSE %]
[% INCLUDE form_sign_in_yes %]
[% INCLUDE form_sign_in_no %]
[% INCLUDE form_sign_in_hackney_staff %]
[% END %]
</div>
</form>

[% IF c.cobrand.feature('oidc_login') AND NOT oauth_need_email %]
<form action="/auth" method="post" name="sso_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
Hackney Staff Sign-in
</button>
</form>
[% END %]

[% INCLUDE 'footer.html' %]

[% BLOCK form_sign_in_yes %]
Expand Down Expand Up @@ -78,11 +86,3 @@ <h1>
[%~ END ~%]
"></p>
[% END %]

[% BLOCK form_sign_in_hackney_staff %]
[% IF c.cobrand.feature('oidc_login') %]
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="fake-link sso-staff-sign-in">
Hackney Staff Sign-in
</button>
[% END %]
[% END %]
2 changes: 1 addition & 1 deletion templates/web/tfl/errors/generic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1>My Account login</h1>
<form action="/auth" method="post" name="general_auth" class="validate">
<input type="hidden" name="r" value="[% c.req.params.r | html %]">
<div class="form-box">
<button name="social_sign_in" id="oidc_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
<button name="social_sign_in" value="oidc" class="btn btn--block btn--social btn--oidc">
Click here to continue...
</button>
</div>
Expand Down
Loading