From 6fb74362be01404f3efc801960fabff6a3639b77 Mon Sep 17 00:00:00 2001 From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com> Date: Fri, 29 Aug 2025 21:40:54 +0330 Subject: [PATCH] feat(auth/ui): Redesign login page and remove next_url from login flow --- core/scripts/webpanel/middleware/auth.py | 4 +- core/scripts/webpanel/routers/login/login.py | 8 +- core/scripts/webpanel/templates/login.html | 274 +++++++++++++++---- 3 files changed, 225 insertions(+), 61 deletions(-) diff --git a/core/scripts/webpanel/middleware/auth.py b/core/scripts/webpanel/middleware/auth.py index cfc893d..eac0ec6 100644 --- a/core/scripts/webpanel/middleware/auth.py +++ b/core/scripts/webpanel/middleware/auth.py @@ -70,7 +70,5 @@ class AuthMiddleware(BaseHTTPMiddleware): return exception_handler(exc) def __redirect_to_login(self, request: Request): - next_url = quote(str(request.url)) - redirect_url = str(request.url_for('login')) + f'?next_url={next_url}' - + redirect_url = str(request.url_for('login')) return RedirectResponse(url=redirect_url, status_code=302) diff --git a/core/scripts/webpanel/routers/login/login.py b/core/scripts/webpanel/routers/login/login.py index e65e88b..7a9d104 100644 --- a/core/scripts/webpanel/routers/login/login.py +++ b/core/scripts/webpanel/routers/login/login.py @@ -19,7 +19,7 @@ async def login(request: Request, templates: Jinja2Templates = Depends(get_templ async def login_post( request: Request, templates: Jinja2Templates = Depends(get_templates), session_manager: SessionManager = Depends(get_session_manager), - username: str = Form(), password: str = Form(), next_url: str = Form(default='/') + username: str = Form(), password: str = Form() ): ''' Handles login form submission. @@ -30,11 +30,7 @@ async def login_post( session_id = session_manager.set_session(username) - # Redirect to the index page if there is no next query parameter in the URL - if next_url == '/': - redirect_url = request.url_for('index') - else: - redirect_url = next_url + redirect_url = request.url_for('index') res = RedirectResponse(url=redirect_url, status_code=302) res.set_cookie(key='session_id', value=session_id) diff --git a/core/scripts/webpanel/templates/login.html b/core/scripts/webpanel/templates/login.html index f2a7eb0..05c69c3 100644 --- a/core/scripts/webpanel/templates/login.html +++ b/core/scripts/webpanel/templates/login.html @@ -4,68 +4,238 @@ - Admin Dashboard - Login + Blitz Dashboard - Login + + + + + - -
-