xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-05 13:20:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bearer backward compatibility logic

Browse Source
This commit is contained in:
Chunting Wu
2025-04-11 17:44:46 +08:00
parent 3c8ad9eac8
commit 7a32faf64f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pr_agent/git_providers/bitbucket_provider.py
View File

@ -31,11 +31,11 @@ class BitbucketProvider(GitProvider):
s = requests.Session() s = requests.Session()
s.headers["Content-Type"] = "application/json" s.headers["Content-Type"] = "application/json"
try: self.auth_type = get_settings().get("BITBUCKET.AUTH_TYPE", "bearer")
self.auth_type = context.get("bitbucket_auth_type", None) or get_settings().get("BITBUCKET.AUTH_TYPE", "bearer")
try:
def get_token(token_name, auth_type_name): def get_token(token_name, auth_type_name):
token = context.get(f"bitbucket_{token_name}", None) or get_settings().get(f"BITBUCKET.{token_name.upper()}", None) token = get_settings().get(f"BITBUCKET.{token_name.upper()}", None)
if not token: if not token:
raise ValueError(f"{auth_type_name} auth requires a token") raise ValueError(f"{auth_type_name} auth requires a token")
return token return token
@ -44,7 +44,13 @@ class BitbucketProvider(GitProvider):
self.basic_token = get_token("basic_token", "Basic") self.basic_token = get_token("basic_token", "Basic")
s.headers["Authorization"] = f"Basic {self.basic_token}" s.headers["Authorization"] = f"Basic {self.basic_token}"
elif self.auth_type == "bearer": elif self.auth_type == "bearer":
self.bearer_token = get_token("bearer_token", "Bearer") try:
self.bearer_token = context.get("bitbucket_bearer_token", None)
except:
self.bearer_token = None
if not self.bearer_token:
get_token("bearer_token", "Bearer")
s.headers["Authorization"] = f"Bearer {self.bearer_token}" s.headers["Authorization"] = f"Bearer {self.bearer_token}"
else: else:
raise ValueError(f"Unsupported auth_type: {self.auth_type}") raise ValueError(f"Unsupported auth_type: {self.auth_type}")