mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Fix merge conflict in AuthorizationManager
This commit is contained in:
commit
c648a560cc
@ -12,6 +12,7 @@ declare(strict_types=1);
|
|||||||
namespace Chill\WopiBundle\Service\Wopi;
|
namespace Chill\WopiBundle\Service\Wopi;
|
||||||
|
|
||||||
use ChampsLibres\WopiLib\Contract\Entity\Document;
|
use ChampsLibres\WopiLib\Contract\Entity\Document;
|
||||||
|
|
||||||
use Chill\DocStoreBundle\Repository\StoredObjectRepository;
|
use Chill\DocStoreBundle\Repository\StoredObjectRepository;
|
||||||
use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
|
use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
|
||||||
use Chill\MainBundle\Entity\User;
|
use Chill\MainBundle\Entity\User;
|
||||||
@ -68,7 +69,6 @@ class AuthorizationManager implements \ChampsLibres\WopiBundle\Contracts\Authori
|
|||||||
public function userCanPresent(string $accessToken, Document $document, RequestInterface $request): bool
|
public function userCanPresent(string $accessToken, Document $document, RequestInterface $request): bool
|
||||||
{
|
{
|
||||||
$storedObject = $this->getRelatedStoredObject($document);
|
$storedObject = $this->getRelatedStoredObject($document);
|
||||||
|
|
||||||
if ($this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
|
if ($this->security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)) {
|
||||||
|
|
||||||
return $this->isTokenValid($accessToken, $document, $request);
|
return $this->isTokenValid($accessToken, $document, $request);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user