Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ZendUser ^3.0 #39

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to ZendUser ^3.0 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eb1bd7
Can we get this sucker to ZfcUser 3.0?
dillchuk Sep 12, 2017
559f0af
Update to ZfcUser ^3.0 alpha
dillchuk Sep 13, 2017
4c978d1
Ensure storage is cleared + user instance check
dillchuk Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "library",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"zf3",
"zfcuser"
],
"homepage": "https://github.com/goalio/GoalioRememberMe",
Expand All @@ -16,7 +16,7 @@
}
],
"require": {
"zf-commons/zfc-user": "1.*"
"zf-commons/zfc-user": "^3.0"
},
"autoload": {
"psr-0": {
Expand Down
30 changes: 16 additions & 14 deletions src/GoalioRememberMe/Authentication/Adapter/Cookie.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
use ZfcUser\Authentication\Adapter\AbstractAdapter;
use Zend\Authentication\Result as AuthenticationResult;
use Zend\ServiceManager\ServiceManager;
use Zend\Stdlib\RequestInterface as Request;
use Zend\Stdlib\ResponseInterface as Response;
use ZfcUser\Authentication\Adapter\AdapterChainEvent as AuthEvent;
use Zend\EventManager\EventInterface;

class Cookie extends AbstractAdapter
{
Expand All @@ -19,11 +18,13 @@ class Cookie extends AbstractAdapter

protected $rememberMeService;

public function authenticate(AuthEvent $e)
{
public function authenticate(EventInterface $e) {
/* @var $authEvent AuthEvent */
$authEvent = $e->getTarget();
// check if cookie needs to be set, only when prior auth has been successful
if($e->getIdentity() !== null && $e->getRequest()->isPost() && $e->getRequest()->getPost()->get('remember_me') == 1) {
$userObject = $this->getUserMapper()->findById($e->getIdentity());
if ($authEvent->getIdentity() !== null && $authEvent->getRequest()->isPost()
&& $authEvent->getRequest()->getPost()->get('remember_me') == 1) {
$userObject = $this->getUserMapper()->findById($authEvent->getIdentity());
$this->getRememberMeService()->createSerie($userObject->getId());

/**
Expand All @@ -39,13 +40,13 @@ public function authenticate(AuthEvent $e)

if ($this->isSatisfied()) {
$storage = $this->getStorage()->read();
$e->setIdentity($storage['identity'])
$authEvent->setIdentity($storage['identity'])
->setCode(AuthenticationResult::SUCCESS)
->setMessages(array('Authentication successful.'));
return;
}

$cookies = $e->getRequest()->getCookie();
$cookies = $authEvent->getRequest()->getCookie();

// no cookie present, skip authentication
if(!isset($cookies['remember_me'])) {
Expand All @@ -69,7 +70,7 @@ public function authenticate(AuthEvent $e)
$this->getRememberMeService()->removeCookie();
$this->setSatisfied(false);

$e->setCode(AuthenticationResult::FAILURE)
$authEvent->setCode(AuthenticationResult::FAILURE)
->setMessages(array('Possible identity theft detected.'));
return false;
}
Expand All @@ -79,12 +80,12 @@ public function authenticate(AuthEvent $e)
$this->getRememberMeService()->updateSerie($rememberMe);

// Success!
$e->setIdentity($userObject->getId());
$authEvent->setIdentity($userObject->getId());
$this->setSatisfied(true);
$storage = $this->getStorage()->read();
$storage['identity'] = $e->getIdentity();
$storage['identity'] = $authEvent->getIdentity();
$this->getStorage()->write($storage);
$e->setCode(AuthenticationResult::SUCCESS)
$authEvent->setCode(AuthenticationResult::SUCCESS)
->setMessages(array('Authentication successful.'));

// Reference for weak login. Should not be allowed to change PW etc.
Expand Down Expand Up @@ -165,9 +166,10 @@ public function logout()
$cookie = explode("\n", $this->getRememberMeService()->getCookie());

if($cookie[0] !== '') {
$this->getRememberMeService()->removeSerie($user->getId(), $cookie[1]);
$user and $this->getRememberMeService()->removeSerie($user->getId(), $cookie[1]);
$this->getRememberMeService()->removeCookie();
}
$this->getStorage() and $this->getStorage()->clear();
}

}
}
Loading