Skip to content

Commit 8907450

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
1 parent 62954f5 commit 8907450

2 files changed

Lines changed: 10 additions & 15 deletions

File tree

.fern/replay.lock

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ generations:
3737
cli_version: unknown
3838
generator_versions:
3939
fernapi/fern-python-sdk: 5.14.3
40-
- commit_sha: 37e2dc1df848770f503b919fe905d3259e046cfd
40+
- commit_sha: bf4df4483c8f8211870c074c6e5725aabf31d339
4141
tree_hash: 6fed7a877e08cfbe542991d28cb3afdd90ccaefa
4242
timestamp: 2026-06-09T04:56:00.721Z
4343
cli_version: unknown
4444
generator_versions:
4545
fernapi/fern-python-sdk: 5.14.3
46-
current_generation: 37e2dc1df848770f503b919fe905d3259e046cfd
46+
current_generation: bf4df4483c8f8211870c074c6e5725aabf31d339
4747
patches:
4848
- id: patch-4894603d
4949
content_hash: sha256:1e1d0c5ec0a0ef9039b8ae4d3484e5468180bb5af2012392406259e0ab6a589f
5050
original_commit: 4894603d03409962bc60a34712de8abffe919e2c
5151
original_message: "chore: Restore custom wiring in management/__init__.py"
5252
original_author: Kunal Dawar <kunal.dawar@okta.com>
53-
base_generation: 37e2dc1df848770f503b919fe905d3259e046cfd
53+
base_generation: bf4df4483c8f8211870c074c6e5725aabf31d339
5454
files:
5555
- src/auth0/management/__init__.py
5656
patch_content: |
@@ -8531,16 +8531,16 @@ patches:
85318531
]
85328532
user_owned: true
85338533
- id: patch-7271f157
8534-
content_hash: sha256:e5f014e7f8c379a0b7c3815222df83e115d542c5c9685b2a9d16285e1d18f800
8534+
content_hash: sha256:cd98dd1948587cf3396a2eacf46626176784bd00996eb660374161bfef686e93
85358535
original_commit: 7271f15759cfb545c9ef82b5a4f519ffe0a89db2
85368536
original_message: Revert wrapper file to preserve Auth0 telemetry customizations
85378537
original_author: Kunal Dawar <kunal.dawar@okta.com>
8538-
base_generation: 15127abb8ab299907925c41e89122d50dbe138d5
8538+
base_generation: bf4df4483c8f8211870c074c6e5725aabf31d339
85398539
files:
85408540
- src/auth0/management/core/client_wrapper.py
85418541
patch_content: |
85428542
diff --git a/src/auth0/management/core/client_wrapper.py b/src/auth0/management/core/client_wrapper.py
8543-
index cad2e31..60ebc5a 100644
8543+
index b1aed4b..60ebc5a 100644
85448544
--- a/src/auth0/management/core/client_wrapper.py
85458545
+++ b/src/auth0/management/core/client_wrapper.py
85468546
@@ -1,6 +1,11 @@
@@ -8570,12 +8570,12 @@ patches:
85708570
+ }).encode("utf-8")
85718571

85728572
headers: typing.Dict[str, str] = {
8573-
- "User-Agent": "auth0-python/5.5.0",
8573+
- "User-Agent": "auth0-python/5.6.0",
85748574
- "X-Fern-Language": "Python",
85758575
- "X-Fern-Runtime": f"python/{platform.python_version()}",
85768576
- "X-Fern-Platform": f"{platform.system().lower()}/{platform.release()}",
85778577
- "X-Fern-SDK-Name": "auth0-python",
8578-
- "X-Fern-SDK-Version": "5.5.0",
8578+
- "X-Fern-SDK-Version": "5.6.0",
85798579
+ "User-Agent": f"Python/{py_version}",
85808580
+ "Auth0-Client": base64.b64encode(auth0_client).decode(),
85818581
**(self.get_custom_headers() or {}),
@@ -8710,4 +8710,3 @@ patches:
87108710
token = await self._async_token()
87118711
headers["Authorization"] = f"Bearer {token}"
87128712
return headers
8713-
status: unresolved

src/auth0/management/core/client_wrapper.py

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

4343
headers: typing.Dict[str, str] = {
44-
"User-Agent": "auth0-python/5.6.0",
45-
"X-Fern-Language": "Python",
46-
"X-Fern-Runtime": f"python/{platform.python_version()}",
47-
"X-Fern-Platform": f"{platform.system().lower()}/{platform.release()}",
48-
"X-Fern-SDK-Name": "auth0-python",
49-
"X-Fern-SDK-Version": "5.6.0",
44+
"User-Agent": f"Python/{py_version}",
45+
"Auth0-Client": base64.b64encode(auth0_client).decode(),
5046
**(self.get_custom_headers() or {}),
5147
}
5248
headers["Authorization"] = f"Bearer {self._get_token()}"

0 commit comments

Comments
 (0)