Merge pull request #1258 from Royal-Society-of-New-Zealand/issue-1256

Issue 1256
Royal-Society-of-New-Zealand · Dec 3, 2019 · 30e7a6d · 30e7a6d
2 parents b7f1ad7 + ddf7f2c
commit 30e7a6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/orcid_hub/utils.py b/orcid_hub/utils.py
@@ -2337,13 +2337,13 @@ def notify_about_update(user, event_type="UPDATED"):
 
 
 @rq.job(timeout=300)
-def invoke_webhook_handler(org_id,
+def invoke_webhook_handler(org_id=None,
                            orcid=None,
                            created_at=None,
                            updated_at=None,
                            message=None,
                            event_type="UPDATED",
-                           attempts=5):
+                           attempts=5, *args, **kwargs):
     """Propagate 'updated' event to the organisation event handler URL."""
     if not message:
         url = app.config["ORCID_BASE_URL"] + orcid
@@ -2364,8 +2364,11 @@ def invoke_webhook_handler(org_id,
                 message["email"] = user.email
                 if user.eppn:
                     message["eppn"] = user.eppn
-
-    org = Organisation.get(id=org_id)
+    if org_id:
+        org = Organisation.get(id=org_id)
+    else:
+        org = User.select().where(User.orcid == orcid).first().organisation
+        org_id = org.id
     url = org.webhook_url
     if org.webhook_append_orcid:
         if not url.endswith('/'):

diff --git a/tests/test_webhooks.py b/tests/test_webhooks.py
@@ -386,6 +386,10 @@ def test_webhook_invokation(client, mocker):
     with pytest.raises(Exception):
         utils.invoke_webhook_handler(org.id, attempts=1, message=message)
 
+    # Test backward compatibility
+    with pytest.raises(Exception):
+        utils.invoke_webhook_handler(orcid=user.orcid, attempts=2, message=message, legacy_kwarg="abc123")
+
 
 def test_org_webhook_api(client, mocker):
     """Test Organisation webhooks."""