fix: Ensure AuthorizationManager in authentication classes is initi…

…alized with `NetworkSession` object (box/box-codegen#469) (#113)
box · Apr 24, 2024 · a5577c7 · a5577c7
1 parent 8541750
commit a5577c7
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 57 deletions.
diff --git a/.codegen.json b/.codegen.json
@@ -1 +1 @@
-{ "engineHash": "7b699f4", "specHash": "1698c95", "version": "0.6.4" }
+{ "engineHash": "ce205f7", "specHash": "1698c95", "version": "0.6.4" }
diff --git a/box_sdk_gen/box/ccg_auth.py b/box_sdk_gen/box/ccg_auth.py
@@ -66,11 +66,7 @@ def __init__(self, config: CCGConfig, **kwargs):
         """
         super().__init__(**kwargs)
         self.config = config
-        self.token_storage = (
-            InMemoryTokenStorage()
-            if self.config.token_storage == None
-            else self.config.token_storage
-        )
+        self.token_storage = self.config.token_storage
         self.subject_id = (
             self.config.user_id
             if not self.config.user_id == None
@@ -90,12 +86,12 @@ def refresh_token(
         :param network_session: An object to keep network session state, defaults to None
         :type network_session: Optional[NetworkSession], optional
         """
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
-        token: Optional[AccessToken] = auth_manager.request_access_token(
+        token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.CLIENT_CREDENTIALS.value,
             client_id=self.config.client_id,
             client_secret=self.config.client_secret,
@@ -200,10 +196,10 @@ def downscope_token(
             raise BoxSDKError(
                 message='No access token is available. Make an API call to retrieve a token before calling this method.'
             )
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         downscoped_token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,
@@ -224,10 +220,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
         old_token: Optional[AccessToken] = self.token_storage.get()
         if old_token == None:
             return None
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         auth_manager.revoke_access_token(
             client_id=self.config.client_id,

diff --git a/box_sdk_gen/box/jwt_auth.py b/box_sdk_gen/box/jwt_auth.py
@@ -260,11 +260,7 @@ def __init__(self, config: JWTConfig, **kwargs):
         """
         super().__init__(**kwargs)
         self.config = config
-        self.token_storage = (
-            InMemoryTokenStorage()
-            if self.config.token_storage == None
-            else self.config.token_storage
-        )
+        self.token_storage = self.config.token_storage
         self.subject_id = (
             self.config.enterprise_id
             if not self.config.enterprise_id == None
@@ -307,10 +303,10 @@ def refresh_token(
             key=self.config.private_key, passphrase=self.config.private_key_passphrase
         )
         assertion: str = create_jwt_assertion(claims, jwt_key, jwt_options)
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_JWT_BEARER.value,
@@ -424,10 +420,10 @@ def downscope_token(
             raise BoxSDKError(
                 message='No access token is available. Make an API call to retrieve a token before calling this method.'
             )
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         downscoped_token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,
@@ -448,10 +444,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
         old_token: Optional[AccessToken] = self.token_storage.get()
         if old_token == None:
             return None
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         auth_manager.revoke_access_token(
             client_id=self.config.client_id,

diff --git a/box_sdk_gen/box/oauth.py b/box_sdk_gen/box/oauth.py
@@ -83,11 +83,7 @@ def __init__(self, config: OAuthConfig, **kwargs):
         """
         super().__init__(**kwargs)
         self.config = config
-        self.token_storage = (
-            InMemoryTokenStorage()
-            if self.config.token_storage == None
-            else self.config.token_storage
-        )
+        self.token_storage = self.config.token_storage
 
     def get_authorize_url(self, *, options: GetAuthorizeUrlOptions = None) -> str:
         """
@@ -132,10 +128,10 @@ def get_tokens_authorization_code_grant(
         :param network_session: An object to keep network session state, defaults to None
         :type network_session: Optional[NetworkSession], optional
         """
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.AUTHORIZATION_CODE.value,
@@ -173,10 +169,10 @@ def refresh_token(
         token_used_for_refresh: Optional[str] = (
             old_token.refresh_token if not old_token == None else None
         )
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.REFRESH_TOKEN.value,
@@ -202,10 +198,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
         token: Optional[AccessToken] = self.token_storage.get()
         if token == None:
             return None
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         auth_manager.revoke_access_token(
             client_id=self.config.client_id,
@@ -236,10 +232,10 @@ def downscope_token(
         token: Optional[AccessToken] = self.token_storage.get()
         if token == None or token.access_token == None:
             raise BoxSDKError(message='No access token is available.')
-        auth_manager: AuthorizationManager = (
-            AuthorizationManager(network_session=network_session)
-            if not network_session == None
-            else AuthorizationManager()
+        auth_manager: AuthorizationManager = AuthorizationManager(
+            network_session=(
+                network_session if not network_session == None else NetworkSession()
+            )
         )
         downscoped_token: AccessToken = auth_manager.request_access_token(
             PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,