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.

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

Improve styles of 2-step code entry and locked account pages #394

Merged
merged 9 commits into from Sep 10, 2015

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Sep 9, 2015

  • Tweak copy to use 2-step consistently
  • Override default 2-step verification form and max requests views
  • Increase max login attempt to 10 for now
  • Display flash[:error] messages from the two_factor_authentication gem
  • Track all flash messages in analytics to see how often error states happen

https://trello.com/c/eAU9Z46p/90-front-end-work-for-mvp-2sv-medium

screen shot 2015-09-09 at 16 16 02

screen shot 2015-09-09 at 16 16 16

fofr added 7 commits Sep 9, 2015
* Overrides default two_factor_authentication view
* Hide the main navbar items, none of them work at this point
* Keep the sign out link so the user can return to the original sign in
form if they need to
* Track the display of flash messages to Google Analytics, using the
same technique as Publisher
* Allow success, info, warning and danger styled flash messages as per
other admin apps
* Add display of flash[:error] so that two_factor_authentication gem
error messages display within pages
* Don’t distinguish between a successful sign in and successful 2-step
sign in
* Refer to the verification code being incorrect when attempts fail
At the moment accounts don’t unlock after an hour and no email is sent.
To avoid this causing to many problems, increase the limit to 10 until
automatic unlocking is added: https://trello.com/c/LYxVsMEb/
<p class="lead remove-bottom-margin">
Your account has been locked because an incorrect 2-step verification code was entered too many times.
</p>
<%# <p>Contact a managing GOV.UK editor in your organisation (or your parent organisation) to unlock your account. They can either unlock your account themselves or use the support form to get help from the GOV.UK team.</p> %>

This comment has been minimized.

@benilovj

benilovj Sep 10, 2015
Contributor

Let's take this out until we need it.


<div class="callout callout-danger">
<p class="lead remove-bottom-margin">
Your account has been locked because an incorrect 2-step verification code was entered too many times.

This comment has been minimized.

@jamiecobbett

jamiecobbett Sep 10, 2015
Contributor

2-step spaces: was entered

@fofr fofr force-pushed the style-2-step branch from d3d83ed to 4596f8e Sep 10, 2015
At the moment there are two locks:
* A sign in lock
* A 2-step lock

The 2-step lock doesn’t expire after an hour, and is separate to the
first lock. GOV.UK editors can’t unlock these accounts yet.
@fofr fofr force-pushed the style-2-step branch from 4596f8e to 36652d6 Sep 10, 2015
@benilovj
Copy link
Contributor

@benilovj benilovj commented Sep 10, 2015

👍

benilovj added a commit that referenced this pull request Sep 10, 2015
Improve styles of 2-step code entry and locked account pages
@benilovj benilovj merged commit f7dba7f into master Sep 10, 2015
2 checks passed
2 checks passed
Test signon changes against gds-sso master "Testing gds-sso against changes #129 succeeded on Jenkins"
Details
default "Build #743 succeeded on Jenkins"
Details
@benilovj benilovj deleted the style-2-step branch Sep 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.