Skip to content

Add correlation id, public api id, and current request header #103

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
rayluo merged 16 commits into from
Dec 17, 2019
Merged

Add correlation id, public api id, and current request header #103

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
49fcaea
Add correlation id, public api id, and current request header
Oct 1, 2019
0751be0
Make get_new_correlation_id private
Oct 1, 2019
d61a36a
Update calls to _get_new_correlation_id()
Oct 1, 2019
513d989
Merge branch 'dev' into sagonzal/serverTelemetry
Oct 22, 2019
6c33c42
PR feedback.
Oct 23, 2019
bc414d7
Fix authority test
Oct 25, 2019
1922cb1
PR feedback
Dec 16, 2019
15a0ff4
More PR feedback
Dec 16, 2019
0b58742
Remove indent
sangonzal Dec 17, 2019
2595b75
Merge branch 'dev' into sagonzal/serverTelemetry
Dec 17, 2019
20bf314
Merge branch 'sagonzal/serverTelemetry' of https://github.com/AzureAD…
Dec 17, 2019
4448003
Refactor and fix a bug in the initiate_device_flow()
rayluo Dec 17, 2019
ef15039
Refactor acquire_token_silent() to reuse same correlation_id
rayluo Dec 17, 2019
1652d0a
fixup! Refactor and fix a bug in the initiate_device_flow()
rayluo Dec 17, 2019
e333a46
Define consts for all telemetry headers
rayluo Dec 17, 2019
5135446
Replace one last magic string with const
rayluo Dec 17, 2019
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
Prev Previous commit
Next Next commit
Update calls to _get_new_correlation_id()
  • Loading branch information
sgonzalezMSFT committed Oct 1, 2019
commit d61a36a7ea85a4671d3d29d5d6d98460e0a40a8f
14 changes: 7 additions & 7 deletions msal/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def acquire_token_by_authorization_code(
data=dict(
kwargs.pop("data", {}),
scope=decorate_scope(scopes, self.client_id)),
headers={'client-request-id', self.get_new_correlation_id(),
headers={'client-request-id', self._get_new_correlation_id(),
'x-client-current-telemetry', self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_BY_AUTHORIZATION_CODE_ID)},
**kwargs)
Expand Down Expand Up @@ -525,7 +525,7 @@ def _acquire_token_silent_by_finding_specific_refresh_token(
entry, rt_getter=lambda token_item: token_item["secret"],
on_removing_rt=rt_remover or self.token_cache.remove_rt,
scope=scopes,
headers={'client-request-id': self.get_new_correlation_id(),
headers={'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_SILENT_ID, force_refresh)},

Expand Down Expand Up @@ -578,7 +578,7 @@ def initiate_device_flow(self, scopes=None, **kwargs):
- an error response would contain some other readable key/value pairs.
"""
return self.client.initiate_device_flow(
{'client-request-id': self.get_new_correlation_id(),
{'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(self.INITIATE_DEVICE_FLOW)},
scope=decorate_scope(scopes or [], self.client_id),
**kwargs)
Expand All @@ -603,7 +603,7 @@ def acquire_token_by_device_flow(self, flow, **kwargs):
# 2018-10-4 Hack:
# during transition period,
# service seemingly need both device_code and code parameter.
headers={'client-request-id': self.get_new_correlation_id(),
headers={'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_BY_DEVICE_FLOW_ID)},
**kwargs)
Expand All @@ -626,7 +626,7 @@ def acquire_token_by_username_password(
- an error response would contain "error" and usually "error_description".
"""
scopes = decorate_scope(scopes, self.client_id)
headers = {'client-request-id': self.get_new_correlation_id(),
headers = {'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_BY_USERNAME_PASSWORD_ID)}
if not self.authority.is_adfs:
Expand Down Expand Up @@ -694,7 +694,7 @@ def acquire_token_for_client(self, scopes, **kwargs):
# TBD: force_refresh behavior
return self.client.obtain_token_for_client(
scope=scopes, # This grant flow requires no scope decoration
headers={'client-request-id': self.get_new_correlation_id(),
headers={'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_FOR_CLIENT_ID)},
**kwargs)
Expand Down Expand Up @@ -732,7 +732,7 @@ def acquire_token_on_behalf_of(self, user_assertion, scopes, **kwargs):
# so that the calling app could use id_token_claims to implement
# their own cache mapping, which is likely needed in web apps.
data=dict(kwargs.pop("data", {}), requested_token_use="on_behalf_of"),
headers={'client-request-id': self.get_new_correlation_id(),
headers={'client-request-id': self._get_new_correlation_id(),
'x-client-current-telemetry': self._build_current_telemetry_request_header(
self.ACQUIRE_TOKEN_ON_BEHALF_OF_ID)},
**kwargs)
Expand Down