ODM v2 support

Author: scottjoplin

DependencyInjection/Configuration.php

@@ -38,6 +38,10 @@ public function getConfigTreeBuilder()
                     ->values(['orm', 'odm'])
                     ->defaultValue('orm')
                 ->end()
+                ->enumNode('odm_version')
+                    ->values([1, 2])
+                    ->defaultValue(1)
+                ->end()
                 ->integerNode('token_lifetime')
                     ->defaultValue('864000') //10 days
                 ->end()

DependencyInjection/TokenAuthenticationExtension.php

@@ -28,6 +28,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('token_authentication.error_codes', $config['error_codes']);
         $container->setParameter('token_authentication.token_field', $config['token_field']);
         $container->setParameter('token_authentication.platform', $config['platform']);
+        $container->setParameter('token_authentication.odm_version', $config['odm_version']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');

Resources/config/services.yml

@@ -15,7 +15,7 @@ services:
 
     access_token_helper:
         class: Youshido\TokenAuthenticationBundle\Service\Helper\AccessTokenHelper
-        arguments: ["@universal_object_manager", "%token_authentication.token_lifetime%", '%token_authentication.platform%']
+        arguments: ["@universal_object_manager", "%token_authentication.token_lifetime%", '%token_authentication.platform%', '%token_authentication.odm_version%']
 
     token_exception_listener:
         class: Youshido\TokenAuthenticationBundle\Service\Listener\ExceptionListener

Service/Helper/AccessTokenHelper.php

@@ -8,7 +8,6 @@
 namespace Youshido\TokenAuthenticationBundle\Service\Helper;
 
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Youshido\TokenAuthenticationBundle\Model\AccessTokenInterface;
 use Youshido\TokenAuthenticationBundle\Service\UniversalObjectManager;
 
@@ -23,11 +22,15 @@ class AccessTokenHelper
     /** @var string */
     private $platform;
 
-    public function __construct($om, $tokenLifetime, $platform)
+    /** @var int */
+    private $odmVersion;
+
+    public function __construct($om, $tokenLifetime, $platform, $odmVersion)
     {
         $this->om            = $om;
         $this->tokenLifetime = $tokenLifetime;
         $this->platform      = $platform;
+        $this->odmVersion    = $odmVersion;
     }
 
     /**
@@ -93,7 +96,16 @@ public function expireToken(AccessTokenInterface $accessToken)
     public function findTokenByModelId($id)
     {
         if ($this->platform === UniversalObjectManager::PLATFORM_ODM) {
-            $id = new \MongoId($id);
+            switch ($this->odmVersion) {
+                case 1:
+                    $id = new \MongoId($id);
+                    break;
+                case 2:
+                    $id = new \MongoDB\BSON\ObjectId($id);
+                    break;
+                default:
+                    throw new \UnexpectedValueException('Unknown ODM version');
+            }
         }
 
         return $this->om->getRepository('TokenAuthenticationBundle:AccessToken')->findOneBy(['modelId' => $id]);