Skip to content

Commit 775dc3b

Browse files
authored
fix: use correct host in URL construction (#17338)
1 parent b2b680f commit 775dc3b

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

warehouse/observations/tasks.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,25 @@ def report_observation_to_helpscout(task, request: Request, model_id: UUID) -> N
7878
# Maybe need a mapping of ObservationType and the name we want to use.
7979
target_name = model.related.name
8080

81+
warehouse_domain = request.registry.settings.get("warehouse.domain")
82+
8183
# Add new Conversation to HelpScout for tracking purposes
8284
convo_text = dedent(
8385
f"""
8486
Kind: {model.kind}
8587
Summary: {model.summary}
8688
Model Name: {model.__class__.__name__}
8789
88-
Project URL: {request.route_url('packaging.project', name=target_name)}
90+
Project URL: {request.route_url(
91+
'packaging.project', name=target_name, _host=warehouse_domain
92+
)}
8993
"""
9094
)
9195
for owner in model.related.owners:
9296
username = owner.username
93-
owner_url = request.route_url("admin.user.detail", username=username)
97+
owner_url = request.route_url(
98+
"admin.user.detail", username=username, _host=warehouse_domain
99+
)
94100
convo_text += f"Owner: {username}\n"
95101
convo_text += f"Owner URL: {owner_url}\n"
96102

@@ -102,7 +108,7 @@ def report_observation_to_helpscout(task, request: Request, model_id: UUID) -> N
102108
Malware Reports URL: {request.route_url(
103109
"admin.malware_reports.project.list",
104110
project_name=target_name,
105-
_host=request.registry.settings.get("warehouse.domain"),
111+
_host=warehouse_domain,
106112
)}
107113
"""
108114
)

0 commit comments

Comments
 (0)