deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed User model from $_SESSION.

Browse source
This commit is contained in:
Dmitry Khomutov 2018-02-17 11:59:02 +07:00
commit f26726c6e9
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
16 changed files with 72 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/PHPCensor/Controller/BuildController.php
View file

@ -73,7 +73,7 @@ class BuildController extends Controller
}
/** @var User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
$perPage = $user->getFinalPerPage();
$data = $this->getBuildData($build, $plugin, $severity, $isNew, (($page - 1) * $perPage), $perPage);
$pages = ($data['errors'] === 0)

2
src/PHPCensor/Controller/GroupController.php
View file

@ -74,7 +74,7 @@ class GroupController extends Controller
$group->setTitle($this->getParam('title'));
if (is_null($groupId)) {
/** @var User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
$group->setCreateDate(new \DateTime());
$group->setUserId($user->getId());

6
src/PHPCensor/Controller/ProjectController.php
View file

@ -96,7 +96,7 @@ class ProjectController extends PHPCensor\Controller
}
/** @var PHPCensor\Model\User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
$perPage = $user->getFinalPerPage();
$builds = $this->getLatestBuildsHtml($projectId, $branch, $environment, (($page - 1) * $perPage), $perPage);
$pages = ($builds[1] === 0)
@ -209,7 +209,7 @@ class ProjectController extends PHPCensor\Controller
}
/** @var PHPCensor\Model\User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
$build = $this->buildService->createBuild(
$project,
$environment,
@ -337,7 +337,7 @@ class ProjectController extends PHPCensor\Controller
];
/** @var PHPCensor\Model\User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
$project = $this->projectService->createProject($title, $type, $reference, $user->getId(), $options);
$response = new RedirectResponse();

10
src/PHPCensor/Controller/SessionController.php
View file

@ -11,7 +11,7 @@ use PHPCensor\Store\UserStore;
/**
* Session Controller - Handles user login / logout.
*
*
* @author Dan Cryer <dan@block8.co.uk>
*/
class SessionController extends Controller
@ -53,7 +53,7 @@ class SessionController extends Controller
return $response;
}
}
$isLoginFailure = false;
if ($this->request->getMethod() == 'POST') {
@ -92,7 +92,7 @@ class SessionController extends Controller
if ($rememberMe) {
$rememberKey = md5(microtime(true));
$user->setRememberKey($rememberKey);
$this->userStore->save($user);
@ -161,7 +161,6 @@ class SessionController extends Controller
*/
public function logout()
{
unset($_SESSION['php-censor-user']);
unset($_SESSION['php-censor-user-id']);
session_destroy();
@ -233,7 +232,8 @@ class SessionController extends Controller
$hash = password_hash($this->getParam('password'), PASSWORD_DEFAULT);
$user->setHash($hash);
$_SESSION['php-censor-user'] = $this->userStore->save($user);
$this->userStore->save($user);
$_SESSION['php-censor-user-id'] = $user->getId();
$response = new b8\Http\Response\RedirectResponse();

5
src/PHPCensor/Controller/UserController.php
View file

@ -56,7 +56,7 @@ class UserController extends Controller
public function profile()
{
/** @var User $user */
$user = $_SESSION['php-censor-user'];
$user = $this->getUser();
if ($this->request->getMethod() == 'POST') {
$name = $this->getParam('name', null);
@ -73,8 +73,7 @@ class UserController extends Controller
$perPage = null;
}
$_SESSION['php-censor-user'] = $this->userService->updateUser($user, $name, $email, $password, null, $language, $perPage);
$user = $_SESSION['php-censor-user'];
$user = $this->userService->updateUser($user, $name, $email, $password, null, $language, $perPage);
$this->view->updated = 1;
}