Commit Graph

623 Commits

Author SHA1 Message Date
Adam Shimali
4d130fed01 Sessions expire after one hour 2016-01-22 15:05:13 +00:00
NIcholas Staples
820e78409f Merge pull request #103 from alphagov/visual-tweaks
Various fixes
2016-01-22 14:58:44 +00:00
Chris Hill-Scott
396f8415c6 SKIRMISH MODE 2016-01-22 14:51:01 +00:00
Chris Hill-Scott
cd38d54be7 Make ‘template type’ radio buttons not <select>
Because burn your select tags[1]

This commit hard codes the markup for the time being until I can work out how
to get WTForms outputting the markup I want.

1. https://www.youtube.com/watch?v=CUkMCQR4TpY
2016-01-22 14:51:00 +00:00
Chris Hill-Scott
9ee8610da0 Rename content to template content
WTForms sets the `id` of a `textarea` element to the variable name to which the
form control is assigned.

This conflicts with the page container, which is styled by targeting `#content`.
2016-01-22 14:51:00 +00:00
Chris Hill-Scott
48c0ae0140 Fix banner copy 2016-01-22 13:14:50 +00:00
Chris Hill-Scott
b00f9d5821 Fix spcing on empty table 2016-01-22 13:14:50 +00:00
Martyn Inglis
fb3b6510c4 Added template ID to template page, to allow users to identity required data for API calls. 2016-01-22 12:44:19 +00:00
Rebecca Law
d7f3cccbc5 Merge pull request #102 from alphagov/templates_add_edit_fix
Templates add edit fix
2016-01-22 11:57:14 +00:00
Nicholas Staples
f34d744425 Merge with master. 2016-01-22 11:38:16 +00:00
Nicholas Staples
5d5505bbff Delete template fix. 2016-01-22 11:36:49 +00:00
Adam Shimali
b2432791d1 Merge pull request #100 from alphagov/restricted-mode-banner
Add restricted mode warning
2016-01-22 11:27:18 +00:00
Adam Shimali
086e0fdd64 Merge pull request #101 from alphagov/fix-max-login
Fix bug with variable names
2016-01-22 11:25:58 +00:00
Nicholas Staples
dc7504b5a9 Edit form now populated correctly. 2016-01-22 11:24:33 +00:00
Rebecca Law
fd11e863da Fix bug with variable names 2016-01-22 11:21:30 +00:00
Nicholas Staples
ac433835f0 Fixed viewing templates. 2016-01-22 11:20:39 +00:00
Nicholas Staples
bb853ee95a Added fixes, displaying templates still needs to be fixed. 2016-01-22 11:14:56 +00:00
Chris Hill-Scott
6f1f514b2b Add restricted mode warning
For the hack day, we should only let developers use the platform in restricted
mode. This commit adds a banner telling them this.

Can’t get the app running locally, so fingers crossed it actually looks how
I imagine it’s going to look…
2016-01-22 11:00:44 +00:00
Rebecca Law
6fde5f99c7 Merge pull request #98 from alphagov/user-api-bug-fix
Incorrect url passed to BaseApiClient which already has base_url.
2016-01-22 10:42:21 +00:00
Martyn Inglis
79c21388bb Content changes for switching services 2016-01-22 10:38:29 +00:00
Martyn Inglis
860f8e192c Removed side nav links for things we don't need on the hack day. 2016-01-22 10:31:34 +00:00
Adam Shimali
3e19fa50d2 Incorrect url passed to BaseApiClient which already has base_url.
Also added getter and setter of failed login count, although that is
yet to be synced with api.
2016-01-22 10:27:14 +00:00
Martyn Inglis
3b19c9b853 Updated sidebar links 2016-01-22 10:25:17 +00:00
Rebecca Law
64af225d2d fix code style 2016-01-22 10:02:41 +00:00
Rebecca Law
4ea59688b8 Remove base url for the token creation.
Fix variable name.
2016-01-22 10:01:14 +00:00
Adam Shimali
f461e997cf Merge pull request #96 from alphagov/api-keys-flow
Add pages for create/view/revoke API keys
2016-01-21 17:27:08 +00:00
Rebecca Law
61893c5c7e Validation on key name is case insenstive 2016-01-21 16:52:01 +00:00
Rebecca Law
81a5164fa5 Fix test to use mock_api_user 2016-01-21 15:56:08 +00:00
Rebecca Law
46e0e3fd1b Merge branch 'master' into api-keys-flow
Conflicts:
	tests/app/main/views/test_api_keys.py
2016-01-21 15:50:00 +00:00
Rebecca Law
fe6b406de4 Merge pull request #97 from alphagov/complete-sign-in
Complete sign in
2016-01-21 15:45:00 +00:00
Chris Hill-Scott
a66dd52ca8 Better words 2016-01-21 15:43:31 +00:00
Rebecca Law
e7713a8b7f Added a validator so that the key name is unique per service. 2016-01-21 14:15:36 +00:00
Rebecca Law
2b24909ca6 Fix tests for to use mock user for login 2016-01-21 12:43:11 +00:00
Rebecca Law
8737edfad1 Merge branch 'master' of github.com:alphagov/notifications-admin into api-keys-flow
Conflicts:
	tests/app/main/views/test_api_keys.py
2016-01-21 12:31:28 +00:00
Adam Shimali
167c7b0f13 Fixed some tests. Some broken mocked tests commented out until later 2016-01-21 12:31:09 +00:00
Rebecca Law
90fca93308 Implementation of api key pages.
Revoke page will show the correct key name
Show api keys shows a well formatted expiry date
Fix tests for api key endpoints.
2016-01-21 12:28:05 +00:00
Adam Shimali
ee23df2c73 some tests fixed 2016-01-21 12:12:06 +00:00
Adam Shimali
856b6adb56 First slice full sign in flow 2016-01-21 11:33:53 +00:00
NIcholas Staples
33075178e8 Merge pull request #94 from alphagov/verify-user
Verify activate and login user with sms and email code
2016-01-21 09:45:19 +00:00
Rebecca Law
41c775cd68 Created api_key_api_client.
Implementation of create, revoke and show api keys for service.
These calls work, however we still need to fix the tests.
2016-01-20 17:32:55 +00:00
Adam Shimali
4e28410794 Temporarily comment out tests that are timing out until mocking sorted 2016-01-20 17:24:17 +00:00
Nicholas Staples
39cc76947f Bumped version of notifications-python-client. 2016-01-20 17:12:57 +00:00
Adam Shimali
6a1cc32fd3 Merge pull request #93 from alphagov/send-sms-page-2
Put message previews on ‘Send SMS’ page
2016-01-20 16:36:34 +00:00
Adam Shimali
7af53761d9 fixed some mocks in test 2016-01-20 16:36:06 +00:00
Chris Hill-Scott
9784a9936c Add pages for create/view/revoke API keys
Copying what they’ve done on GOV.UK Pay, we should let users:
- generate as many keys as they want
- only see the key at time of creation
- give keys a name
- revoke any key at any time (this should be a one way operation)

And based on discussions with @minglis and @servingUpAces, the keys should be
used in conjunction with some kind of service ID, which gets encrypted with the
key. In other words the secret itself never gets sent over the wire.

This commit adds the UI (but not the underlying API integration) for doing the
above.
2016-01-20 16:22:23 +00:00
Adam Shimali
fcedae5fe1 Merge conflicts and test fixes 2016-01-20 15:40:06 +00:00
Adam Shimali
ca3d3240a6 Verify activate and login user with sms and email code 2016-01-20 15:34:42 +00:00
Adam Shimali
5924500f3e Merge pull request #95 from alphagov/implement_send_sms_and_email
Implement send sms and email
2016-01-20 15:24:29 +00:00
Nicholas Staples
75d7110642 Updated to send email through the client send_email. 2016-01-20 14:45:50 +00:00
Chris Hill-Scott
b6390b02a3 Remove old template picker 2016-01-20 13:20:16 +00:00