8000 Add API key auth support · PNPtutorials/twilio-python@b24dd45 · GitHub
[go: up one dir, main page]
Skip to content

Commit b24dd45

Browse files
author
Carlos Diaz-Padron
committed
Add API key auth support
1 parent 25fd789 commit b24dd45

File tree

8 files changed

+25
-17
lines changed

8 files changed

+25
-17
lines changed

‎twilio/rest/base.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ def set_twilio_proxy(proxy_url, proxy_port):
3030

3131
class TwilioClient(object):
3232
def __init__(self, account=None, token=None, base="https://api.twilio.com",
33-
version="2010-04-01",
34-
timeout=UNSET_TIMEOUT):
33+
version="2010-04-01", timeout=UNSET_TIMEOUT,
34+
request_account=None):
3535
"""
3636
Create a Twilio API client.
3737
"""
@@ -58,8 +58,9 @@ def __init__(self, account=None, token=None, base="https://api.twilio.com",
5858
self.base = base
5959
self.auth = (account, token)
6060
self.timeout = timeout
61+
req_account = request_account if request_account else account
6162
self.account_uri = "{0}/{1}/Accounts/{2}".format(base,
62-
version, account)
63+
version, req_account)
6364

6465
def request(self, path, method=None, vars=None):
6566
"""sends a request and gets a response from the Twilio REST API

‎twilio/rest/client.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ class TwilioRestClient(TwilioClient):
4242
""&qu 8000 ot;
4343

4444
def __init__(self, account=None, token=None, base="https://api.twilio.com",
45-
version="2010-04-01", timeout=UNSET_TIMEOUT):
45+
version="2010-04-01", timeout=UNSET_TIMEOUT,
46+
request_account=None):
4647
"""
4748
Create a Twilio REST API client.
4849
"""
4950
super(TwilioRestClient, self).__init__(account, token, base, version,
50-
timeout)
51+
timeout, request_account)
5152

5253
version_uri = "%s/%s" % (base, version)
5354

‎twilio/rest/ip_messaging.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ class TwilioIpMessagingClient(TwilioClient):
2121

2222
def __init__(self, account=None, token=None,
2323
base="https://ip-messaging.twilio.com", version="v1",
24-
timeout=UNSET_TIMEOUT):
24+
timeout=UNSET_TIMEOUT, request_account=None):
2525

2626
super(TwilioIpMessagingClient, self).__init__(account, token, base,
27-
version, timeout)
27+
version, timeout,
28+
request_account)
2829

2930
self.version_uri = "%s/%s" % (base, version)
3031
self.services = Services(self.version_uri, self.auth, timeout)

‎twilio/rest/lookups.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ class TwilioLookupsClient(TwilioClient):
2020

2121
def __init__(self, account=None, token=None,
2222
base="https://lookups.twilio.com", version="v1",
23-
timeout=UNSET_TIMEOUT):
23+
timeout=UNSET_TIMEOUT, request_account=None):
2424

2525
super(TwilioLookupsClient, self).__init__(account, token, base,
26-
version, timeout)
26+
version, timeout,
27+
request_account)
2728

2829
self.version_uri = "%s/%s" % (base, version)
2930
self.phone_numbers = PhoneNumbers(self.version_uri, self.auth, timeout)

‎twilio/rest/monitor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ class TwilioMonitorClient(TwilioClient):
2121

2222
def __init__(self, account=None, token=None,
2323
base="https://monitor.twilio.com", version="v1",
24-
timeout=UNSET_TIMEOUT):
24+
timeout=UNSET_TIMEOUT, request_account=None):
2525

2626
super(TwilioMonitorClient, self).__init__(account, token, base,
27-
version, timeout)
27+
version, timeout,
28+
request_account)
2829

2930
self.version_uri = "%s/%s" % (base, version)
3031
self.events = Events(self.version_uri, self.auth, timeout)

‎twilio/rest/pricing.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ class TwilioPricingClient(TwilioClient):
2121

2222
def __init__(self, account=None, token=None,
2323
base="https://pricing.twilio.com", version="v1",
24-
timeout=UNSET_TIMEOUT):
24+
timeout=UNSET_TIMEOUT, request_account=None):
2525
super(TwilioPricingClient, self).__init__(account, token, base,
26-
version, timeout)
26+
version, timeout,
27+
request_account)
2728

2829
self.uri_base = "{}/{}".format(base, version)
2930

‎twilio/rest/task_router.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ class TwilioTaskRouterClient(TwilioClient):
2525

2626
def __init__(self, account=None, token=None,
2727
base="https://taskrouter.twilio.com", version="v1",
28-
timeout=UNSET_TIMEOUT):
28+
timeout=UNSET_TIMEOUT, request_account=None):
2929
"""
3030
Create a Twilio REST API client.
3131
"""
3232
super(TwilioTaskRouterClient, self).__init__(account, token, base,
33-
version, timeout)
33+
version, timeout,
34+
request_account)
3435
self.base_uri = "{0}/{1}".format(base, version)
3536
self.workspace_uri = "{0}/Workspaces".format(self.base_uri)
3637

‎twilio/rest/trunking.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ class TwilioTrunkingClient(TwilioClient):
2222

2323
def __init__(self, account=None, token=None,
2424
base="https://trunking.twilio.com", version="v1",
25-
timeout=UNSET_TIMEOUT):
25+
timeout=UNSET_TIMEOUT, request_account=None):
2626
"""
2727
Create a Twilio REST API client.
2828
"""
2929
super(TwilioTrunkingClient, self).__init__(account, token, base,
30-
version, timeout)
30+
version, timeout,
31+
request_account)
3132
self.trunk_base_uri = "{0}/{1}".format(base, version)
3233

3334
def credential_lists(self, trunk_sid):

0 commit comments

Comments
 (0)
0