Skip to content

Commit a5577c7

Browse files
box-sdk-buildbox-sdk-build
authored
fix: Ensure AuthorizationManager in authentication classes is initialized with NetworkSession object (box/box-codegen#469) (#113)
1 parent 8541750 commit a5577c7

File tree

4 files changed

+45
-57
lines changed

4 files changed

+45
-57
lines changed

‎.codegen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "engineHash": "7b699f4", "specHash": "1698c95", "version": "0.6.4" }
1+
{ "engineHash": "ce205f7", "specHash": "1698c95", "version": "0.6.4" }

‎box_sdk_gen/box/ccg_auth.py

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,7 @@ def __init__(self, config: CCGConfig, **kwargs):
6666
"""
6767
super().__init__(**kwargs)
6868
self.config = config
69-
self.token_storage = (
70-
InMemoryTokenStorage()
71-
if self.config.token_storage == None
72-
else self.config.token_storage
73-
)
69+
self.token_storage = self.config.token_storage
7470
self.subject_id = (
7571
self.config.user_id
7672
if not self.config.user_id == None
@@ -90,12 +86,12 @@ def refresh_token(
9086
:param network_session: An object to keep network session state, defaults to None
9187
:type network_session: Optional[NetworkSession], optional
9288
"""
93-
auth_manager: AuthorizationManager = (
94-
AuthorizationManager(network_session=network_session)
95-
if not network_session == None
96-
else AuthorizationManager()
89+
auth_manager: AuthorizationManager = AuthorizationManager(
90+
network_session=(
91+
network_session if not network_session == None else NetworkSession()
92+
)
9793
)
98-
token: Optional[AccessToken] = auth_manager.request_access_token(
94+
token: AccessToken = auth_manager.request_access_token(
9995
PostOAuth2TokenGrantTypeField.CLIENT_CREDENTIALS.value,
10096
client_id=self.config.client_id,
10197
client_secret=self.config.client_secret,
@@ -200,10 +196,10 @@ def downscope_token(
200196
raise BoxSDKError(
201197
message='No access token is available. Make an API call to retrieve a token before calling this method.'
202198
)
203-
auth_manager: AuthorizationManager = (
204-
AuthorizationManager(network_session=network_session)
205-
if not network_session == None
206-
else AuthorizationManager()
199+
auth_manager: AuthorizationManager = AuthorizationManager(
200+
network_session=(
201+
network_session if not network_session == None else NetworkSession()
202+
)
207203
)
208204
downscoped_token: AccessToken = auth_manager.request_access_token(
209205
PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,
@@ -224,10 +220,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
224220
old_token: Optional[AccessToken] = self.token_storage.get()
225221
if old_token == None:
226222
return None
227-
auth_manager: AuthorizationManager = (
228-
AuthorizationManager(network_session=network_session)
229-
if not network_session == None
230-
else AuthorizationManager()
223+
auth_manager: AuthorizationManager = AuthorizationManager(
224+
network_session=(
225+
network_session if not network_session == None else NetworkSession()
226+
)
231227
)
232228
auth_manager.revoke_access_token(
233229
client_id=self.config.client_id,

‎box_sdk_gen/box/jwt_auth.py

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,7 @@ def __init__(self, config: JWTConfig, **kwargs):
260260
"""
261261
super().__init__(**kwargs)
262262
self.config = config
263-
self.token_storage = (
264-
InMemoryTokenStorage()
265-
if self.config.token_storage == None
266-
else self.config.token_storage
267-
)
263+
self.token_storage = self.config.token_storage
268264
self.subject_id = (
269265
self.config.enterprise_id
270266
if not self.config.enterprise_id == None
@@ -307,10 +303,10 @@ def refresh_token(
307303
key=self.config.private_key, passphrase=self.config.private_key_passphrase
308304
)
309305
assertion: str = create_jwt_assertion(claims, jwt_key, jwt_options)
310-
auth_manager: AuthorizationManager = (
311-
AuthorizationManager(network_session=network_session)
312-
if not network_session == None
313-
else AuthorizationManager()
306+
auth_manager: AuthorizationManager = AuthorizationManager(
307+
network_session=(
308+
network_session if not network_session == None else NetworkSession()
309+
)
314310
)
315311
token: AccessToken = auth_manager.request_access_token(
316312
PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_JWT_BEARER.value,
@@ -424,10 +420,10 @@ def downscope_token(
424420
raise BoxSDKError(
425421
message='No access token is available. Make an API call to retrieve a token before calling this method.'
426422
)
427-
auth_manager: AuthorizationManager = (
428-
AuthorizationManager(network_session=network_session)
429-
if not network_session == None
430-
else AuthorizationManager()
423+
auth_manager: AuthorizationManager = AuthorizationManager(
424+
network_session=(
425+
network_session if not network_session == None else NetworkSession()
426+
)
431427
)
432428
downscoped_token: AccessToken = auth_manager.request_access_token(
433429
PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,
@@ -448,10 +444,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
448444
old_token: Optional[AccessToken] = self.token_storage.get()
449445
if old_token == None:
450446
return None
451-
auth_manager: AuthorizationManager = (
452-
AuthorizationManager(network_session=network_session)
453-
if not network_session == None
454-
else AuthorizationManager()
447+
auth_manager: AuthorizationManager = AuthorizationManager(
448+
network_session=(
449+
network_session if not network_session == None else NetworkSession()
450+
)
455451
)
456452
auth_manager.revoke_access_token(
457453
client_id=self.config.client_id,

‎box_sdk_gen/box/oauth.py

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ def __init__(self, config: OAuthConfig, **kwargs):
8383
"""
8484
super().__init__(**kwargs)
8585
self.config = config
86-
self.token_storage = (
87-
InMemoryTokenStorage()
88-
if self.config.token_storage == None
89-
else self.config.token_storage
90-
)
86+
self.token_storage = self.config.token_storage
9187

9288
def get_authorize_url(self, *, options: GetAuthorizeUrlOptions = None) -> str:
9389
"""
@@ -132,10 +128,10 @@ def get_tokens_authorization_code_grant(
132128
:param network_session: An object to keep network session state, defaults to None
133129
:type network_session: Optional[NetworkSession], optional
134130
"""
135-
auth_manager: AuthorizationManager = (
136-
AuthorizationManager(network_session=network_session)
137-
if not network_session == None
138-
else AuthorizationManager()
131+
auth_manager: AuthorizationManager = AuthorizationManager(
132+
network_session=(
133+
network_session if not network_session == None else NetworkSession()
134+
)
139135
)
140136
token: AccessToken = auth_manager.request_access_token(
141137
PostOAuth2TokenGrantTypeField.AUTHORIZATION_CODE.value,
@@ -173,10 +169,10 @@ def refresh_token(
173169
token_used_for_refresh: Optional[str] = (
174170
old_token.refresh_token if not old_token == None else None
175171
)
176-
auth_manager: AuthorizationManager = (
177-
AuthorizationManager(network_session=network_session)
178-
if not network_session == None
179-
else AuthorizationManager()
172+
auth_manager: AuthorizationManager = AuthorizationManager(
173+
network_session=(
174+
network_session if not network_session == None else NetworkSession()
175+
)
180176
)
181177
token: AccessToken = auth_manager.request_access_token(
182178
PostOAuth2TokenGrantTypeField.REFRESH_TOKEN.value,
@@ -202,10 +198,10 @@ def revoke_token(self, *, network_session: Optional[NetworkSession] = None) -> N
202198
token: Optional[AccessToken] = self.token_storage.get()
203199
if token == None:
204200
return None
205-
auth_manager: AuthorizationManager = (
206-
AuthorizationManager(network_session=network_session)
207-
if not network_session == None
208-
else AuthorizationManager()
201+
auth_manager: AuthorizationManager = AuthorizationManager(
202+
network_session=(
203+
network_session if not network_session == None else NetworkSession()
204+
)
209205
)
210206
auth_manager.revoke_access_token(
211207
client_id=self.config.client_id,
@@ -236,10 +232,10 @@ def downscope_token(
236232
token: Optional[AccessToken] = self.token_storage.get()
237233
if token == None or token.access_token == None:
238234
raise BoxSDKError(message='No access token is available.')
239-
auth_manager: AuthorizationManager = (
240-
AuthorizationManager(network_session=network_session)
241-
if not network_session == None
242-
else AuthorizationManager()
235+
auth_manager: AuthorizationManager = AuthorizationManager(
236+
network_session=(
237+
network_session if not network_session == None else NetworkSession()
238+
)
243239
)
244240
downscoped_token: AccessToken = auth_manager.request_access_token(
245241
PostOAuth2TokenGrantTypeField.URN_IETF_PARAMS_OAUTH_GRANT_TYPE_TOKEN_EXCHANGE.value,

0 commit comments

Comments
 (0)