From 619923619294ea36521eb558dce8e9dde3557241 Mon Sep 17 00:00:00 2001 From: Enrico Minack Date: Sun, 3 Mar 2024 11:07:16 +0100 Subject: [PATCH] Assert requester argument type in Auth --- github/Auth.py | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/github/Auth.py b/github/Auth.py index 607d317144..86ca0a0fd1 100644 --- a/github/Auth.py +++ b/github/Auth.py @@ -280,6 +280,7 @@ def __init__( assert isinstance(app_auth, AppAuth), app_auth assert isinstance(installation_id, int), installation_id assert token_permissions is None or isinstance(token_permissions, dict), token_permissions + assert requester is None or isinstance(requester, Requester), requester self._app_auth = app_auth self._installation_id = installation_id @@ -289,6 +290,7 @@ def __init__( self.withRequester(requester) def withRequester(self, requester: Requester) -> "AppInstallationAuth": + assert isinstance(requester, Requester), requester super().withRequester(requester.withAuth(self._app_auth)) # imported here to avoid circular import @@ -373,26 +375,14 @@ def __init__( ) -> None: super().__init__() - assert isinstance(client_id, str) - assert len(client_id) > 0 - assert isinstance(client_secret, str) - assert len(client_secret) > 0 - assert isinstance(token, str) - assert len(token) > 0 - if token_type is not None: - assert isinstance(token_type, str) - assert len(token_type) > 0 - assert isinstance(token, str) - if token_type is not None: - assert isinstance(token_type, str) - assert len(token_type) > 0 - if expires_at is not None: - assert isinstance(expires_at, datetime) - if refresh_token is not None: - assert isinstance(refresh_token, str) - assert len(refresh_token) > 0 - if refresh_expires_at is not None: - assert isinstance(refresh_expires_at, datetime) + assert isinstance(client_id, str) and len(client_id) > 0 + assert isinstance(client_secret, str) and len(client_secret) > 0 + assert isinstance(token, str) and len(token) > 0 + assert token_type is None or isinstance(token_type, str) and len(token_type) > 0, token_type + assert expires_at is None or isinstance(expires_at, datetime), expires_at + assert refresh_token is None or isinstance(refresh_token, str) and len(refresh_token) > 0 + assert refresh_expires_at is None or isinstance(refresh_expires_at, datetime), refresh_expires_at + assert requester is None or isinstance(requester, Requester), requester self._client_id = client_id self._client_secret = client_secret @@ -416,6 +406,7 @@ def token(self) -> str: return self._token def withRequester(self, requester: Requester) -> "AppUserAuth": + assert isinstance(requester, Requester), requester super().withRequester(requester.withAuth(None)) # imported here to avoid circular import @@ -494,6 +485,7 @@ def password(self) -> str: return self._password def withRequester(self, requester: Requester) -> "NetrcAuth": + assert isinstance(requester, Requester), requester super().withRequester(requester) auth = utils.get_netrc_auth(requester.base_url, raise_errors=True)