Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/core/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ def get_multiple_labels(self, entity_ids: List[str], language: str) -> dict:
"ids": ids,
}
logger.debug(f"Sending GET request at {action_api}, languages={languages}, ids={ids}")
self.refresh_token_if_needed()
res = requests.get(action_api, headers=self.headers(), params=params)
self.raise_for_status(res)
return res.json()
1 change: 1 addition & 0 deletions src/web/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<li><a href="{% url 'new_batch' %}">{% translate "New batch" %}</a></li>
<li><a href="{% url 'last_batches' %}">{% translate "Last batches" %}</a></li>
<li><a href="https://github.com/WikiMovimentoBrasil/quickstatements3">Git</a></li>
<li><a href="https://meta.wikimedia.org/wiki/QuickStatements_3.0">Docs</a></li>
</ul>
<ul>
{% if user.is_anonymous %}
Expand Down
4 changes: 2 additions & 2 deletions src/web/tests/test_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def test_contains_dev_login_url(self):
def test_redirects_to_profile_if_logged_in(self):
self.login_john()
res = self.get()
self.assertRedirectToUrlName(res, "profile")
self.assertRedirectToPath(res, "/")
self.assertIsAuthenticated()

@requests_mock.Mocker()
Expand Down Expand Up @@ -206,7 +206,7 @@ def test_login_success(self, mocker):
ApiMocker.login_success(mocker, "Maria")

res = self.post(data={"access_token": "valid_token"})
self.assertRedirectToUrlName(res, "profile")
self.assertRedirectToPath(res, "/")

user = self.get_user()
token = Token.objects.get(user=user)
Expand Down
6 changes: 3 additions & 3 deletions src/web/views/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def logout_per_token_expired(request):

def login(request):
if request.user.is_authenticated:
return redirect("/auth/profile/")
return redirect("/")
else:
data = {
"token_expired": request.session.get("token_expired", False),
Expand All @@ -47,7 +47,7 @@ def oauth_callback(request):
full_token = oauth.mediawiki.authorize_access_token(request)
user = user_from_full_token(full_token)
django_login(request, user)
return redirect(reverse("profile"))
return redirect("/")
except (UnauthorizedToken, KeyError):
data["error"] = "token"
except ServerError:
Expand All @@ -69,6 +69,6 @@ def login_dev(request):
data = {"error": e}
return render(request, "login_dev.html", data, status=400)

return redirect("/auth/profile/")
return redirect("/")
else:
return render(request, "login_dev.html", {})