mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-17 15:03:25 +00:00
PHRAS-3694 bin/maintenance clean:users finish (#4139)
* clean users * fix help * add usertype * relance user connection * unused option * test * send token to connect to phraseanet * add alpha on help * bump rc6, add alpha , fix input to integer Co-authored-by: jygaulier <gaulier@alchemy.fr>
This commit is contained in:
@@ -14,10 +14,12 @@ namespace Alchemy\Phrasea\ControllerProvider\Prod;
|
||||
use Alchemy\Phrasea\Application as PhraseaApplication;
|
||||
use Alchemy\Phrasea\Controller\Prod\RootController;
|
||||
use Alchemy\Phrasea\ControllerProvider\ControllerProviderTrait;
|
||||
use Alchemy\Phrasea\Helper;
|
||||
use Alchemy\Phrasea\Model\Entities\Token;
|
||||
use Alchemy\Phrasea\Model\Manipulator\TokenManipulator;
|
||||
use Silex\Application;
|
||||
use Silex\ControllerProviderInterface;
|
||||
use Silex\ServiceProviderInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
|
||||
class Root implements ControllerProviderInterface, ServiceProviderInterface
|
||||
{
|
||||
@@ -40,7 +42,7 @@ class Root implements ControllerProviderInterface, ServiceProviderInterface
|
||||
public function connect(Application $app)
|
||||
{
|
||||
$controllers = $this->createCollection($app);
|
||||
|
||||
$controllers->before([$this, 'redirectOnLogRequests']);
|
||||
$controllers->before('controller.prod:assertAuthenticated');
|
||||
|
||||
$controllers->get('/', 'controller.prod:indexAction')
|
||||
@@ -48,4 +50,31 @@ class Root implements ControllerProviderInterface, ServiceProviderInterface
|
||||
|
||||
return $controllers;
|
||||
}
|
||||
|
||||
public function redirectOnLogRequests(Request $request, PhraseaApplication $app)
|
||||
{
|
||||
if (!$request->query->has('LOG')) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($app->getAuthenticator()->isAuthenticated()) {
|
||||
$app->getAuthenticator()->closeAccount();
|
||||
}
|
||||
|
||||
/** @var Token $token */
|
||||
$token = $app['repo.tokens']->findValidToken($request->query->get('LOG'));
|
||||
|
||||
// actually just type user-relance can access here with token
|
||||
// PHRAS-3694
|
||||
if (null === $token || $token->getType() != TokenManipulator::TYPE_USER_RELANCE) {
|
||||
$app->addFlash('error', $app->trans('The URL you used is out of date, please login'));
|
||||
|
||||
return $app->redirectPath('homepage');
|
||||
}
|
||||
|
||||
/** @var Token $token */
|
||||
$app->getAuthenticator()->openAccount($token->getUser());
|
||||
|
||||
return $app->redirectPath('prod');
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user