Fixing token fetch flow

Author: AsabuHere

twilio/http/orgs_token_manager.py

@@ -1,6 +1,6 @@
 from twilio.base.version import Version
 from twilio.http.token_manager import TokenManager
-from twilio.rest.preview_iam.organizations.token import TokenList
+from twilio.rest.preview_iam.v1.token import TokenList
 
 
 class OrgTokenManager(TokenManager):

twilio/rest/preview_iam/PreviewIamBase.py

@@ -24,7 +24,7 @@ def __init__(self, twilio: Client):
 
         :returns: Domain for PreviewIam
         """
-        super().__init__(twilio, "https://preview.twilio.com/iam")
+        super().__init__(twilio, "https://preview-iam.twilio.com")
         self._organizations: Optional[Organizations] = None
         self._v1: Optional[V1] = None
         # self._token: Optional[TokenList] = None

twilio/rest/preview_iam/__init__.py

@@ -13,45 +13,20 @@ class PreviewIam(PreviewIamBase):
 
     @property
     def accounts(self) -> AccountList:
-        warn(
-            "accounts is deprecated. Use organizations.accounts instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
         return self.organizations.accounts
 
     @property
     def role_assignments(self) -> RoleAssignmentList:
-        warn(
-            "role_assignments is deprecated. Use organizations.role_assignments instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
         return self.organizations.role_assignments
 
     # @property
     # def users(self) -> UserList:
-    #     warn(
-    #         "users is deprecated. Use organizations.users instead.",
-    #         DeprecationWarning,
-    #         stacklevel=2,
-    #     )
     #     return self.organizations.users
 
     @property
     def token(self) -> TokenList:
-        warn(
-            "token is deprecated. Use v1.token instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
         return self.v1.token
 
     @property
     def authorize(self) -> AuthorizeList:
-        warn(
-            "authorize is deprecated. Use v1.authorize instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
         return self.v1.authorize

twilio/rest/preview_iam/organizations/__init__.py

@@ -27,7 +27,7 @@ def __init__(self, domain: Domain):
 
         :param domain: The Twilio.preview_iam domain
         """
-        super().__init__(domain, "Organizations")
+        super().__init__(domain, "organizations")
         self._accounts: Optional[AccountList] = None
         self._role_assignments: Optional[RoleAssignmentList] = None
         self._users: Optional[UserList] = None

twilio/rest/preview_iam/v1/__init__.py

@@ -27,7 +27,7 @@ def __init__(self, domain: Domain):
 
         :param domain: The Twilio.preview_iam domain
         """
-        super().__init__(domain, "V1")
+        super().__init__(domain, "v1")
         self._token: Optional[TokenList] = None
         self._authorize: Optional[AuthorizeList] = None
 

twilio/rest/preview_iam/v1/token.py

@@ -59,7 +59,7 @@ def __init__(self, version: Version):
         """
         super().__init__(version)
 
-        self._uri = "https://preview-iam.twilio.com/v1/token"
+        self._uri = "/token"
 
     def create(
         self,
@@ -100,12 +100,9 @@ def create(
             }
         )
         headers = values.of({"Content-Type": "application/x-www-form-urlencoded"})
-        print(f'{data}')
-        print(f'{headers}')
         payload = self._version.create(
             method="POST", uri=self._uri, data=data, headers=headers
         )
-        print('rest method output...')
         return TokenInstance(self._version, payload)
 
     async def create_async(