Skip to content

Commit bb2a42e

Browse files
[fern-replay] Resolved conflicts
Patches replayed: - patch-4894603d: chore: Restore custom wiring in management/__init__.py - patch-7271f157: Revert wrapper file to preserve Auth0 telemetry customizations - patch-c04f0b4d: Fix for incorrect return type and missing __all__ type - patch-95211006: Restore Auth0 telemetry and custom client wiring after regeneration - patch-f7384913: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries - patch-1e44613d: Added migration guide for v5 to v6 - patch-30b1089a: Updated UPGRADING.md doc - patch-d6d69aeb: Remove duplicate FedCmLoginGooglePatch and FedCmLoginPatch entries
1 parent 0283d54 commit bb2a42e

3 files changed

Lines changed: 14 additions & 13 deletions

File tree

.fern/replay.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8832,7 +8832,7 @@ patches:
88328832
"verifiable_credentials",
88338833
]
88348834
user_owned: true
8835-
status: unresolved
8835+
status: resolving
88368836
- id: patch-7271f157
88378837
content_hash: sha256:cd98dd1948587cf3396a2eacf46626176784bd00996eb660374161bfef686e93
88388838
original_commit: 7271f15759cfb545c9ef82b5a4f519ffe0a89db2
@@ -9013,7 +9013,7 @@ patches:
90139013
token = await self._async_token()
90149014
headers["Authorization"] = f"Bearer {token}"
90159015
return headers
9016-
status: unresolved
9016+
status: resolving
90179017
- id: patch-c04f0b4d
90189018
content_hash: sha256:8956a9a62d80f8259a926410a849964e99d422b7c6fb78ab920913f12ac5e664
90199019
original_commit: c04f0b4dbbe8f2300f4f1bf42f62350888a92da5
@@ -28813,7 +28813,7 @@ patches:
2881328813
headers["Authorization"] = f"Bearer {token}"
2881428814
return headers
2881528815
user_owned: true
28816-
status: unresolved
28816+
status: resolving
2881728817
- id: patch-f7384913
2881828818
content_hash: sha256:8956a9a62d80f8259a926410a849964e99d422b7c6fb78ab920913f12ac5e664
2881928819
original_commit: f7384913ab0a14df83dbc602d2b694e2cb7b7668

src/auth0/management/__init__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,8 +1888,6 @@
18881888
FedCmLoginGoogle,
18891889
FedCmLoginGooglePatch,
18901890
FedCmLoginPatch,
1891-
FedCmLoginGooglePatch,
1892-
FedCmLoginPatch,
18931891
FlowAction,
18941892
FlowActionActivecampaign,
18951893
FlowActionActivecampaignListContacts,
@@ -3250,8 +3248,6 @@
32503248
from .management_client import AsyncManagementClient, CustomDomainHeader, ManagementClient
32513249
from .token_provider import AsyncTokenProvider, TokenProvider
32523250
from .version import __version__
3253-
from .management_client import AsyncManagementClient, CustomDomainHeader, ManagementClient
3254-
from .token_provider import AsyncTokenProvider, TokenProvider
32553251
_dynamic_imports: typing.Dict[str, str] = {
32563252
"Action": ".types",
32573253
"ActionBase": ".types",
@@ -4312,7 +4308,6 @@
43124308
"CspReportingEndpoints": ".types",
43134309
"CspReportingInfrastructure": ".types",
43144310
"CustomDomain": ".types",
4315-
"CustomDomainHeader": ".management_client",
43164311
"CustomDomainCustomClientIpHeader": ".types",
43174312
"CustomDomainCustomClientIpHeaderEnum": ".types",
43184313
"CustomDomainHeader": ".management_client",
@@ -5147,8 +5142,6 @@
51475142
"FedCmLoginGoogle": ".types",
51485143
"FedCmLoginGooglePatch": ".types",
51495144
"FedCmLoginPatch": ".types",
5150-
"FedCmLoginGooglePatch": ".types",
5151-
"FedCmLoginPatch": ".types",
51525145
"FlowAction": ".types",
51535146
"FlowActionActivecampaign": ".types",
51545147
"FlowActionActivecampaignListContacts": ".types",
@@ -7581,7 +7574,6 @@ def __dir__():
75817574
"CspReportingEndpoints",
75827575
"CspReportingInfrastructure",
75837576
"CustomDomain",
7584-
"CustomDomainHeader",
75857577
"CustomDomainCustomClientIpHeader",
75867578
"CustomDomainCustomClientIpHeaderEnum",
75877579
"CustomDomainHeader",
@@ -8416,8 +8408,6 @@ def __dir__():
84168408
"FedCmLoginGoogle",
84178409
"FedCmLoginGooglePatch",
84188410
"FedCmLoginPatch",
8419-
"FedCmLoginGooglePatch",
8420-
"FedCmLoginPatch",
84218411
"FlowAction",
84228412
"FlowActionActivecampaign",
84238413
"FlowActionActivecampaignListContacts",

src/auth0/management/core/client_wrapper.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,18 @@ def __init__(
3535
self._logging = logging
3636

3737
def get_headers(self) -> typing.Dict[str, str]:
38+
py_version = platform.python_version()
39+
version = sys.modules["auth0"].__version__
40+
41+
auth0_client = dumps({
42+
"name": "auth0-python",
43+
"version": version,
44+
"env": {"python": py_version}
45+
}).encode("utf-8")
46+
3847
headers: typing.Dict[str, str] = {
48+
"User-Agent": f"Python/{py_version}",
49+
"Auth0-Client": base64.b64encode(auth0_client).decode(),
3950
**(self.get_custom_headers() or {}),
4051
}
4152
headers["Authorization"] = f"Bearer {self._get_token()}"

0 commit comments

Comments
 (0)