diff --git a/web/backend/main.py b/web/backend/main.py index 8929759..48b5af1 100644 --- a/web/backend/main.py +++ b/web/backend/main.py @@ -205,7 +205,8 @@ def auth_required(): @wraps(f) def decorated(*args, **kwargs): if not "login" in session: - return redirect(f"{config['base-dir']}login?return={request.url}") + request_url = f"{config['base-dir']}{request.url}".replace("//", "/") + return redirect(f"{config['base-dir']}login?return={request_url}") else: return f(*args, **kwargs) return decorated @@ -243,7 +244,7 @@ def kioubit_auth(): @app.route("/logout") def logout(): session.clear() - return redirect("/") + return redirect(config["base-dir"]) @app.route("/login", methods=["GET", "POST"]) diff --git a/web/frontend/login.html b/web/frontend/login.html index 739616a..d3addca 100644 --- a/web/frontend/login.html +++ b/web/frontend/login.html @@ -11,7 +11,7 @@ type="hidden" id="return" name="return" - value='{{config["domain"]+"/api/auth/kverify"}}' + value='{{config["domain"]+config["base-dir"]+"api/auth/kverify"}}' />