Uptake of review comments

twilio/authStrategy/authStrategy.py → twilio/auth_strategy/auth_strategy.py

@@ -1,4 +1,4 @@
-from twilio.authStrategy.authType import AuthType
+from twilio.auth_strategy.auth_type import AuthType
 from enum import Enum
 from abc import abstractmethod
 

twilio/authStrategy/authType.py → twilio/auth_strategy/auth_type.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 class AuthType(Enum):
-    TOKEN = 'token'
+    ORGS_TOKEN = 'orgs_stoken'
     NO_AUTH = 'noauth'
     BASIC = 'basic'
     API_KEY = 'api_key'

twilio/authStrategy/tokenAuthStrategy.py → twilio/auth_strategy/token_auth_strategy.py

@@ -1,18 +1,21 @@
 import jwt
 import threading
+import logging
 from datetime import datetime, timedelta
 
-from twilio.authStrategy.authType import AuthType
-from twilio.authStrategy.authStrategy import AuthStrategy
+from twilio.auth_strategy.auth_type import AuthType
+from twilio.auth_strategy.auth_strategy import AuthStrategy
 from twilio.http.token_manager import TokenManager
 
 
 class TokenAuthStrategy(AuthStrategy):
     def __init__(self, token_manager: TokenManager):
-        super().__init__(AuthType.TOKEN)
+        super().__init__(AuthType.ORGS_TOKEN)
         self.token_manager = token_manager
         self.token = None
         self.lock = threading.Lock()
+        logging.basicConfig(level=logging.INFO)
+        self.logger = logging.getLogger(__name__)
 
     def get_auth_string(self) -> str:
         if self.token is None:
@@ -23,7 +26,7 @@ def requires_authentication(self) -> bool:
         return True
 
     def fetch_token(self):
-        print(f'token is fetch_token {self.token}')
+        self.logger.info("New token fetched for accessing organization API")
         if self.token is None or self.token == "" or self.is_token_expired(self.token):
             with self.lock:
                 if self.token is None or self.token == "" or self.is_token_expired(self.token):

twilio/base/client_base.py

@@ -7,8 +7,8 @@
 from twilio.http import HttpClient
 from twilio.http.http_client import TwilioHttpClient
 from twilio.http.response import Response
-from twilio.authStrategy.authType import AuthType
-from twilio.credential.credentialProvider import CredentialProvider
+from twilio.auth_strategy.auth_type import AuthType
+from twilio.credential.credential_provider import CredentialProvider
 
 
 class ClientBase(object):
@@ -93,7 +93,6 @@ def request(
 
         ##If credential provider is provided by user, get the associated auth strategy
         ##Using the auth strategy, fetch the auth string and set it to authorization header
-        auth_strategy = None ##Initialization
         if self.credential_provider:
             auth_strategy = self.credential_provider.to_auth_strategy()
             headers["Authorization"] = auth_strategy.get_auth_string()
@@ -151,15 +150,14 @@ async def request_async(
 
         ##If credential provider is provided by user, get the associated auth strategy
         ##Using the auth strategy, fetch the auth string and set it to authorization header
-        auth_strategy = None ##Initialization
         if self.credential_provider:
             auth_strategy = self.credential_provider.to_auth_strategy()
-            if auth_strategy.auth_type == AuthType.TOKEN:
-                auth_strategy.fetch_token()
-                headers["Authorization"] = auth_strategy.get_auth_string()
+            headers["Authorization"] = auth_strategy.get_auth_string()
         else:
             auth = self.get_auth(auth)
 
+        uri = self.get_hostname(uri)
+
         return await self.http_client.request(
             method,
             uri,

twilio/credential/credentialProvider.py → twilio/credential/credential_provider.py

@@ -1,4 +1,4 @@
-from twilio.authStrategy.authType import AuthType
+from twilio.auth_strategy.auth_type import AuthType
 
 class CredentialProvider:
     def __init__(self, auth_type: AuthType):

twilio/credential/orgsCredentialProvider.py → twilio/credential/orgs_credential_provider.py

@@ -2,9 +2,9 @@
 
 from twilio.http.orgs_token_manager import OrgTokenManager
 from twilio.base.exceptions import TwilioException
-from twilio.credential.credentialProvider import CredentialProvider
-from twilio.authStrategy.authType import AuthType
-from twilio.authStrategy.tokenAuthStrategy import TokenAuthStrategy
+from twilio.credential.credential_provider import CredentialProvider
+from twilio.auth_strategy.auth_type import AuthType
+from twilio.auth_strategy.token_auth_strategy import TokenAuthStrategy
 
 
 class OrgsCredentialProvider(CredentialProvider):

twilio/rest/preview_iam/organizations/__init__.py

@@ -35,7 +35,7 @@ def __init__(self, domain: Domain):
     @property
     def accounts(self) -> AccountList:
         if self._accounts is None:
-            self._accounts = AccountList(self)
+            self._accounts = AccountList(self, "OR64adedc0f4dc99b9113305f725677b47")
         return self._accounts