From 0297a7e7e67c43e545b001b1499321d4849a7799 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 28 Jul 2015 11:35:58 -0700 Subject: [PATCH] Use fetch_urls code to do basic auth instead of our own i nthe twilio module --- notification/twilio.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/notification/twilio.py b/notification/twilio.py index 58898b0bc73..9ed1a09e12e 100644 --- a/notification/twilio.py +++ b/notification/twilio.py @@ -104,7 +104,6 @@ EXAMPLES = ''' # ======================================= # twilio module support methods # -import base64 import urllib @@ -119,14 +118,15 @@ def post_twilio_api(module, account_sid, auth_token, msg, from_number, data['MediaUrl'] = media_url encoded_data = urllib.urlencode(data) - base64string = base64.encodestring('%s:%s' % \ - (account_sid, auth_token)).replace('\n', '') - headers = {'User-Agent': AGENT, 'Content-type': 'application/x-www-form-urlencoded', 'Accept': 'application/json', - 'Authorization': 'Basic %s' % base64string, } + + # Hack module params to have the Basic auth params that fetch_url expects + module.params['url_username'] = account_sid.replace('\n', '') + module.params['url_password'] = auth_token.replace('\n', '') + return fetch_url(module, URI, data=encoded_data, headers=headers)