Compare commits

...

2 commits

Author SHA1 Message Date
Izalia Mae aef97dc690 Merge branch 'dev' into 'master'
Draft: 0.3.0

See merge request pleroma/relay!57
2024-03-05 19:09:36 +00:00
Izalia Mae 0e812c012e fix POST /api/token and prevent scroll bar from always showing 2024-03-05 14:05:54 -05:00
2 changed files with 1 additions and 2 deletions

View file

@ -89,7 +89,6 @@ textarea {
#container { #container {
width: 1024px; width: 1024px;
margin: 0px auto; margin: 0px auto;
height: 100vh;
} }
#header { #header {

View file

@ -75,7 +75,7 @@ class Login(View):
if isinstance(data, Response): if isinstance(data, Response):
return data return data
with self.database.connction(True) as conn: with self.database.session(True) as conn:
if not (user := conn.get_user(data['username'])): if not (user := conn.get_user(data['username'])):
return Response.new_error(401, 'User not found', 'json') return Response.new_error(401, 'User not found', 'json')