Skip to content

Commit 0670bdd

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
1 parent 604ca5a commit 0670bdd

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
@@ -8814,7 +8814,7 @@ patches:
88148814
"verifiable_credentials",
88158815
]
88168816
user_owned: true
8817-
status: unresolved
8817+
status: resolving
88188818
- id: patch-7271f157
88198819
content_hash: sha256:cd98dd1948587cf3396a2eacf46626176784bd00996eb660374161bfef686e93
88208820
original_commit: 7271f15759cfb545c9ef82b5a4f519ffe0a89db2
@@ -8995,7 +8995,7 @@ patches:
89958995
token = await self._async_token()
89968996
headers["Authorization"] = f"Bearer {token}"
89978997
return headers
8998-
status: unresolved
8998+
status: resolving
89998999
- id: patch-c04f0b4d
90009000
content_hash: sha256:83d107f26dbfc31edb435b802c8aed47747628eddee83e0fb85a71ec8d11519c
90019001
original_commit: c04f0b4dbbe8f2300f4f1bf42f62350888a92da5

src/auth0/management/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,6 +1862,8 @@
18621862
FedCmLoginPatch,
18631863
FedCmLoginGooglePatch,
18641864
FedCmLoginPatch,
1865+
FedCmLoginGooglePatch,
1866+
FedCmLoginPatch,
18651867
FlowAction,
18661868
FlowActionActivecampaign,
18671869
FlowActionActivecampaignListContacts,
@@ -5062,6 +5064,8 @@
50625064
"FedCmLoginPatch": ".types",
50635065
"FedCmLoginGooglePatch": ".types",
50645066
"FedCmLoginPatch": ".types",
5067+
"FedCmLoginGooglePatch": ".types",
5068+
"FedCmLoginPatch": ".types",
50655069
"FlowAction": ".types",
50665070
"FlowActionActivecampaign": ".types",
50675071
"FlowActionActivecampaignListContacts": ".types",
@@ -8274,6 +8278,8 @@ def __dir__():
82748278
"FedCmLoginPatch",
82758279
"FedCmLoginGooglePatch",
82768280
"FedCmLoginPatch",
8281+
"FedCmLoginGooglePatch",
8282+
"FedCmLoginPatch",
82778283
"FlowAction",
82788284
"FlowActionActivecampaign",
82798285
"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/5.8.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": "5.8.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)