Skip to content

WIP Handle language code redirects that preserve the request path #15

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

Draft
davidwtbuxton wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

WIP Handle language code redirects that preserve the request path #15

Show file tree
Hide file tree
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
15 changes: 15 additions & 0 deletions src/securescaffold/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

demo_app = flask.Flask(__name__)
demo_app.add_url_rule("/", "home", securescaffold.views.lang_redirect)
demo_app.add_url_rule("/<path:path>", view_func=securescaffold.views.lang_redirect)

locale_test_data = [
# LOCALES, Accept-Language header, expected redirect
Expand Down Expand Up @@ -90,3 +91,17 @@ def test_redirect_with_query_preserves_original_query(self):

self.assertEqual(response.status_code, 302)
self.assertEqual(response.location, "/test?baz=qux&foo=bar")

def test_redirect_preserves_path(self):
client = demo_app.test_client()
response = client.get("/foo")

self.assertEqual(response.status_code, 302)
self.assertEqual(response.location, "/intl/en/foo")

def test_redirect_preserves_path_and_query(self):
client = demo_app.test_client()
response = client.get("/foo", query_string={"bar": "baz"})

self.assertEqual(response.status_code, 302)
self.assertEqual(response.location, "/intl/en/foo?bar=baz")
6 changes: 3 additions & 3 deletions src/securescaffold/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


DEFAULT_LANGS = ["en"]
DEFAULT_LANGS_REDIRECT_TO = "/intl/{locale}/"
DEFAULT_LANGS_REDIRECT_TO = "/intl/{locale}{path}"


def best_match(requested_langs: LanguageAccept, supported_langs: list) -> Optional[str]:
Expand Down Expand Up @@ -56,7 +56,7 @@ def add_query_to_url(path: str, qs: str) -> str:
return urllib.parse.urlunsplit(parsed)


def lang_redirect():
def lang_redirect(path: str = ""):
"""Redirects the user depending on the Accept-Language header.

Use this with @flask.before_request or as a view.
Expand All @@ -73,7 +73,7 @@ def lang_redirect():
else:
locale = DEFAULT_LANGS[0]

redirect_to = locales_redirect_to.format(locale=locale)
redirect_to = locales_redirect_to.format(locale=locale, path=flask.request.path)

if flask.request.query_string:
# Preserve query parameters on redirect.
Expand Down