Skip to content

Commit 15288cd

Browse files
ckoegelckoegel
committed
update oauth and tests
1 parent eb2818d commit 15288cd

21 files changed

+71
-76
lines changed

‎bandwidth/configuration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ def get_access_token(self) -> str:
542542
auth_header = f"Basic {_encoded_string}"
543543
resp = urllib3.request(
544544
'POST',
545-
'https://id.bandwidth.com/api/v1/oauth2/token',
545+
'https://api.bandwidth.com/api/v1/oauth2/token',
546546
headers={
547547
'Authorization': auth_header,
548548
'Content-Type': 'application/x-www-form-urlencoded',

‎custom_templates/configuration.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ conf = {{{packageName}}}.Configuration(
653653
auth_header = f"Basic {_encoded_string}"
654654
resp = urllib3.request(
655655
'POST',
656-
'https://id.bandwidth.com/api/v1/oauth2/token',
656+
'https://api.bandwidth.com/api/v1/oauth2/token',
657657
headers={
658658
'Authorization': auth_header,
659659
'Content-Type': 'application/x-www-form-urlencoded',

‎test/smoke/test_calls_api.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from hamcrest import assert_that, has_properties, not_none, instance_of
1212

13-
import bandwidth
13+
from bandwidth import ApiClient, ApiResponse, Configuration
1414
from bandwidth.api import calls_api
1515
from bandwidth.models.create_call import CreateCall
1616
from bandwidth.models.create_call_response import CreateCallResponse
@@ -20,7 +20,6 @@
2020
from bandwidth.models.machine_detection_mode_enum import MachineDetectionModeEnum
2121
from bandwidth.models.call_state_enum import CallStateEnum
2222
from bandwidth.models.redirect_method_enum import RedirectMethodEnum
23-
from bandwidth.models.call_state import CallState
2423
from bandwidth.models.update_call import UpdateCall
2524
from bandwidth.exceptions import ApiException, UnauthorizedException, ForbiddenException, NotFoundException
2625

@@ -29,29 +28,29 @@ class CallsIntegration(unittest.TestCase):
2928
"""Voice Calls API integration test"""
3029

3130
def setUp(self):
32-
configuration = bandwidth.Configuration(
33-
client_id=BW_USERNAME,
34-
client_secret=BW_PASSWORD,
31+
configuration = Configuration(
32+
client_id=BW_CLIENT_ID,
33+
client_secret=BW_CLIENT_SECRET
3534
)
36-
api_client = bandwidth.ApiClient(configuration)
35+
api_client = ApiClient(configuration)
3736
self.calls_api_instance = calls_api.CallsApi(api_client)
3837

3938
# Unauthorized API Client
4039

41-
unauthorizedConfiguration = bandwidth.Configuration(
40+
unauthorizedConfiguration = Configuration(
4241
username='bad_username',
4342
password='bad_password'
4443
)
45-
unauthorized_api_client = bandwidth.ApiClient(unauthorizedConfiguration)
44+
unauthorized_api_client = ApiClient(unauthorizedConfiguration)
4645
self.unauthorized_api_instance = calls_api.CallsApi(unauthorized_api_client)
4746

4847
# Forbidden API Client
4948

50-
forbiddenConfiguration = bandwidth.Configuration(
49+
forbiddenConfiguration = Configuration(
5150
username=FORBIDDEN_USERNAME,
5251
password=FORBIDDEN_PASSWORD
5352
)
54-
forbidden_api_client = bandwidth.ApiClient(forbiddenConfiguration)
53+
forbidden_api_client = ApiClient(forbiddenConfiguration)
5554
self.forbidden_api_instance = calls_api.CallsApi(forbidden_api_client)
5655
self.account_id = BW_ACCOUNT_ID
5756
self.createCallBody = CreateCall(

‎test/smoke/test_conferences_api.py‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@
22
Integration tests for Bandwidth's Voice Conferences API
33
"""
44

5-
from cgi import test
65
import json
76
import time
8-
from typing import Dict, List, Tuple
7+
from typing import Dict, Tuple
98
import unittest
109

1110
from hamcrest import assert_that, has_properties, not_none, instance_of, greater_than
1211

13-
import bandwidth
14-
from bandwidth import ApiResponse
12+
from bandwidth import ApiClient, ApiResponse, Configuration
1513
from bandwidth.api import calls_api
1614
from bandwidth.models.create_call import CreateCall
1715
from bandwidth.models.create_call_response import CreateCallResponse
18-
from bandwidth.models.call_state import CallState
1916
from bandwidth.models.call_state_enum import CallStateEnum
2017
from bandwidth.models.update_call import UpdateCall
2118
from bandwidth.models.redirect_method_enum import RedirectMethodEnum
@@ -41,32 +38,32 @@ def setUp(self):
4138
Set up for our tests by creating the CallsApi and ConferencesApi instances
4239
for testing as well as the unauthorized and forbidden credentials for the 4xx tests.
4340
"""
44-
configuration = bandwidth.Configuration(
45-
username=BW_USERNAME,
46-
password=BW_PASSWORD
41+
configuration = Configuration(
42+
client_id=BW_CLIENT_ID,
43+
client_secret=BW_CLIENT_SECRET
4744
)
48-
api_client = bandwidth.ApiClient(configuration)
45+
api_client = ApiClient(configuration)
4946

5047
self.calls_api_instance = calls_api.CallsApi(api_client)
5148
self.conference_api_instance = conferences_api.ConferencesApi(api_client)
5249

53-
unauthorizedConfiguration = bandwidth.Configuration(
50+
unauthorizedConfiguration = Configuration(
5451
username='bad_username',
5552
password='bad_password'
5653
)
57-
unauthorized_api_client = bandwidth.ApiClient(unauthorizedConfiguration)
54+
unauthorized_api_client = ApiClient(unauthorizedConfiguration)
5855
self.unauthorized_api_instance = conferences_api.ConferencesApi(unauthorized_api_client)
5956

60-
forbiddenConfiguration = bandwidth.Configuration(
57+
forbiddenConfiguration = Configuration(
6158
username=FORBIDDEN_USERNAME,
6259
password=FORBIDDEN_PASSWORD
6360
)
64-
forbidden_api_client = bandwidth.ApiClient(forbiddenConfiguration)
61+
forbidden_api_client = ApiClient(forbiddenConfiguration)
6562
self.forbidden_api_instance = conferences_api.ConferencesApi(forbidden_api_client)
6663

6764
# Rest client for interacting with Manteca
68-
self.rest_client = RESTClientObject(bandwidth.Configuration.get_default_copy())
69-
configuration = bandwidth.Configuration(
65+
self.rest_client = RESTClientObject(Configuration.get_default_copy())
66+
configuration = Configuration(
7067
username=BW_USERNAME,
7168
password=BW_PASSWORD,
7269
)

‎test/smoke/test_media_api.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
from bandwidth import ApiResponse
1111

12-
import bandwidth
12+
from bandwidth import ApiClient, ApiResponse, Configuration
1313
from hamcrest import *
1414
from bandwidth.api import media_api
1515
from bandwidth.models.media import Media
16-
from bandwidth.exceptions import ApiException, NotFoundException
16+
from bandwidth.exceptions import NotFoundException
1717
from test.utils.env_variables import *
1818

1919

@@ -22,11 +22,11 @@ class TestMedia(unittest.TestCase):
2222
"""
2323

2424
def setUp(self) -> None:
25-
configuration = bandwidth.Configuration(
25+
configuration = Configuration(
2626
username=BW_USERNAME,
2727
password=BW_PASSWORD
2828
)
29-
self.api_client = bandwidth.ApiClient(configuration)
29+
self.api_client = ApiClient(configuration)
3030
self.api_instance = media_api.MediaApi(self.api_client)
3131
self.account_id = BW_ACCOUNT_ID
3232
self.media_path = "./test/fixtures/"

‎test/smoke/test_messages_api.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import bandwidth
1111
from hamcrest import *
1212

13-
from bandwidth import ApiResponse
13+
from bandwidth import ApiClient, ApiResponse, Configuration
1414
from bandwidth.api import messages_api
1515
from bandwidth.models.list_message_direction_enum import ListMessageDirectionEnum
1616
from bandwidth.models.list_message_item import ListMessageItem
@@ -29,16 +29,16 @@ class TestMessagesApi(unittest.TestCase):
2929

3030
def setUp(self):
3131
# API Client
32-
configuration = bandwidth.Configuration(
33-
client_id=BW_USERNAME,
34-
client_secret=BW_PASSWORD,
32+
configuration = Configuration(
33+
client_id=BW_CLIENT_ID,
34+
client_secret=BW_CLIENT_SECRET
3535
)
36-
api_client = bandwidth.ApiClient(configuration)
36+
api_client = ApiClient(configuration)
3737
self.api_instance = messages_api.MessagesApi(api_client)
3838
self.account_id = BW_ACCOUNT_ID
3939

4040
# Unauthorized API Client
41-
self.unauthorized_api_client = bandwidth.ApiClient()
41+
self.unauthorized_api_client = ApiClient()
4242
self.unauthorized_api_instance = messages_api.MessagesApi(self.unauthorized_api_client)
4343

4444
# Message Properties

‎test/smoke/test_mfa_api.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import logging
99
from random import randint
1010

11-
import bandwidth
11+
from bandwidth import ApiClient, Configuration
1212
from bandwidth.api import mfa_api
1313
from bandwidth.models.code_request import CodeRequest
1414
from bandwidth.models.messaging_code_response import MessagingCodeResponse
@@ -26,11 +26,11 @@ class TestMultiFactorAuthentication(unittest.TestCase):
2626
"""
2727

2828
def setUp(self) -> None:
29-
configuration = bandwidth.Configuration(
29+
configuration = Configuration(
3030
username=BW_USERNAME,
3131
password=BW_PASSWORD
3232
)
33-
api_client = bandwidth.ApiClient(configuration)
33+
api_client = ApiClient(configuration)
3434
self.api_instance = mfa_api.MFAApi(api_client)
3535
self.account_id = BW_ACCOUNT_ID
3636
self.messaging_code_request = CodeRequest(
@@ -137,7 +137,7 @@ def testBadRequest(self) -> None:
137137
def testUnauthorizedRequest(self) -> None:
138138
"""Validate an unauthorized (401) request
139139
"""
140-
unauthorized_api_client = bandwidth.ApiClient()
140+
unauthorized_api_client = ApiClient()
141141
unauthorized_api_instance = mfa_api.MFAApi(unauthorized_api_client)
142142

143143
with self.assertRaises(UnauthorizedException) as context:
@@ -150,12 +150,12 @@ def testUnauthorizedRequest(self) -> None:
150150
def testForbiddenRequest(self) -> None:
151151
"""Validate a forbidden (403) request
152152
"""
153-
configuration = bandwidth.Configuration(
153+
configuration = Configuration(
154154
username=FORBIDDEN_USERNAME,
155155
# password=FORBIDDEN_PASSWORD,
156156
password='bad_password'
157157
)
158-
forbidden_api_client = bandwidth.ApiClient(configuration)
158+
forbidden_api_client = ApiClient(configuration)
159159
forbidden_api_instance = mfa_api.MFAApi(forbidden_api_client)
160160

161161
with self.assertRaises(ForbiddenException) as context:

‎test/smoke/test_multi_channel_api.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
from bandwidth.models.multi_channel_message_request import MultiChannelMessageRequest
2525
from bandwidth.models.multi_channel_message_channel_enum import MultiChannelMessageChannelEnum
2626
from bandwidth.models.multi_channel_channel_list_request_object import MultiChannelChannelListRequestObject
27-
from bandwidth.models.multi_channel_channel_list_sms_response_object import MultiChannelChannelListSMSResponseObject
2827
from bandwidth.models.multi_channel_channel_list_sms_object import MultiChannelChannelListSMSObject
2928
from bandwidth.models.sms_message_content import SmsMessageContent
3029
from bandwidth.models.create_multi_channel_message_response import CreateMultiChannelMessageResponse

‎test/smoke/test_phone_number_lookup_api.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
from bandwidth.models.completed_lookup_status_enum import CompletedLookupStatusEnum
3232
from bandwidth.models.lookup_result import LookupResult
3333
from bandwidth.models.line_type_enum import LineTypeEnum
34-
from bandwidth.models.latest_message_delivery_status_enum import LatestMessageDeliveryStatusEnum
3534
from bandwidth.models.get_async_bulk_lookup_response import GetAsyncBulkLookupResponse
3635

3736
from test.utils.env_variables import *
@@ -41,8 +40,8 @@ class TestPhoneNumberLookupApi(unittest.TestCase):
4140

4241
def setUp(self) -> None:
4342
configuration = Configuration(
44-
client_id=BW_USERNAME,
45-
client_secret=BW_PASSWORD
43+
client_id=BW_CLIENT_ID,
44+
client_secret=BW_CLIENT_SECRET
4645
)
4746
api_client = ApiClient(configuration)
4847
self.api = PhoneNumberLookupApi(api_client)

‎test/smoke/test_recordings_api.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
import time
88
import json
99

10-
import bandwidth
1110
from hamcrest import *
1211

13-
from bandwidth import ApiResponse
12+
from bandwidth import ApiClient, ApiResponse, Configuration
1413
from bandwidth.api.recordings_api import RecordingsApi
1514
from bandwidth.configuration import Configuration
1615
from bandwidth.exceptions import ForbiddenException, NotFoundException, UnauthorizedException
@@ -66,19 +65,19 @@ def setUp(self) -> None:
6665
Set up for our tests by creating the CallsApi and RecordingsApi instances
6766
for testing.
6867
"""
69-
configuration = bandwidth.Configuration(
70-
username=BW_USERNAME,
71-
password=BW_PASSWORD
68+
configuration = Configuration(
69+
client_id=BW_CLIENT_ID,
70+
client_secret=BW_CLIENT_SECRET
7271
)
73-
api_client = bandwidth.ApiClient(configuration)
72+
api_client = ApiClient(configuration)
7473

7574
# Two Valid API Clients
7675
self.calls_api_instance = CallsApi(api_client)
7776
self.recordings_api_instance = RecordingsApi(api_client)
7877

7978
# Unauthorized Recordings API Client
8079
self.unauthorized_recordings_api_instance = RecordingsApi(
81-
api_client=bandwidth.ApiClient(Configuration.get_default_copy())
80+
api_client=ApiClient(Configuration.get_default_copy())
8281
)
8382

8483
# Rest client for interacting with Manteca

0 commit comments

Comments
 (0)