Skip to content

Commit 3cff337

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
1 parent aacbdd5 commit 3cff337

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

.fern/replay.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8820,7 +8820,7 @@ patches:
88208820
"verifiable_credentials",
88218821
]
88228822
user_owned: true
8823-
status: unresolved
8823+
status: resolving
88248824
- id: patch-7271f157
88258825
content_hash: sha256:cd98dd1948587cf3396a2eacf46626176784bd00996eb660374161bfef686e93
88268826
original_commit: 7271f15759cfb545c9ef82b5a4f519ffe0a89db2
@@ -9001,7 +9001,7 @@ patches:
90019001
token = await self._async_token()
90029002
headers["Authorization"] = f"Bearer {token}"
90039003
return headers
9004-
status: unresolved
9004+
status: resolving
90059005
- id: patch-c04f0b4d
90069006
content_hash: sha256:a3f66d48f9f65d4741bddcee2521e8db6171a88fac1ac7169a3955283a687e6d
90079007
original_commit: c04f0b4dbbe8f2300f4f1bf42f62350888a92da5

src/auth0/management/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,6 +1873,8 @@
18731873
FedCmLoginPatch,
18741874
FedCmLoginGooglePatch,
18751875
FedCmLoginPatch,
1876+
FedCmLoginGooglePatch,
1877+
FedCmLoginPatch,
18761878
FlowAction,
18771879
FlowActionActivecampaign,
18781880
FlowActionActivecampaignListContacts,
@@ -5091,6 +5093,8 @@
50915093
"FedCmLoginPatch": ".types",
50925094
"FedCmLoginGooglePatch": ".types",
50935095
"FedCmLoginPatch": ".types",
5096+
"FedCmLoginGooglePatch": ".types",
5097+
"FedCmLoginPatch": ".types",
50945098
"FlowAction": ".types",
50955099
"FlowActionActivecampaign": ".types",
50965100
"FlowActionActivecampaignListContacts": ".types",
@@ -8321,6 +8325,8 @@ def __dir__():
83218325
"FedCmLoginPatch",
83228326
"FedCmLoginGooglePatch",
83238327
"FedCmLoginPatch",
8328+
"FedCmLoginGooglePatch",
8329+
"FedCmLoginPatch",
83248330
"FlowAction",
83258331
"FlowActionActivecampaign",
83268332
"FlowActionActivecampaignListContacts",

src/auth0/management/core/client_wrapper.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ def get_headers(self) -> typing.Dict[str, str]:
4545
}).encode("utf-8")
4646

4747
headers: typing.Dict[str, str] = {
48-
"User-Agent": "auth0-python/6.0.0",
49-
"X-Fern-Language": "Python",
50-
"X-Fern-Runtime": f"python/{platform.python_version()}",
51-
"X-Fern-Platform": f"{platform.system().lower()}/{platform.release()}",
52-
"X-Fern-SDK-Name": "auth0-python",
53-
"X-Fern-SDK-Version": "6.0.0",
48+
"User-Agent": f"Python/{py_version}",
49+
"Auth0-Client": base64.b64encode(auth0_client).decode(),
5450
**(self.get_custom_headers() or {}),
5551
}
5652
headers["Authorization"] = f"Bearer {self._get_token()}"

0 commit comments

Comments
 (0)