Skip to content
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

Update Authorization Code client_secret kwarg usage #34862

Merged
merged 8 commits into from
Apr 1, 2024
Merged

Update Authorization Code client_secret kwarg usage #34862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5773b7
fix client_secret
Darkbat91 Mar 20, 2024
13e5483
consume client_secret kwarg
Darkbat91 Mar 20, 2024
3e23cf3
Merge branch 'Azure:main' into main
Darkbat91 Mar 20, 2024
015f55b
fix lint errors.
Darkbat91 Mar 20, 2024
6a9642b
test client secret.
Darkbat91 Mar 26, 2024
00a96ca
remove client_secret from get_token
Darkbat91 Mar 29, 2024
07f2e00
add client_secret to get_token method.
Darkbat91 Mar 29, 2024
e447bc9
lint
Darkbat91 Mar 29, 2024
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
4 changes: 3 additions & 1 deletion sdk/identity/azure-identity/azure/identity/_credentials/authorization_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ def get_token(
``response`` attribute.
"""
# pylint:disable=useless-super-delegation
return super(AuthorizationCodeCredential, self).get_token(*scopes, claims=claims, tenant_id=tenant_id, **kwargs)
return super(AuthorizationCodeCredential, self).get_token(
*scopes, claims=claims, tenant_id=tenant_id, client_secret=self._client_secret, **kwargs
)

def _acquire_token_silently(self, *scopes: str, **kwargs) -> Optional[AccessToken]:
return self._client.get_cached_access_token(scopes, **kwargs)
Expand Down
3 changes: 3 additions & 0 deletions sdk/identity/azure-identity/azure/identity/_internal/aad_client_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,9 @@ def _get_refresh_token_request(self, scopes: Iterable[str], refresh_token: str,
"client_id": self._client_id,
"client_info": 1, # request Microsoft Entra ID include home_account_id in its response
}
client_secret = kwargs.pop("client_secret", None)
if client_secret:
data["client_secret"] = client_secret

claims = _merge_claims_challenge_and_capabilities(
["CP1"] if kwargs.get("enable_cae") else [], kwargs.get("claims")
Expand Down
4 changes: 3 additions & 1 deletion sdk/identity/azure-identity/azure/identity/aio/_credentials/authorization_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ async def get_token(
attribute gives a reason. Any error response from Microsoft Entra ID is available as the error's
``response`` attribute.
"""
return await super().get_token(*scopes, claims=claims, tenant_id=tenant_id, **kwargs)
return await super(AuthorizationCodeCredential, self).get_token(
*scopes, claims=claims, tenant_id=tenant_id, client_secret=self._client_secret, **kwargs
)

async def _acquire_token_silently(self, *scopes: str, **kwargs: Any) -> Optional[AccessToken]:
return self._client.get_cached_access_token(scopes, **kwargs)
Expand Down
4 changes: 4 additions & 0 deletions sdk/identity/azure-identity/tests/test_auth_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def test_tenant_id():

def test_auth_code_credential():
client_id = "client id"
secret = "fake-client-secret"
tenant_id = "tenant"
expected_code = "auth code"
redirect_uri = "https://localhost"
Expand All @@ -92,6 +93,7 @@ def test_auth_code_credential():
url_substring=tenant_id,
required_data={
"client_id": client_id,
"client_secret": secret,
"code": expected_code,
"grant_type": "authorization_code",
"redirect_uri": redirect_uri,
Expand All @@ -102,6 +104,7 @@ def test_auth_code_credential():
url_substring=tenant_id,
required_data={
"client_id": client_id,
"client_secret": secret,
"grant_type": "refresh_token",
"refresh_token": expected_refresh_token,
"scope": expected_scope,
Expand All @@ -114,6 +117,7 @@ def test_auth_code_credential():

credential = AuthorizationCodeCredential(
client_id=client_id,
client_secret=secret,
tenant_id=tenant_id,
authorization_code=expected_code,
redirect_uri=redirect_uri,
Expand Down
4 changes: 4 additions & 0 deletions sdk/identity/azure-identity/tests/test_auth_code_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ async def test_tenant_id():

async def test_auth_code_credential():
client_id = "client id"
secret = "fake-client-secret"
tenant_id = "tenant"
expected_code = "auth code"
redirect_uri = "https://localhost"
Expand All @@ -116,6 +117,7 @@ async def test_auth_code_credential():
url_substring=tenant_id,
required_data={
"client_id": client_id,
"client_secret": secret,
"code": expected_code,
"grant_type": "authorization_code",
"redirect_uri": redirect_uri,
Expand All @@ -126,6 +128,7 @@ async def test_auth_code_credential():
url_substring=tenant_id,
required_data={
"client_id": client_id,
"client_secret": secret,
"grant_type": "refresh_token",
"refresh_token": expected_refresh_token,
"scope": expected_scope,
Expand All @@ -138,6 +141,7 @@ async def test_auth_code_credential():

credential = AuthorizationCodeCredential(
client_id=client_id,
client_secret=secret,
tenant_id=tenant_id,
authorization_code=expected_code,
redirect_uri=redirect_uri,
Expand Down