Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/pywrapid/webclient/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,7 @@ def _unify_configuration(
if config and isinstance(config, WrapidConfig):
return config

raise CredentialError(
"Config pratameter must be of type dict or a WrapidConfig derivative"
)
raise CredentialError("Config parameter must be of type dict or a WrapidConfig derivative")

# def import_dependencies(self, dependencies: list) -> bool:
# """Import dependencies for credential type"""
Expand Down Expand Up @@ -229,7 +227,7 @@ def __init__( # pylint: disable=unused-argument, too-many-arguments # nosec
token_url: str = "",
redirect_uri: str = "",
auth_data: Optional[dict] = None,
legacy_auth: Optional[BasicAuthCredentials] = None,
legacy_auth: Optional[Union[BasicAuthCredentials, dict]] = None,
refresh_token_timeout: int = 0,
access_token_timeout: int = 0,
token_expiry_offset: int = 0,
Expand Down Expand Up @@ -267,7 +265,14 @@ def __init__( # pylint: disable=unused-argument, too-many-arguments # nosec
)

if self.legacy_auth:
self._options = self._config["legacy_auth"]._options
if isinstance(self.legacy_auth, dict):
self.legacy_auth = BasicAuthCredentials(
username=self.legacy_auth.get("username", ""),
password=self.legacy_auth.get("password", ""),
)
self._options = self.legacy_auth._options # type: ignore
else:
self._options = self._config["legacy_auth"]._options

self.credential_body = self._config.pop("auth_data")

Expand Down
Loading