Skip to content

Remove unnecessary internal class #12374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chlowell merged 1 commit into from
Jul 17, 2020
Merged

Remove unnecessary internal class #12374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions sdk/identity/azure-identity/azure/identity/_internal/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_default_authority():
from .certificate_credential_base import CertificateCredentialBase
from .client_secret_credential_base import ClientSecretCredentialBase
from .exception_wrapper import wrap_exceptions
from .msal_credentials import InteractiveCredential, PublicClientCredential
from .msal_credentials import InteractiveCredential


def _scopes_to_resource(*scopes):
Expand All @@ -64,6 +64,5 @@ def _scopes_to_resource(*scopes):
"get_default_authority",
"InteractiveCredential",
"normalize_authority",
"PublicClientCredential",
"wrap_exceptions",
]
23 changes: 7 additions & 16 deletions sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,7 @@ def _create_app(self, cls):
return app


class PublicClientCredential(MsalCredential):
"""Wraps an MSAL PublicClientApplication with the TokenCredential API"""

@abc.abstractmethod
def get_token(self, *scopes, **kwargs): # pylint:disable=unused-argument
# type: (*str, **Any) -> AccessToken
pass

def _get_app(self):
# type: () -> msal.PublicClientApplication
if not self._msal_app:
self._msal_app = self._create_app(msal.PublicClientApplication)
return self._msal_app


class InteractiveCredential(PublicClientCredential):
class InteractiveCredential(MsalCredential):
def __init__(self, **kwargs):
self._disable_automatic_authentication = kwargs.pop("disable_automatic_authentication", False)
self._auth_record = kwargs.pop("authentication_record", None) # type: Optional[AuthenticationRecord]
Expand Down Expand Up @@ -246,3 +231,9 @@ def _acquire_token_silent(self, *scopes, **kwargs):
def _request_token(self, *scopes, **kwargs):
# type: (*str, **Any) -> dict
"""Request an access token via a non-silent MSAL token acquisition method, returning that method's result"""

def _get_app(self):
# type: () -> msal.PublicClientApplication
if not self._msal_app:
self._msal_app = self._create_app(msal.PublicClientApplication)
return self._msal_app