[hotfix][web] add config["base-dir"] to work in subdirs

This commit is contained in:
lare 2022-12-27 19:01:07 +01:00
parent a0254de86c
commit 144c724215
2 changed files with 4 additions and 3 deletions

View file

@ -205,7 +205,8 @@ def auth_required():
@wraps(f) @wraps(f)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
if not "login" in session: 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: else:
return f(*args, **kwargs) return f(*args, **kwargs)
return decorated return decorated
@ -243,7 +244,7 @@ def kioubit_auth():
@app.route("/logout") @app.route("/logout")
def logout(): def logout():
session.clear() session.clear()
return redirect("/") return redirect(config["base-dir"])
@app.route("/login", methods=["GET", "POST"]) @app.route("/login", methods=["GET", "POST"])

View file

@ -11,7 +11,7 @@
type="hidden" type="hidden"
id="return" id="return"
name="return" name="return"
value='{{config["domain"]+"/api/auth/kverify"}}' value='{{config["domain"]+config["base-dir"]+"api/auth/kverify"}}'
/> />
<button <button
type="submit" type="submit"