rodude123/my-portfolio
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various-fixes #55

Merged
rodude123 merged 3 commits from various-fixes into master 2024-06-22 19:02:57 +01:00
Conversation 0 Commits 3 Files Changed 29 +16 -19
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 591db4dfa3 - Show all commits

35
src/api/user/userRoutes.php
View File

@ -168,27 +168,24 @@ class userRoutes implements routesInterface
$this->samlAuth->processResponse();
$attributes = $this->samlAuth->getAttributes();
// $username = $attributes["username"][0];
// $email = $attributes["email"][0];
$username = $attributes["username"][0];
$email = $attributes["email"][0];
$response->getBody()->write(json_encode($attributes));
return $response;
if ($this->user->checkSAMLUser($username, $email))
{
// yay, user is logged in
$_SESSION["token"] = $this->user->createToken($username);
$_SESSION["username"] = $username;
$_SESSION["email"] = $email;
// if ($this->user->checkSAMLUser($username, $email))
// {
// // yay, user is logged in
// $_SESSION["token"] = $this->user->createToken($username);
// $_SESSION["username"] = $username;
// $_SESSION["email"] = $email;
//
// $inactive = 60 * 60 * 48; // 2 days
// $_SESSION["timeout"] = time() + $inactive;
//
// return $response->withHeader("Location", "https://rohitpai.co.uk/editor/editor.html")->withStatus(302);
// }
//
// $response->getBody()->write(json_encode(array("error" => "Unauthorised")));
// return $response->withStatus(401);
$inactive = 60 * 60 * 48; // 2 days
$_SESSION["timeout"] = time() + $inactive;
return $response->withHeader("Location", "https://rohitpai.co.uk/editor/editor.html")->withStatus(302);
}
$response->getBody()->write(json_encode(array("error" => "Unauthorised")));
return $response->withStatus(401);
});
$app->post("/user/changePassword", function (Request $request, Response $response)