Commit Graph

11012 Commits

Author SHA1 Message Date
Martyn Inglis
742a567036 Added AWS files to
- upgrade database
- use credstash for secret overrides
2016-01-19 14:50:42 +00:00
Rebecca Law
15578cfdb7 Remove config that is no longer used 2016-01-19 14:21:03 +00:00
Martyn Inglis
7ecede46e5 Merge branch 'master' into proxy-to-alpha
Conflicts:
	config.py
2016-01-19 14:11:20 +00:00
Adam Shimali
6141a11e7f Merge pull request #19 from alphagov/create-admin-client-token
Authentication for admin client api calls where a user and service is…
2016-01-19 14:08:42 +00:00
Rebecca Law
d15e68238d Authentication for admin client api calls where a user and service is not required. 2016-01-19 14:01:26 +00:00
Martyn Inglis
a56c7f59d3 Fixed test that had a clash on user ids 2016-01-19 13:59:45 +00:00
Martyn Inglis
346bc9feac Merge branch 'master' into proxy-to-alpha 2016-01-19 13:49:54 +00:00
Martyn Inglis
7b756567af Updated tests for fetch notifications by id, not simply fetch all 2016-01-19 13:45:57 +00:00
NIcholas Staples
571661ceb0 Merge pull request #17 from alphagov/create-api-keys
Replace Tokens with Api keys
2016-01-19 13:14:28 +00:00
Rebecca Law
15b2d414cc Updates from review comments:
Update api_key relationship.
Check that id in dict exists before deleting it
2016-01-19 13:11:22 +00:00
Rebecca Law
43d54b6ad3 Update the down revision to the version 0006 file. 2016-01-19 12:17:01 +00:00
Rebecca Law
56b33496ff Added name to api key when creating key for admin user.
NOTE: this will change in the next PR
2016-01-19 12:13:47 +00:00
Rebecca Law
4fc5c34320 Change Tokens to ApiKey
Added name to ApiKey model
2016-01-19 12:13:47 +00:00
Rebecca Law
6966c2484f Merge pull request #16 from alphagov/move-users-to-api
Add rest of user model fields to api.
2016-01-19 12:09:39 +00:00
Adam Shimali
44824c9985 Update error message for password to match marshmallow errors. 2016-01-19 12:07:14 +00:00
Adam Shimali
f839bae1f5 Add rest of user model fields to api.
First step to moving user interactions to api.
2016-01-19 11:39:59 +00:00
Martyn Inglis
d275ba83a2 Added endpoints for the proxy to notifications.
- this uses alpha API for delivery
- no DB model included as just proving
- all notifications for same service at the moment (!)
2016-01-19 11:23:09 +00:00
Adam Shimali
6c7fb42272 Merge pull request #15 from alphagov/remove_test_view_folders
Remove views from test module
2016-01-18 11:21:51 +00:00
Rebecca Law
5543e1b812 Remove views from test module 2016-01-18 11:19:22 +00:00
Adam Shimali
afdff57f32 Merge pull request #14 from alphagov/default_admin_user
Manager command to create an admin user for the environment.
2016-01-18 11:07:06 +00:00
Rebecca Law
8ace626320 Fix code style 2016-01-18 11:03:38 +00:00
Rebecca Law
615852e067 Merge pull request #13 from alphagov/fix-job-url
Fix for job urls that should have been within context of a service.
2016-01-18 11:00:11 +00:00
Rebecca Law
c4e5ab7c77 Manager command to create an admin user for the environment. 2016-01-18 10:56:26 +00:00
Adam Shimali
f4a0a9b8d9 Fix for job urls that should have been within context of a service.
The service id path parameter is captured in the url prefix for the
job blueprint.
2016-01-18 09:57:04 +00:00
Rebecca Law
56f455fe3a Merge pull request #12 from alphagov/add-job-fields
Add convenience fields to job to make processing
2016-01-18 09:54:24 +00:00
Adam Shimali
f3b6769193 Add convenience fields to job to make processing
easier.
2016-01-16 10:14:48 +00:00
Adam Shimali
4d8a023f11 Merge pull request #11 from alphagov/require_auth
Implementation for jwt authorization tokens
2016-01-15 19:22:27 +00:00
Rebecca Law
96ba2d13b3 Updated job endpoint tests with authorization header 2016-01-15 17:11:02 +00:00
Rebecca Law
b05ad17029 Remove trailing slashing from urls 2016-01-15 17:02:29 +00:00
Rebecca Law
e2e494c30b Remove trailing slash from template url 2016-01-15 17:02:29 +00:00
Rebecca Law
0ad292300d Added authorization headers for all requests 2016-01-15 17:02:29 +00:00
Rebecca Law
5f59b631e1 Added the before_request so that all calls must have a valid token.
Next is to get all the rest tests to pass again.
2016-01-15 17:01:26 +00:00
Rebecca Law
37b571235f Merge pull request #10 from alphagov/add-job-api
Added endpoints for creating job, and getting job/jobs.
2016-01-15 16:57:09 +00:00
Adam Shimali
99c38314b5 Removed trailing slash from job rest base url 2016-01-15 16:34:48 +00:00
Adam Shimali
834801d19b Added endpoints for creating job, and getting job/jobs. 2016-01-15 15:48:05 +00:00
NIcholas Staples
5cc0f8fff6 Merge pull request #9 from alphagov/add-job
Added model and dao for Jobs.
2016-01-15 13:45:40 +00:00
Adam Shimali
012cff5ae2 test cleanup with fixtures 2016-01-15 12:16:07 +00:00
Adam Shimali
ef6d1008e5 Fix revision ID 2016-01-15 11:33:47 +00:00
Adam Shimali
b9f6db1856 Added model and dao for Jobs. 2016-01-15 11:12:05 +00:00
Adam Shimali
c6a0986f5f Merge pull request #8 from alphagov/flatten-structure
Remove the view packages
2016-01-14 16:49:52 +00:00
Rebecca Law
d834277297 Fix code style 2016-01-14 16:24:25 +00:00
Rebecca Law
010408d98a Remove the view packages 2016-01-14 16:13:27 +00:00
Adam Shimali
3aa73b59e8 Merge pull request #7 from alphagov/remove_main
Removed the main package.
2016-01-14 14:41:03 +00:00
Rebecca Law
34693d70af Removed the main package. 2016-01-14 14:28:23 +00:00
NIcholas Staples
77d00b7d2d Merge pull request #6 from alphagov/service_tokens
Service tokens
2016-01-14 11:59:13 +00:00
Rebecca Law
436f45b70d Moved the _generate_token methods to the tokens_dao. 2016-01-14 11:30:45 +00:00
Rebecca Law
5e61515eb6 Fix the migration script so that the down revision is pointing to the migration scripts in the merge 2016-01-14 10:23:06 +00:00
Rebecca Law
cf730de927 Remove print statement 2016-01-14 10:19:23 +00:00
Rebecca Law
4a692d555e Create a relationship between services and tokens 2016-01-14 10:19:22 +00:00
Rebecca Law
255dddaa27 Changed the token endpoints so that you can renew a token and revoke a token.
Updated create service so the token is created at that time
2016-01-14 10:18:11 +00:00