Browse Source

Merge branch 'develop'

master
Guillaume 3 years ago
parent
commit
f266dfb4d0
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      EventSubscriber/User/UserRolesEventSubscriber.php

+ 1
- 1
EventSubscriber/User/UserRolesEventSubscriber.php View File

@@ -63,7 +63,7 @@ class UserRolesEventSubscriber implements EventSubscriberInterface

public function setUserRoles(Request $request): bool
{
if ($this->tokenStorage && $this->tokenStorage->getToken()) {
if (!$this->merchantResolver->isOutOfMerchant() && $this->tokenStorage && $this->tokenStorage->getToken()) {
$token = $this->tokenStorage->getToken();
$sessionUser = $token->getUser();


Loading…
Cancel
Save