Merge branch 'release/3.0.1'

Release/3.0.1

composer.json

@@ -4,7 +4,7 @@
     "type": "drupal-module",
     "license": "GPL-2.0-or-later",
     "require": {
-        "dpc-sdp/tide_core": "^3.0.0",
+        "dpc-sdp/tide_core": "^3.0.1",
         "dpc-sdp/tide_event": "^3.0.0",
         "dpc-sdp/tide_landing_page": "^3.0.0",
         "dpc-sdp/tide_media": "^3.0.0",

src/Auth/AuthProvider.php

@@ -2,7 +2,11 @@
 
 namespace Drupal\tide_authenticated_content\Auth;
 
+use Drupal\jwt\Authentication\Event\JwtAuthEvents;
+use Drupal\jwt\Authentication\Event\JwtAuthValidateEvent;
+use Drupal\jwt\Authentication\Event\JwtAuthValidEvent;
 use Drupal\jwt\Authentication\Provider\JwtAuth;
+use Drupal\jwt\Transcoder\JwtDecodeException;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -41,4 +45,36 @@ public static function getJwtFromRequest(Request $request) {
     return $matches[1];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function authenticate(Request $request) {
+    $raw_jwt = self::getJwtFromRequest($request);
+
+    // Decode JWT and validate signature.
+    try {
+      $jwt = $this->transcoder->decode($raw_jwt);
+    }
+    catch (JwtDecodeException $e) {
+      return NULL;
+    }
+
+    $validate = new JwtAuthValidateEvent($jwt);
+    // Signature is validated, but allow modules to do additional validation.
+    $this->eventDispatcher->dispatch(JwtAuthEvents::VALIDATE, $validate);
+    if (!$validate->isValid()) {
+      return NULL;
+    }
+
+    $valid = new JwtAuthValidEvent($jwt);
+    $this->eventDispatcher->dispatch(JwtAuthEvents::VALID, $valid);
+    $user = $valid->getUser();
+
+    if (!$user) {
+      return NULL;
+    }
+
+    return $user;
+  }
+
 }

src/Controller/AuthenticatedContentController.php

@@ -80,7 +80,7 @@ public static function create(
     ContainerInterface $container
   ) {
     return new static($container,
-      $container->get('entity.manager')
+      $container->get('entity_type.manager')
         ->getStorage('user'),
       $container->get('module_handler'));
   }