mirror
/
datasette
kopia lustrzana https://github.com/simonw/datasette
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Logout link in nav, refs #875

json-post
Simon Willison 2020-06-29 11:40:40 -07:00
rodzic 51427323e6
commit 2115d7e345
7 zmienionych plików z 73 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
datasette/app.py
Wyświetl plik

@ -44,6 +44,7 @@ from .database import Database, QueryInterrupted
from .utils import (
async_call_with_supported_arguments,
call_with_supported_arguments,
display_actor,
escape_css_string,
escape_sqlite,
format_bytes,
@ -736,6 +737,8 @@ class Datasette:
template_context = {
**context,
**{
"actor": request.actor if request else None,
"display_actor": display_actor,
"app_css_hash": self.app_css_hash(),
"zip": zip,
"body_scripts": body_scripts,

18
datasette/static/app.css
Wyświetl plik

@ -100,6 +100,14 @@ table a:visited {
.hd .crumbs {
float: left;
}
.hd .logout {
float: right;
text-align: right;
padding-left: 1em;
}
.hd .logout form {
display: inline;
}
.ft {
margin: 1em 0;
padding: 0.5em 1em 0 1em;
@ -367,3 +375,13 @@ p.zero-results {
border: 1px solid red;
background-color: pink;
}
button.button-as-link {
background: none;
border: none;
padding: 0;
color: blue;
text-decoration: none;
cursor: pointer;
font-size: 1em;
}

12
datasette/templates/base.html
Wyświetl plik

@ -14,7 +14,17 @@
</head>
<body class="{% block body_class %}{% endblock %}">
<nav class="hd">{% block nav %}{% endblock %}</nav>
<nav class="hd">{% block nav %}
{% if actor %}
<div class="logout">
<strong>{{ display_actor(actor) }}</strong> &middot;
<form action="/-/logout" method="post">
<input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
<button class="button-as-link">Log out</button>
</form>
</div>
{% endif %}
{% endblock %}</nav>
<div class="bd">
{% block messages %}

2
datasette/templates/logout.html
Wyświetl plik

@ -13,7 +13,7 @@
<h1>Log out</h1>
<p>You are logged in as <strong>{{ actor.id or actor }}</strong></p>
<p>You are logged in as <strong>{{ display_actor(actor) }}</strong></p>
<form action="/-/logout" method="post">
<div>

7
datasette/utils/__init__.py
Wyświetl plik

@ -924,3 +924,10 @@ def resolve_env_secrets(config, environ):
return [resolve_env_secrets(value, environ) for value in config]
else:
return config
def display_actor(actor):
for key in ("display", "name", "username", "login", "id"):
if actor.get(key):
return actor[key]
return str(actor)

14
tests/test_auth.py
Wyświetl plik

@ -78,3 +78,17 @@ def test_logout(app_client):
# Should also have set a message
messages = app_client.ds.unsign(response4.cookies["ds_messages"], "messages")
assert [["You are now logged out", 2]] == messages
@pytest.mark.parametrize("path", ["/", "/fixtures", "/fixtures/facetable"])
def test_logout_button_in_navigation(app_client, path):
response = app_client.get(
path, cookies={"ds_actor": app_client.actor_cookie({"id": "test"})}
)
anon_response = app_client.get(path)
for fragment in (
"<strong>test</strong> &middot;",
'<form action="/-/logout" method="post">',
):
assert fragment in response.text
assert fragment not in anon_response.text

19
tests/test_utils.py
Wyświetl plik

@ -517,3 +517,22 @@ def test_actor_matches_allow(actor, allow, expected):
)
def test_resolve_env_secrets(config, expected):
assert expected == utils.resolve_env_secrets(config, {"FOO": "x"})
@pytest.mark.parametrize(
"actor,expected",
[
({"id": "blah"}, "blah"),
({"id": "blah", "login": "l"}, "l"),
({"id": "blah", "login": "l"}, "l"),
({"id": "blah", "login": "l", "username": "u"}, "u"),
({"login": "l", "name": "n"}, "n"),
(
{"id": "blah", "login": "l", "username": "u", "name": "n", "display": "d"},
"d",
),
({"weird": "shape"}, "{'weird': 'shape'}"),
],
)
def test_display_actor(actor, expected):
assert expected == utils.display_actor(actor)