fix: Fix jwt import errors (#711)

box · Mar 8, 2022 · ee7bb6f · ee7bb6f
1 parent 5d80481
commit ee7bb6f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/boxsdk/__init__.py b/boxsdk/__init__.py
@@ -1,4 +1,4 @@
-from .auth import JWTAuth, OAuth2
+from .auth import JWTAuth, OAuth2, CCGAuth
 from .client import *  # pylint:disable=wildcard-import,redefined-builtin
 from .exception import *  # pylint:disable=wildcard-import
 from .object import *  # pylint:disable=wildcard-import,redefined-builtin

diff --git a/boxsdk/auth/__init__.py b/boxsdk/auth/__init__.py
@@ -4,6 +4,7 @@
     from .jwt_auth import JWTAuth
 except ImportError:
     JWTAuth = None  # If extras[jwt] are not installed, JWTAuth won't be available.
+from .ccg_auth import CCGAuth
 from .oauth2 import OAuth2
 try:
     from .redis_managed_oauth2 import RedisManagedOAuth2

diff --git a/boxsdk/auth/jwt_auth.py b/boxsdk/auth/jwt_auth.py
@@ -29,7 +29,7 @@ def __init__(
             enterprise_id: Optional[str],
             jwt_key_id: str,
             rsa_private_key_file_sys_path: Optional[str] = None,
-            rsa_private_key_passphrase: Optional[bytes] = None,
+            rsa_private_key_passphrase: Optional[Union[str, bytes]] = None,
             user: Optional[Union[str, 'User']] = None,
             store_tokens: Callable = None,
             box_device_id: str = '0',

diff --git a/boxsdk/auth/server_auth.py b/boxsdk/auth/server_auth.py
@@ -4,7 +4,8 @@
 from datetime import datetime
 from typing import Optional, Tuple, TYPE_CHECKING, Union, Any
 
-from boxsdk import OAuth2, BoxOAuthException
+from boxsdk.auth.oauth2 import OAuth2
+from boxsdk.exception import BoxOAuthException
 from boxsdk.config import API
 from boxsdk.object.user import User