aboutsummaryrefslogtreecommitdiffstats
path: root/project
diff options
context:
space:
mode:
authorJan Tuomi <jan-sebastian.tuomi@aalto.fi>2016-07-21 18:16:16 +0300
committerJan Tuomi <jan-sebastian.tuomi@aalto.fi>2016-07-21 18:16:16 +0300
commit392a51b858dde0c68ce93a9415c3841062a70805 (patch)
tree2553cd5c34091ec15b5fa57e815c2a250ee2de51 /project
parente13ae89fcbd1543bf583e7a56f82ccaef4dfa8d4 (diff)
Add API token config parameter for API authentication
Diffstat (limited to 'project')
-rw-r--r--project/botmanager.py3
-rw-r--r--project/shoutboxapicommunicator.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/project/botmanager.py b/project/botmanager.py
index 151e94d..1a3e037 100644
--- a/project/botmanager.py
+++ b/project/botmanager.py
@@ -37,11 +37,12 @@ class BotManager(object):
logging.error("Error creating bot listener. src will now exit...")
sys.exit(1)
- def set_parameters(self, shoutbox_api_url, telegram_chat_id, api_call_interval):
+ def set_parameters(self, shoutbox_api_url, telegram_chat_id, api_call_interval, api_auth_token):
"""Store parameters in the manager instance"""
ShoutboxCommunicator.url = shoutbox_api_url
TelegramCommunicator.chat_id = telegram_chat_id
ShoutboxCommunicator.interval = api_call_interval
+ ShoutboxCommunicator.token = api_auth_token
def start(self):
"""Try fetching bot information from Telegram to check connection"""
diff --git a/project/shoutboxapicommunicator.py b/project/shoutboxapicommunicator.py
index c30b408..21e7e8e 100644
--- a/project/shoutboxapicommunicator.py
+++ b/project/shoutboxapicommunicator.py
@@ -11,6 +11,7 @@ class ShoutboxCommunicator(BaseCommunicator):
url = "http://localhost:8000"
interval = 10
+ token = ""
@staticmethod
def get_url():
@@ -47,8 +48,9 @@ class ShoutboxCommunicator(BaseCommunicator):
@staticmethod
def send(data):
"""Send a message to the API"""
- post_params = "?user={}&text={}&id={}&ip={}&timestamp={}".format(
- data["user"], data["text"], data["id"], data["ip"], data["timestamp"]
+ post_params = "?user={}&text={}&id={}&ip={}&timestamp={}&api_token={}".format(
+ data["user"], data["text"], data["id"], data["ip"], data["timestamp"],
+ ShoutboxCommunicator.token
)
try: