mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
add authenticated User LangPreference tracking
+ Use User.LangPreference when there is no set AURSID if request.user.is_authenticated is true. + Updated post /language to update LangPreference when request.user.is_authenticated. + Restore language during test where we change it. + Added the user attribute to aurweb.testing.requests.Request. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
a33d076d8b
commit
9fdbe3f775
5 changed files with 59 additions and 14 deletions
|
@ -64,8 +64,10 @@ translator = Translator()
|
|||
|
||||
|
||||
def get_request_language(request: Request):
|
||||
return request.cookies.get("AURLANG",
|
||||
aurweb.config.get("options", "default_lang"))
|
||||
if request.user.is_authenticated():
|
||||
return request.user.LangPreference
|
||||
default_lang = aurweb.config.get("options", "default_lang")
|
||||
return request.cookies.get("AURLANG", default_lang)
|
||||
|
||||
|
||||
def get_raw_translator_for_request(request: Request):
|
||||
|
@ -77,12 +79,6 @@ def get_translator_for_request(request: Request):
|
|||
"""
|
||||
Determine the preferred language from a FastAPI request object and build a
|
||||
translator function for it.
|
||||
|
||||
Example:
|
||||
```python
|
||||
_ = get_translator_for_request(request)
|
||||
print(_("Hello"))
|
||||
```
|
||||
"""
|
||||
lang = get_request_language(request)
|
||||
|
||||
|
|
|
@ -24,12 +24,14 @@ async def language(request: Request,
|
|||
set_lang: str = Form(...),
|
||||
next: str = Form(...),
|
||||
q: str = Form(default=None)):
|
||||
""" A POST route used to set a session's language.
|
||||
"""
|
||||
A POST route used to set a session's language.
|
||||
|
||||
Return a 303 See Other redirect to {next}?next={next}. If we are
|
||||
setting the language on any page, we want to preserve query
|
||||
parameters across the redirect.
|
||||
"""
|
||||
from aurweb.db import session
|
||||
from aurweb.asgi import routes
|
||||
if unquote(next) not in routes:
|
||||
return HTMLResponse(
|
||||
|
@ -37,6 +39,13 @@ async def language(request: Request,
|
|||
status_code=400)
|
||||
|
||||
query_string = "?" + q if q else str()
|
||||
|
||||
# If the user is authenticated, update the user's LangPreference.
|
||||
if request.user.is_authenticated():
|
||||
request.user.LangPreference = set_lang
|
||||
session.commit()
|
||||
|
||||
# In any case, set the response's AURLANG cookie that never expires.
|
||||
response = RedirectResponse(url=f"{next}{query_string}",
|
||||
status_code=int(HTTPStatus.SEE_OTHER))
|
||||
response.set_cookie("AURLANG", set_lang)
|
||||
|
|
|
@ -1,8 +1,27 @@
|
|||
import aurweb.config
|
||||
|
||||
|
||||
class User:
|
||||
""" A fake User model. """
|
||||
# Fake columns.
|
||||
LangPreference = aurweb.config.get("options", "default_lang")
|
||||
|
||||
# A fake authenticated flag.
|
||||
authenticated = False
|
||||
|
||||
def is_authenticated(self):
|
||||
return self.authenticated
|
||||
|
||||
|
||||
class Client:
|
||||
""" A fake FastAPI Request.client object. """
|
||||
# A fake host.
|
||||
host = "127.0.0.1"
|
||||
|
||||
|
||||
class Request:
|
||||
""" A fake Request object which mimics a FastAPI Request for tests. """
|
||||
client = Client()
|
||||
cookies = dict()
|
||||
headers = dict()
|
||||
user = User()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue