Skip to content

Fix resolve scheme in url_for #10268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raymondjacobson merged 1 commit into from
Oct 29, 2024
Merged

Fix resolve scheme in url_for #10268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/discovery-provider/src/api/v1/utils/resolve_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,23 @@
from src.api.v1.tracks import ns as tracks_ns
from src.api.v1.users import ns as users_ns
from src.models.users.user import User
from src.utils.config import shared_config
from src.utils.helpers import encode_int_id

track_url_regex = re.compile(r"^/(?P<handle>[^/]*)/(?P<slug>[^/]*)$")
playlist_url_regex = re.compile(r"/(?P<handle>[^/]*)/(playlist|album)/(?P<slug>[^/]*)$")
user_url_regex = re.compile(r"^/(?P<handle>[^/]*)$")

env = shared_config["discprov"]["env"]


def ns_url_for(ns, route, **kwargs):
return url_for(f"{api_v1.bp.name}.{ns.name}_{route}", **kwargs)
return url_for(
f"{api_v1.bp.name}.{ns.name}_{route}",
_scheme="https" if env == "stage" or env == "prod" else None,
_external=True if env == "stage" or env == "prod" else None,
**kwargs,
)


def resolve_url(session, url):
Expand Down