66
77from .core .client_wrapper import AsyncClientWrapper , SyncClientWrapper
88from .environment import WebflowEnvironment
9- from .oauth import get_access_token
109from .resources .access_groups .client import AccessGroupsClient , AsyncAccessGroupsClient
1110from .resources .assets .client import AssetsClient , AsyncAssetsClient
1211from .resources .collections .client import AsyncCollectionsClient , CollectionsClient
@@ -27,22 +26,15 @@ class Webflow:
2726 def __init__ (
2827 self ,
2928 * ,
30- client_id : str ,
31- client_secret : str ,
32- code : str ,
33- redirect_uri : typing .Optional [str ] = None ,
29+ base_url : typing .Optional [str ] = None ,
3430 environment : WebflowEnvironment = WebflowEnvironment .DEFAULT ,
31+ access_token : typing .Union [str , typing .Callable [[], str ]],
3532 timeout : typing .Optional [float ] = 60 ,
3633 httpx_client : typing .Optional [httpx .Client ] = None
3734 ):
38- self ._token = get_access_token (
39- client_id = client_id ,
40- client_secret = client_secret ,
41- code = code ,
42- redirect_uri = redirect_uri )
4335 self ._client_wrapper = SyncClientWrapper (
44- base_url = _get_base_url (base_url = None , environment = environment ),
45- access_token = self . _token ,
36+ base_url = _get_base_url (base_url = base_url , environment = environment ),
37+ access_token = access_token ,
4638 httpx_client = httpx .Client (timeout = timeout ) if httpx_client is None else httpx_client ,
4739 )
4840 self .token = TokenClient (client_wrapper = self ._client_wrapper )
@@ -65,22 +57,15 @@ class AsyncWebflow:
6557 def __init__ (
6658 self ,
6759 * ,
68- client_id : str ,
69- client_secret : str ,
70- code : str ,
71- redirect_uri : typing .Optional [str ] = None ,
60+ base_url : typing .Optional [str ] = None ,
7261 environment : WebflowEnvironment = WebflowEnvironment .DEFAULT ,
62+ access_token : typing .Union [str , typing .Callable [[], str ]],
7363 timeout : typing .Optional [float ] = 60 ,
7464 httpx_client : typing .Optional [httpx .AsyncClient ] = None
7565 ):
76- self ._token = get_access_token (
77- client_id = client_id ,
78- client_secret = client_secret ,
79- code = code ,
80- redirect_uri = redirect_uri )
8166 self ._client_wrapper = AsyncClientWrapper (
82- base_url = _get_base_url (base_url = None , environment = environment ),
83- access_token = self . _token ,
67+ base_url = _get_base_url (base_url = base_url , environment = environment ),
68+ access_token = access_token ,
8469 httpx_client = httpx .AsyncClient (timeout = timeout ) if httpx_client is None else httpx_client ,
8570 )
8671 self .token = AsyncTokenClient (client_wrapper = self ._client_wrapper )
0 commit comments