Skip to content

Fix core auth #11177

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
lmazuel merged 3 commits into from
May 1, 2020
Merged

Fix core auth #11177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccf74a4
[Azure-Core]Auth Header missing when token credential is not expired
xiafu-msft May 1, 2020
4326247
Fix mypy
lmazuel May 1, 2020
1354b2f
Test we put the header even if we didn't tech a new token
lmazuel May 1, 2020
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: 2 additions & 2 deletions sdk/core/azure-core/azure/core/pipeline/policies/_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ def on_request(self, request):
"""
self._enforce_https(request)

if self._need_new_token:
if self._token is None or self._need_new_token:
self._token = self._credential.get_token(*self._scopes)
Comment thread
lmazuel marked this conversation as resolved.
self._update_headers(request.http_request.headers, self._token.token)
self._update_headers(request.http_request.headers, self._token.token)


class AzureKeyCredentialPolicy(SansIOHTTPPolicy):
Expand Down
7 changes: 6 additions & 1 deletion sdk/core/azure-core/tests/azure_core_asynctests/test_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
@pytest.mark.asyncio
async def test_bearer_policy_adds_header():
"""The bearer token policy should add a header containing a token from its credential"""
expected_token = AccessToken("expected_token", 0)
# 2524608000 == 01/01/2050 @ 12:00am (UTC)
expected_token = AccessToken("expected_token", 2524608000)

async def verify_authorization_header(request):
assert request.http_request.headers["Authorization"] == "Bearer {}".format(expected_token.token)
Expand All @@ -37,6 +38,10 @@ async def get_token(_):
await pipeline.run(HttpRequest("GET", "https://spam.eggs"), context=None)
assert get_token_calls == 1

await pipeline.run(HttpRequest("GET", "https://spam.eggs"), context=None)
# Didn't need a new token
assert get_token_calls == 1


@pytest.mark.asyncio
async def test_bearer_policy_send():
Expand Down
10 changes: 8 additions & 2 deletions sdk/core/azure-core/tests/test_authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,24 @@

def test_bearer_policy_adds_header():
"""The bearer token policy should add a header containing a token from its credential"""
expected_token = AccessToken("expected_token", 0)
# 2524608000 == 01/01/2050 @ 12:00am (UTC)
expected_token = AccessToken("expected_token", 2524608000)

def verify_authorization_header(request):
assert request.http_request.headers["Authorization"] == "Bearer {}".format(expected_token.token)

fake_credential = Mock(get_token=Mock(return_value=expected_token))
policies = [BearerTokenCredentialPolicy(fake_credential, "scope"), Mock(send=verify_authorization_header)]

Pipeline(transport=Mock(), policies=policies).run(HttpRequest("GET", "https://spam.eggs"))
pipeline = Pipeline(transport=Mock(), policies=policies)
pipeline.run(HttpRequest("GET", "https://spam.eggs"))

assert fake_credential.get_token.call_count == 1

pipeline.run(HttpRequest("GET", "https://spam.eggs"))

# Didn't need a new token
assert fake_credential.get_token.call_count == 1

def test_bearer_policy_send():
"""The bearer token policy should invoke the next policy's send method and return the result"""
Expand Down