about summary refs log tree commit diff stats
path: root/classes/Handler/LoginHandler.php
diff options
context:
space:
mode:
Diffstat (limited to 'classes/Handler/LoginHandler.php')
-rw-r--r--classes/Handler/LoginHandler.php15
1 files changed, 11 insertions, 4 deletions
diff --git a/classes/Handler/LoginHandler.php b/classes/Handler/LoginHandler.php
index c97a93e..fbe6894 100644
--- a/classes/Handler/LoginHandler.php
+++ b/classes/Handler/LoginHandler.php
@@ -35,7 +35,11 @@ class LoginHandler implements RequestHandlerInterface
 		$_SESSION["pass_hash"] = sha1($user->pass);
 		$_SESSION["csrf_token"] = bin2hex(random_bytes(16));
 
-		return ["owner" => $username];
+		setcookie("epube_csrf_token", $_SESSION["csrf_token"], time() + Config::get(Config::SESSION_LIFETIME),
+			"/", "", Config::is_server_https());
+
+		// csrf_token is passed via cookie, epube_csrf_token, returning it here is not needed atm
+		return ["result" => "ok", "owner" => $username /* , "csrf_token" => $_SESSION["csrf_token"] */];
 	}
 
 	private function doOidcLogin(): void
@@ -92,7 +96,10 @@ class LoginHandler implements RequestHandlerInterface
 			$_SESSION["pass_hash"] = sha1($user->pass);
 			$_SESSION["csrf_token"] = bin2hex(random_bytes(16));
 
-			return ["owner" => $username];
+			setcookie("epube_csrf_token", $_SESSION["csrf_token"], time() + Config::get(Config::SESSION_LIFETIME),
+				"/", "", Config::is_server_https());
+
+			return ["result" => "ok", "owner" => $username, "csrf_token" => $_SESSION["csrf_token"]];
 
 		} catch (\Exception $e) {
 			return ["error" => "OIDC Error: " . $e->getMessage()];
@@ -139,7 +146,7 @@ class LoginHandler implements RequestHandlerInterface
 
 			return (new Response())
 				->withHeader("Location", Config::get_self_url() . "/index.php")
-				->withBody(json_encode(["result" => "ok", "user" => $result["owner"]]));
+				->withBody(json_encode($result));
 		}
 
 		// Local username/password login
@@ -162,7 +169,7 @@ class LoginHandler implements RequestHandlerInterface
 			}
 
 			return (new Response())
-				->withBody(json_encode(["result" => "ok", "user" => $result["owner"]]));
+				->withBody(json_encode($result));
 		}
 
 		return (new Response())