Commit Graph

343 Commits

Author SHA1 Message Date
Nicholas Staples
c9334bb9be Merge remote-tracking branch 'origin/master' into api_service_permissions 2016-03-18 14:43:10 +00:00
Nicholas Staples
c5efd87e31 Updated nav and choose template permissions. 2016-03-18 14:43:03 +00:00
minglis
0c43232c0c Merge pull request #287 from alphagov/notification_history_page
Notification history page
2016-03-18 14:32:55 +00:00
Martyn Inglis
b8db00d4d9 Fixing tests broken by bad revert 2016-03-18 11:46:17 +00:00
Adam Shimali
a1203d75ea Unit test bug fix. Page structure change. 2016-03-18 11:20:08 +00:00
Adam Shimali
7ee173de51 Merge pull request #293 from alphagov/single-verify-code
Changed registration flow to first send email verification link that
2016-03-18 11:03:27 +00:00
Nicholas Staples
3d08eb624b Merge with new master. 2016-03-18 10:16:14 +00:00
Chris Hill-Scott
5e50be931e Merge pull request #285 from alphagov/cookie-page
Add information about cookies, add a help page
2016-03-17 17:06:01 +00:00
minglis
f6ee5dc8c6 Merge pull request #292 from alphagov/update-config-for-staging-live
Start aligning Admin app with config styles used elsewhere
2016-03-17 15:42:57 +00:00
Adam Shimali
2792bece54 Changed registration flow to first send email verification link that
when visited sends sms code for second step of account verification.

At that second step user enters just sms code sent to users mobile
number.

Also moved dao calls that simply proxied calls to client to calling
client directly.

There is still a place where a user will be a sent a code for
verification to their email namely if they update email address.
2016-03-17 15:19:51 +00:00
Chris Hill-Scott
d1becbe1e3 Add cookie banner text, page, and footer links
> Let’s start the footer links with the cookie page.
> Banner to say: "GOV.UK Notify uses cookies to make the site simpler. Find out
> more about cookies"
> Standard style one... see
> https://www.registertovote.service.gov.uk/register-to-vote/cookies or
> https://www.digitalmarketplace.service.gov.uk/cookies
>
> Let's link to the feedback form too...
> https://docs.google.com/forms/d/1AL8U-xJX_HAFEiQiJszGQw0PcEaEUnYATSntEghNDGo/viewform
> Call it Support and feedback

https://www.pivotaltracker.com/story/show/115483375
2016-03-17 14:52:34 +00:00
Chris Hill-Scott
b38ae08ad6 Put some statistics on the dashboard
This commit adds two new sections to the dashboard

1. A banner telling you about trial mode, including a count of how many messages
   you have left today, which is a restriction of trial mode

2. Panels with counts of how many emails and text messages have been sent in a
   day, plus the failure rates for each

It does **not**:
- link through to any further information about what trial mode is (coming
  later)
- link through to pages for the failure rates (coming later)
- change the ‘recent jobs’ section to ‘recent notifications’
2016-03-17 14:06:12 +00:00
Martyn Inglis
2473b09beb Start aligning Admin app with config styles used elsewhere
- no config overrides - now all set in environment
- use different files for staging and live too allow for differently named env variables
- updates to run_app and run_tests scripts to set correct environment (test/development) so correct config picked up
- use environment file on deployed environments to pick correct config
2016-03-17 13:45:59 +00:00
Chris Hill-Scott
d04bde5486 Add API client for notification statistic
Adds a client for the endpoints added in
67c4bd2263
2016-03-17 13:15:41 +00:00
Nicholas Staples
a13ecc5cb5 whoops test fixes. 2016-03-16 17:05:27 +00:00
Nicholas Staples
b0ca855ba8 Notification history page added and pagination, tests all working. 2016-03-16 16:57:10 +00:00
Rebecca Law
271e194e1c Should show the sent password reset link page when the user is not found. 2016-03-16 14:19:41 +00:00
Chris Hill-Scott
2292ea4d15 Merge pull request #278 from alphagov/revert-201-stub-send-letters
Revert "Stub out the send letters page"
2016-03-16 11:11:31 +00:00
Adam Shimali
4adbcebc6f Do not send email in case of invite.
The user does not have to validate the email token, but it
was still being sent.
2016-03-15 16:58:26 +00:00
Adam Shimali
7dca13407c Additional check needed to see if user was already a user for the
service that they were invited to.
2016-03-15 15:32:30 +00:00
Rebecca Law
5ae582f9be Remove reference to deleted endpoint 2016-03-15 12:02:03 +00:00
Chris Hill-Scott
8e7b0edc4d Add page explaining how to send template using API
Would like to test something like this and see how well it works.

Intention of having this page is so:
- template IDs are discoverable (https://www.pivotaltracker.com/story/show/115404593)
- it’s obvious there’s an ‘automated’ way to send messages, as well as the CSV
  way (we’ve seen people oblivious to this in research)
2016-03-15 07:11:01 +00:00
Adam Shimali
8561391cd2 The verify view was not passing along the next param to the two factor
view.

Now if it is passed and it is a url on the same domain that request
originates from then it is used.
2016-03-14 16:58:39 +00:00
Chris Hill-Scott
91b4545adc Don’t mix errors with valid rows
Brings in: https://github.com/alphagov/notifications-utils/pull/11

Changes the number of rows shown to be at most 15 (either 15 rows with errors
or 15 valid rows.
2016-03-14 16:53:21 +00:00
Adam Shimali
67484d3f35 Merge pull request #269 from alphagov/invite-registration-sms-only
Change new invite registration flow to only need
2016-03-14 10:55:31 +00:00
Chris Hill-Scott
a4d00cf67e Merge pull request #266 from alphagov/better-placeholder-guidance
Fix bugs and gripes with adding and editing templates
2016-03-14 10:45:00 +00:00
Chris Hill-Scott
eea8ae5be4 Move ‘new thing’ buttons alongside heading
On the send messages and manage team pages we have big green buttons for
adding/inviting a new template or team member.

On the add template page it was at the bottom, and often got missed.

On the manage team page it was at the top, but maybe too prominent because it’s
big and green.

This commit tries putting it in the top right of the page instead (except when
the template page is empty, in which case it’s unchanged).
2016-03-14 10:39:53 +00:00
Adam Shimali
164bdad4f2 Change new invite registration flow to only need
sms for verification.

This may change again soon with story to split 2 factor
pages, but for now is correct.
2016-03-14 09:43:34 +00:00
NIcholas Staples
cf195b3a16 Merge pull request #271 from alphagov/remove-dao-layer
Start to remove the dao layer
2016-03-14 09:42:22 +00:00
Rebecca Law
34e7d21855 Remove sender module, code was moved to api. 2016-03-13 09:39:29 +00:00
Rebecca Law
6e3bf97af4 Remove services_dao.insert_new_service.
Update api_client.create_service to return the service id.
Fix unit tests.
2016-03-13 09:37:17 +00:00
Rebecca Law
9d2fbca557 Merge pull request #264 from alphagov/fix-sign-in-tests
Fix to sign in test and user model
2016-03-11 14:59:49 +00:00
Adam Shimali
069a549d57 Bug fix for passing list of empty string if no permissions selected for
invite.

Send empty list instead.
2016-03-11 12:50:25 +00:00
Rebecca Law
58c748e703 Noticed that the api was being called when running the unit tests.
This also lead me to find the the failed_login_in count was always returning 0.
2016-03-11 11:47:21 +00:00
Rebecca Law
f81dccc513 Merge pull request #263 from alphagov/error-handling
Fix bug in error handlers.
2016-03-11 10:52:53 +00:00
Rebecca Law
ccaa5410b3 Removed test as it was not testing the right thing 2016-03-11 10:47:16 +00:00
Rebecca Law
f63a85d003 Fix bug in error handlers.
Correct spelling error
2016-03-11 10:16:06 +00:00
Rebecca Law
bb82413718 Merge pull request #260 from alphagov/error-handling
Error handling
2016-03-10 16:29:59 +00:00
Rebecca Law
4ba801edab Merge branch 'master' into error-handling
Conflicts:
	app/main/views/invites.py
2016-03-10 15:03:21 +00:00
Adam Shimali
54f871dfba Only actually call api to verify code if both are present in form. 2016-03-10 14:57:29 +00:00
Nicholas Staples
6ea8491b39 Service name uniqueness handled in all cases and tests passing. 2016-03-10 14:29:31 +00:00
Adam Shimali
986edfa317 Check user invite status not accepted before proceeding with flow. 2016-03-10 11:57:40 +00:00
Rebecca Law
f6d98b63ea Refactored register_errorhandlers so that it handles HTTPError
Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
Adam Shimali
0095e4b608 Updated from git comments. Return status code 400 for duplicate
email address.
2016-03-09 16:05:17 +00:00
Adam Shimali
33c92a4e29 Fix for duplicate email registration that meant flash error not being
displayed.

The error message does not specify the error is a duplicate email
address so as not to reveal which emails are current user accounts.
2016-03-09 16:05:17 +00:00
Adam Shimali
be5aeb0676 View function for request go live was always calling update service.
Actually this should be no op until whatever workflow will take place
in the real world is implemented.

For the moment just display flash message to say request being
processed and do nothing.
2016-03-09 15:02:05 +00:00
NIcholas Staples
eeb0c5fdb7 Merge pull request #249 from alphagov/permission_route_tests
Permission route tests
2016-03-09 14:58:49 +00:00
Nicholas Staples
12167b84d1 Fix tests. 2016-03-09 14:11:24 +00:00
Nicholas Staples
c5eaf97669 Tests added for choose_template page.
Remove indifferent change to file.
2016-03-09 13:55:40 +00:00
Adam Shimali
208c3cbcf3 Added validation to ensure user can't invite themselves.
Refactored Invited user form into permissions and invite forms
for use in invite and edit permissions.

Added template for edit permissions.
2016-03-09 13:00:52 +00:00