darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-02 05:41:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,111 Commits 127 Branches 60 Tags
b32f0ab2cd35cba73ce696536edaff9811ed8e2f
Commit Graph

1111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Shimali
b32f0ab2cd Resolve conflicts 2016-07-01 16:53:12 +01:00
Rebecca Law
2a904b5ff7 Merge pull request #497 from alphagov/split-send_email-task 
Split send email task
 2016-07-01 16:47:03 +01:00
Adam Shimali
c29dd23702 Add sms sender to service to be used in sms templates 
in place of default numeric short code.

If not present default short code is used.
 2016-07-01 15:27:54 +01:00
Rebecca Law
4a321497fc Remove print 2016-07-01 15:03:28 +01:00
Rebecca Law
3aff22cf87 Improve the logging message 2016-07-01 14:42:40 +01:00
Rebecca Law
f52755742c Split send_email task into one task to create the notification and one to send it to the provider. 
Is there is an exception the task will go to the retry queue.
 2016-07-01 14:14:28 +01:00
Chris Hill-Scott
5e0033e36d Merge pull request #488 from alphagov/email-breathing-room 
Add breathing room around GOV.UK logo in emails
 2016-07-01 13:50:08 +01:00
Leo Hemsted
11093530f9 Merge pull request #485 from alphagov/api_user-cleanup 
Api user cleanup
 2016-07-01 10:58:18 +01:00
Rebecca Law
d5382120ad Merge pull request #489 from alphagov/use_type_from_model 
Use type from model
 2016-07-01 10:40:04 +01:00
Rebecca Law
3f11447bc8 A small refactor to use the SMS_TYPE and EMAIL_TYPE in code rather that 'sms' or 'email' 2016-06-30 15:41:51 +01:00
Chris Hill-Scott
0358bdfe05 Add breathing room around GOV.UK logo in emails 
Implements and depends on:

- [ ] https://github.com/alphagov/notifications-utils/pull/44
 2016-06-30 15:27:21 +01:00
Chris Hill-Scott
a26d2a2551 Merge pull request #482 from alphagov/swagger-spike 
Publish a Swagger specification
 2016-06-30 13:41:33 +01:00
Leo Hemsted
3838715077 refactored the requires_auth handler to raise exceptions 
hopefully cleans up code flow and readability [a tiny bit].
raise an AuthException in auth.py, and catch it in errors.py to
save on returning error_repsonse values throughout the function
 2016-06-30 10:44:21 +01:00
Leo Hemsted
39519e3f36 attach api_key to app 
we previously attached the service id and the key's secret
also more refactoring of auth.py
 2016-06-30 10:44:21 +01:00
Leo Hemsted
adbe02783d refactor authentication code 
moved api_key secret manipulation (generating and getting) into
authentiation/utils, and added a property on the model, to facilitate
easier matching of authenticated requests and the api keys they used
 2016-06-30 10:44:21 +01:00
Leo Hemsted
18b30de452 fix calling init_app twice 
this was causing flask decorators like auth check to be mounted twice
 2016-06-30 10:44:21 +01:00
Leo Hemsted
2b645f490a move get_all_notifications_for_service and get_all_notifications_for_job 
moved from notifications/rest -> service/rest and job/rest respectively
endpoint routes not affected
removed requires_admin decorator - that should be set by nginx config
as opposed to python code
 2016-06-30 10:44:21 +01:00
Rebecca Law
848858f4e4 Merge pull request #481 from alphagov/add-notification-type 
Add notification type
 2016-06-29 13:27:03 +01:00
Rebecca Law
1ce3495fc7 Remove reference to template.template_type for the stats update query. 
Removes a query during the stats update.
 2016-06-29 12:12:35 +01:00
Chris Hill-Scott
7c3d25a87a Publish a Swagger specification 
Adds a new endpoint (`/spec`) which returns a the specification of the
API in Swagger-formatted JSON.

This means we will have something to point frontends at, so we can
evaluate which ones we like.

Right now it’s all hand-defined. If we were consistent about our use of
Marshmallow we could generated the spec from the Marshmallow schemas.
 2016-06-29 12:07:32 +01:00
Rebecca Law
25db1bce74 Use the notification types enum for the notifications.notification_type. 
Reuse EMAIL_TYPE in template_types and notification_types.
 2016-06-29 11:50:54 +01:00
Rebecca Law
60e159e3c0 Add notification_type to notification table. 
It seems like an oversight not to include the notification type in the notifcation.
When updating statistics a query to the template table is required to get the type, this update will mean that query does not have to happen.
 2016-06-29 11:23:02 +01:00
Rebecca Law
340abae82c Merge pull request #478 from alphagov/make-password_changed_at-not-null 
Users.password_changed_at not nullable
 2016-06-28 17:00:22 +01:00
Leo Hemsted
a5ccee49e9 Merge pull request #477 from alphagov/remove-default-key-type 
remove default key_type
 2016-06-28 15:15:19 +01:00
Rebecca Law
90ba1ec152 Add downgrade 2016-06-28 14:45:12 +01:00
Rebecca Law
abb9135e35 Password changed at is defaulted to the current date when the user is created. 
This PR set the users.password_changed_at column to not be nullable.
 2016-06-28 11:24:08 +01:00
Leo Hemsted
4c44f0c9e9 remove default key_type 2016-06-27 17:00:02 +01:00
Rebecca Law
fe80d785f9 Merge pull request #474 from alphagov/notification-created-status 
Notification created status
 2016-06-27 15:45:14 +01:00
Rebecca Law
b3fabae958 Merge and codestyle 2016-06-27 15:38:25 +01:00
Rebecca Law
6626771335 Merge branch 'master' into notification-created-status 2016-06-27 15:36:42 +01:00
Rebecca Law
3346582634 Fix codestyle 2016-06-27 15:32:26 +01:00
Rebecca Law
90e8154700 Added a test that the message is not sent if the status of the notification is not created. 2016-06-27 15:23:23 +01:00
Rebecca Law
8435217808 Fix new test for the default status of a notification 2016-06-27 15:02:53 +01:00
Leo Hemsted
523215c8fa Merge pull request #473 from alphagov/api-key-type 
key_types table
 2016-06-27 15:02:52 +01:00
Rebecca Law
48e64abd81 Merge branch 'master' into notification-created-status 2016-06-27 14:59:56 +01:00
Rebecca Law
8a0211b3eb Only send to the provider if the notification has a created status. 
If the notification ends up in the retry queue and the delivery app is restarted the notification will get sent twice.
This is because when the app is restarted another message will be in the retry queue as message available which is a
duplicate of the one in the queue that is a  message in flight.

This should complete https://www.pivotaltracker.com/story/show/121844427
 2016-06-27 14:47:20 +01:00
Leo Hemsted
9eedb19fd4 default to KEY_TYPE_NORMAL to ensure backwards compatibility 
also cleaned up tests around api_keys - fixed imports, reduced fixture usage
and added an additional (temporary) test for default test type
 2016-06-24 16:33:51 +01:00
Leo Hemsted
e9482c7fe1 add new key_type table 
* single-column static data table that currently contains two types: 'normal' and 'team'
* key_type foreign-keyed from api_keys
  - must be not null
  - existing rows set to 'normal'
* key_type foreign-keyed from notifications
  - nullable
  - existing rows set to null
* api_key foreign-keyed from notifications
  - nullable
  - existing rows set to null
 2016-06-24 15:56:54 +01:00
Leo Hemsted
f371c393a2 rename renew_api_key to create_api_key 2016-06-23 16:44:57 +01:00
Adam Shimali
abbd106212 Merge pull request #469 from alphagov/notifications-body-bug-fix 
Body of notification without placeholder should have been present.
 2016-06-23 16:05:38 +01:00
Adam Shimali
0e2e99f64e notifications_utils Template constructor accepts None for 
personalisation data therefore None check not needed.

If personalisation is None in in db it will get passed through to
template which returns content.
 2016-06-23 15:35:35 +01:00
Adam Shimali
3423c0c44d Added subject for email templates 2016-06-23 15:21:03 +01:00
Adam Shimali
f65b86cfc9 Body of notification without placeholder should have been present. 2016-06-23 10:25:07 +01:00
Adam Shimali
ed5bdb7be8 Merge pull request #467 from alphagov/notification-created-status 
Notification created status for send_sms
 2016-06-23 10:21:43 +01:00
Rebecca Law
8f19ad19f8 Stop sending the encrypted message to the send_sms_to_provider task. 
Everything the task needs is now stored in the db.
 2016-06-23 09:41:21 +01:00
Leo Hemsted
edd920769c Merge pull request #459 from alphagov/replaced-subjects 
Replaced subjects
 2016-06-22 17:06:18 +01:00
Rebecca Law
02e37dee3a Merge branch 'master' into notification-created-status 2016-06-22 16:58:33 +01:00
Leo Hemsted
4ce26dc1a4 Merge pull request #463 from alphagov/test-refactor 
Remove db.drop_all from notify_db session fixture to speed up tests
 2016-06-22 16:53:06 +01:00
Leo Hemsted
c92138d5ab return replaced subject back from get notifications API 2016-06-22 16:24:34 +01:00
Rebecca Law
11ac7b2874 Merge branch 'master' into notification-created-status 
Conflicts:
	app/dao/notifications_dao.py
 2016-06-22 16:15:56 +01:00