forked from rDrama/rDrama
consistency
parent
f873f27e69
commit
678f40ccba
|
@ -23,11 +23,11 @@ NO_LOGIN_REDIRECT_URLS = ("/login", "/logout", "/signup", "/forgot", "/reset", "
|
||||||
@app.get("/login")
|
@app.get("/login")
|
||||||
@auth_desired
|
@auth_desired
|
||||||
def login_get(v:Optional[User]):
|
def login_get(v:Optional[User]):
|
||||||
redir = request.values.get("redirect", "/").strip().rstrip('?').lower()
|
if v:
|
||||||
if redir:
|
redir = request.values.get("redirect", "").strip().rstrip('?').lower()
|
||||||
if not is_site_url(redir) or redir in NO_LOGIN_REDIRECT_URLS:
|
if redir and is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS:
|
||||||
redir = "/"
|
return redirect(redir)
|
||||||
if v: return redirect(redir)
|
return redirect('/')
|
||||||
return render_template("login/login.html", failed=False, redirect=redir), 401
|
return render_template("login/login.html", failed=False, redirect=redir), 401
|
||||||
|
|
||||||
def login_deduct_when(resp):
|
def login_deduct_when(resp):
|
||||||
|
@ -107,8 +107,7 @@ def login_post(v:Optional[User]):
|
||||||
on_login(account)
|
on_login(account)
|
||||||
|
|
||||||
redir = request.values.get("redirect", "").strip().rstrip('?').lower()
|
redir = request.values.get("redirect", "").strip().rstrip('?').lower()
|
||||||
if redir:
|
if redir and is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS:
|
||||||
if is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS:
|
|
||||||
return redirect(redir)
|
return redirect(redir)
|
||||||
return redirect('/')
|
return redirect('/')
|
||||||
|
|
||||||
|
@ -336,8 +335,7 @@ def sign_up_post(v:Optional[User]):
|
||||||
send_notification(CARP_ID, f"A new user - @{new_user.username} - has signed up!")
|
send_notification(CARP_ID, f"A new user - @{new_user.username} - has signed up!")
|
||||||
|
|
||||||
redir = request.values.get("redirect", "").strip().rstrip('?').lower()
|
redir = request.values.get("redirect", "").strip().rstrip('?').lower()
|
||||||
if redir:
|
if redir and is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS:
|
||||||
if is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS:
|
|
||||||
return redirect(redir)
|
return redirect(redir)
|
||||||
return redirect('/')
|
return redirect('/')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue