From 1f32bf42675dadb29b6d27e2c8ab450f88e573ce Mon Sep 17 00:00:00 2001
From: lare <lare@lare.cc>
Date: Tue, 27 Dec 2022 19:01:07 +0100
Subject: [PATCH] [hotfix][web] add config["base-dir"] to work in subdirs

---
 web/backend/main.py     | 3 ++-
 web/frontend/login.html | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/backend/main.py b/web/backend/main.py
index 8929759..aab3ef0 100644
--- a/web/backend/main.py
+++ b/web/backend/main.py
@@ -205,6 +205,7 @@ def auth_required():
         @wraps(f)
         def decorated(*args, **kwargs):
             if not "login" in session:
+                request_url = f"{config['base-dir']}{request.url}".replace("//", "/")
                 return redirect(f"{config['base-dir']}login?return={request.url}")
             else:
                 return f(*args, **kwargs)
@@ -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"}}'
   />
   <button
     type="submit"