Commit Graph

524 Commits

Author SHA1 Message Date
Martyn Inglis
5c732ae868 Setting s3 key to be git commit and zip file 2016-01-11 12:42:06 +00:00
Martyn Inglis
ad9ce73c14 Merge branch 'master' of github.com:alphagov/notifications-admin 2016-01-11 12:40:48 +00:00
Martyn Inglis
ab36541914 Setting s3 key to be git commit and zip file 2016-01-11 12:40:38 +00:00
Adam Shimali
feba58f441 Merge pull request #50 from alphagov/forgot-password
Forgot password and Reset password
2016-01-11 12:34:50 +00:00
Martyn Inglis
68f4623194 Setting s3 key to be git commit and zip file 2016-01-11 12:32:15 +00:00
Rebecca Law
bb1db0c345 When the user request a reset password link, the user.state is set to request_password_reset.
Which means the user will only be able to reset their password, and not sign-in.
Once the user resets the password the user state is set to active once more.
If the link is used a second time they will be redirected to the index page with a message
that the link in the email is not longer valid.
2016-01-11 12:23:08 +00:00
Rebecca Law
0c1592905f Update sign_out to go to the index page not sign-in 2016-01-11 12:23:08 +00:00
Rebecca Law
806c584b03 Reset password token is valid for 1 hour 2016-01-11 12:23:08 +00:00
Rebecca Law
f7373ee5fc Fix wording
Changed forgot-password so that it does not expose to the user that the email address does not exist.
2016-01-11 12:23:08 +00:00
Chris Hill-Scott
677f8891b2 Fix layout and wrong word 2016-01-11 12:23:08 +00:00
Rebecca Law
9ca2f2017f Fix argument 2016-01-11 12:23:08 +00:00
Rebecca Law
c858869a52 Removed exceptions, found a better way to handle them.
Refactored the forms so that fields like email_address can be used in multiple forms.
Refactored form validation so that a query function is passed into the form to be run, this
way the form is not exposed to the dao layer and the query is more efficient.

This PR still requires some frontend attention. Will work with Chris to update the templates.
2016-01-11 12:23:08 +00:00
Rebecca Law
ceb78f49b4 Take out the Canadian politeness.
Make the error message more consistent.
Extracted common fields for the forms.
2016-01-11 12:23:08 +00:00
Rebecca Law
f951b364ac Actually use the mock in the test 2016-01-11 12:23:07 +00:00
Rebecca Law
eb78a77808 Added the mock for the admin_api_client 2016-01-11 12:23:07 +00:00
Rebecca Law
35619553c8 Added NoDataFoundException 2016-01-11 12:23:07 +00:00
Rebecca Law
a860f713d2 Implementation of the new_password endpoint.
Found a way to create the token that does not need to persist it to the database.
This requires proper error messages, written by people who speak menglis good.
2016-01-11 12:23:07 +00:00
Rebecca Law
8057a138a8 Update two_factor redirect endpoint 2016-01-11 12:23:07 +00:00
Rebecca Law
b5901a1ac7 New-password endpoints are implemented.
There should be a better way to validate the token.
2016-01-11 12:23:07 +00:00
Rebecca Law
f94966154d Fix code style. Remove duplicate endpoints 2016-01-11 12:23:07 +00:00
Rebecca Law
39970144b6 fix code style 2016-01-11 12:23:07 +00:00
Rebecca Law
2cb896fa81 Completion of forgot-password endpoints.
Start implementation for new-password endpoints.
Created PasswordResetToken model
ToDo: create and save token, send valid url to user,
check validity of token, update user's password, redirect to /two-factor.
2016-01-11 12:23:07 +00:00
Rebecca Law
6696426dbc Add endpoints for forgot-password. 2016-01-11 12:22:39 +00:00
Chris Hill-Scott
567ac123e3 Merge pull request #51 from alphagov/service-settings-flow
Add pages for service settings flow
2016-01-11 11:55:46 +00:00
Martyn Inglis
a1e484838e rolled back as didn't work :-( 2016-01-11 10:59:22 +00:00
Martyn Inglis
bd4829f451 Setting s3 etag to be git commit 2016-01-11 10:54:04 +00:00
Martyn Inglis
0369670f93 Setting s3 etag to be git commit 2016-01-11 10:49:04 +00:00
minglis
060093f30f Merge pull request #54 from alphagov/credstash-integration
Integrated credstash as a live properties setting in the app.py class
2016-01-11 10:11:24 +00:00
Martyn Inglis
7efa513777 Ensured credstash is located only with the wsgi/gunicorn code. 2016-01-11 09:59:31 +00:00
Martyn Inglis
42b62ce7cd Removed secrets setup from db script 2016-01-11 09:50:12 +00:00
Martyn Inglis
ba4dac051b Integrated credstash as a live properties setting in the app.py class
- initial versions kept it out of this class but updated as lots of duplication and errors as config
set up in multiple places and not all picking up credstash.
2016-01-11 09:32:49 +00:00
Martyn Inglis
63c87f10e7 Needed own file for db scripts. Need to compartmentalise running the app and the db upgrades into differing scripts. 2016-01-10 22:16:26 +00:00
Martyn Inglis
60f6601845 Copy the db upgrade command into WSGI script.
In there currently as wsgi has the credstash which we don't won't to apply in non-awe environments. This will need a refactor to better handle code duplication.
2016-01-10 21:53:41 +00:00
minglis
3406d3036f Merge pull request #53 from alphagov/setup-credstash
Incorporate credstash in production wsgi scripts.
2016-01-10 21:41:56 +00:00
Martyn Inglis
af713b1583 Removed flask config property lookup. 2016-01-10 21:38:53 +00:00
Martyn Inglis
2c2d236e85 Incorporate credstash in production wsgi scripts. 2016-01-10 21:33:04 +00:00
Chris Hill-Scott
86db5fa0b9 Make wording on 2nd-level pages match prev. commit 2016-01-08 17:17:34 +00:00
Chris Heathcote
11ea68e471 Wording changes on service settings page 2016-01-08 16:45:48 +00:00
minglis
3579a4ea94 Merge pull request #52 from alphagov/change-aws-keys
Changed keys used for deployment to a specific user with just these p…
2016-01-08 16:10:56 +00:00
Martyn Inglis
2666c967e3 Changed keys used for deployment to a specific user with just these permissions. 2016-01-08 16:07:15 +00:00
Chris Hill-Scott
a289335661 Merge pull request #49 from alphagov/error-pages
Error pages
2016-01-08 15:13:44 +00:00
Chris Hill-Scott
4d10eec1e2 Rename submit_form component to page_footer
Submit form was
- a confusing name in itself
- not descriptive, because it also has an optional ‘back’ link

This commit also puts this component in as many pages as possible, stripping
out any hard-coded buttons and links.

It replaces any usage of buttons for ‘back’, because these are links, not
buttons (ie they don’t change any data).
2016-01-08 15:02:08 +00:00
Chris Hill-Scott
0b62d1e755 Add confirm loop
For pages where
- we want you to be sure that you want to do what you’re about to do
- we want to be sure it’s you trying to do the thing

This adds a page that asks the user to confirm their password.
2016-01-08 14:59:30 +00:00
Chris Hill-Scott
3989d1b576 Add pages for ‘service settings’ flow
Adds the pages and wires them together, so that it’s possible to click
through them.

The wording is not quite English, but attempts to be an rough description of
what the consequences are for each of the four actions.
2016-01-08 14:56:14 +00:00
Adam Shimali
1d038c1021 Better page title 2016-01-08 09:44:00 +00:00
Chris Hill-Scott
750c23e805 Merge pull request #48 from alphagov/dont_deploy_assets_II
Delete from current directory before deploying
2016-01-07 17:36:58 +00:00
Martyn Inglis
35fe1ae5a3 Live was set to debug mode 2016-01-07 16:24:10 +00:00
Martyn Inglis
cd1af56548 Fix python3/2 issues 2016-01-07 16:13:25 +00:00
Martyn Inglis
5cf3259dbf Fix python3/2 issues 2016-01-07 16:12:34 +00:00
Adam Shimali
dfbcfa9d49 Removed redundant return of None 2016-01-07 16:12:29 +00:00