Update PersonifyAuthController.php to not grant access to Cancelled/Expired members (master)

modules/openy_gc_auth/modules/openy_gc_auth_personify/src/Controller/PersonifyAuthController.php

@@ -2,10 +2,12 @@
 
 namespace Drupal\openy_gc_auth_personify\Controller;
 
+use Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Logger\LoggerChannelFactory;
 use Drupal\Core\Routing\TrustedRedirectResponse;
 use Drupal\Core\Url;
+use Drupal\openy_gc_auth\Event\GCUserLogoutEvent;
 use Drupal\personify\PersonifyClient;
 use Drupal\personify\PersonifySSO;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -63,6 +65,13 @@ class PersonifyAuthController extends ControllerBase {
    */
   protected $gcUserAuthorizer;
 
+  /**
+   * Event Dispatcher.
+   *
+   * @var \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
+   */
+  protected $eventDispatcher;
+
   /**
    * PersonifyAuthController constructor.
    *
@@ -78,21 +87,25 @@ class PersonifyAuthController extends ControllerBase {
    *   The messenger.
    * @param \Drupal\openy_gc_auth\GCUserAuthorizer $gcUserAuthorizer
    *   The Gated User Authorizer.
+   * @param \Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher $eventDispatcher
+   *   Event Dispatcher.
    */
   public function __construct(
     PersonifySSO $personifySSO,
     PersonifyClient $personifyClient,
     ConfigFactoryInterface $configFactory,
     LoggerChannelFactory $loggerChannelFactory,
     MessengerInterface $messenger,
-    GCUserAuthorizer $gcUserAuthorizer
+    GCUserAuthorizer $gcUserAuthorizer,
+    ContainerAwareEventDispatcher $eventDispatcher
   ) {
     $this->personifySSO = $personifySSO;
     $this->personifyClient = $personifyClient;
     $this->configFactory = $configFactory;
     $this->logger = $loggerChannelFactory->get('openy_gc_auth_personify');
     $this->messenger = $messenger;
     $this->gcUserAuthorizer = $gcUserAuthorizer;
+    $this->eventDispatcher = $eventDispatcher;
   }
 
   /**
@@ -105,7 +118,8 @@ public static function create(ContainerInterface $container) {
       $container->get('config.factory'),
       $container->get('logger.factory'),
       $container->get('messenger'),
-      $container->get('openy_gc_auth.user_authorizer')
+      $container->get('openy_gc_auth.user_authorizer'),
+      $container->get('event_dispatcher')
     );
   }
 
@@ -135,8 +149,9 @@ public function auth(Request $request) {
           ]);
         }
         else {
-          user_cookie_delete('personify_authorized');
-          user_cookie_delete('personify_time');
+          $request->cookies->set('Drupal_visitor_personify_authorized', $token);
+          $event = new GCUserLogoutEvent();
+          $this->eventDispatcher->dispatch(GCUserLogoutEvent::EVENT_NAME, $event);
 
           $path = URL::fromUserInput(
             $this->configFactory->get('openy_gated_content.settings')->get('virtual_y_login_url'),