diff --git a/notifications.py b/notifications.py index d6b8b55..5f58e12 100644 --- a/notifications.py +++ b/notifications.py @@ -17,9 +17,9 @@ def send_notification(app, target_user, mapname, old_replay, new_replay): payload = { "users": [target_user], "msg" : message } - - r = requests.post(app.config["DISPATCH_SERVER"] + "/smart-send", - json=payload, auth=app.config["DISPATCH_AUTH"]) + url_and_token = "/smart-send?dispatch-access-token={}".format(app.config["DISPATCH_TOKEN"]) + r = requests.post(app.config["DISPATCH_SERVER"] + url_and_token, json=payload) if not r.ok: - print("Error handing off notification to dispatch ({})".format(r.status_code), file=sys.stderr) + msg = "Error handing off notification to dispatch ({} {})".format(r.status_code, r.content) + print(msg, file=sys.stderr) diff --git a/server.py b/server.py index 73b9cb6..64624c1 100755 --- a/server.py +++ b/server.py @@ -515,7 +515,7 @@ def create_app(): app.config["DISPATCH_SERVER"] = os.environ.get("DISPATCH_SERVER") if app.config["DISPATCH_SERVER"]: - app.config["DISPATCH_AUTH"] = (os.environ["DISPATCH_AUTH_USER"], os.environ["DISPATCH_AUTH_PASSWORD"]) + app.config["DISPATCH_TOKEN"] = os.environ["DISPATCH_TOKEN"] if __name__ == "__main__":