diff --git a/sdk/identity/azure-identity/azure/identity/_internal/__init__.py b/sdk/identity/azure-identity/azure/identity/_internal/__init__.py index 4d4f3f5989a7..85851d26a165 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/__init__.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/__init__.py @@ -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): @@ -64,6 +64,5 @@ def _scopes_to_resource(*scopes): "get_default_authority", "InteractiveCredential", "normalize_authority", - "PublicClientCredential", "wrap_exceptions", ] diff --git a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py index 826ed9ef50d2..e553ee598be2 100644 --- a/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py +++ b/sdk/identity/azure-identity/azure/identity/_internal/msal_credentials.py @@ -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] @@ -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