Allow nonce owner to be null.

.gitignore

@@ -1,2 +1,3 @@
 build/
 vendor/
+.idea

config/doctrine/Roave.NonceUtility.Entity.NonceEntity.dcm.xml

@@ -19,7 +19,7 @@
         <field name="consumedAt" type="datetime" nullable="true"/>
 
         <many-to-one target-entity="Roave\NonceUtility\Stdlib\NonceOwnerInterface" field="owner">
-            <join-column on-delete="CASCADE"/>
+            <join-column on-delete="CASCADE" nullable="true"/>
         </many-to-one>
     </entity>
 </doctrine-mapping>

src/Roave/NonceUtility/Entity/NonceEntity.php

@@ -192,7 +192,7 @@ public function getOwner()
     /**
      * @param NonceOwnerInterface $owner
      */
-    public function setOwner(NonceOwnerInterface $owner)
+    public function setOwner(NonceOwnerInterface $owner = null)
     {
         $this->owner = $owner;
     }

src/Roave/NonceUtility/Repository/NonceRepository.php

@@ -71,6 +71,15 @@ public function get(NonceOwnerInterface $owner, $nonce, $namespace = 'default')
         ]);
     }
 
+    public function getUnassociated($nonce, $namespace = 'default')
+    {
+        return $this->objectRepository->findOneBy([
+            'owner'     => null,
+            'nonce'     => $nonce,
+            'namespace' => $namespace
+        ]);
+    }
+
     /**
      * {@Inheritdoc}
      */
@@ -79,6 +88,11 @@ public function has(NonceOwnerInterface $owner, $nonce, $namespace = 'default')
         return $this->get($owner, $nonce, $namespace) !== null;
     }
 
+    public function hasUnassociated($nonce, $namespace = 'default')
+    {
+        return $this->getUnassociated($nonce, $namespace);
+    }
+
     /**
      * {@Inheritdoc}
      */

src/Roave/NonceUtility/Repository/NonceRepositoryInterface.php

@@ -55,6 +55,16 @@ interface NonceRepositoryInterface
      */
     public function get(NonceOwnerInterface $owner, $nonce, $namespace = 'default');
 
+    /**
+     * Retrieve a nonce entity without an associated owner by token and namespace
+     *
+     * @param $nonce
+     * @param string $namespace
+     *
+     * @return NonceEntity|null
+     */
+    public function getUnassociated($nonce, $namespace = 'default');
+
     /**
      * Check if a token exists within the given namespace
      *
@@ -66,6 +76,16 @@ public function get(NonceOwnerInterface $owner, $nonce, $namespace = 'default');
      */
     public function has(NonceOwnerInterface $owner, $nonce, $namespace = 'default');
 
+    /**
+     * Check if a nonce entity without an associated owner exists within the given namespace
+     *
+     * @param $nonce
+     * @param string $namespace
+     *
+     * @return bool
+     */
+    public function hasUnassociated($nonce, $namespace = 'default');
+
     /**
      * Remove all the expired tokens
      *

src/Roave/NonceUtility/Service/NonceService.php

@@ -76,18 +76,20 @@ public function __construct(ObjectManager $objectManager, NonceRepositoryInterfa
     }
 
     /**
-     * {@Inheritdoc}
+     * Creates and persists a nonce entity
+     *
+     * @param $nonce
+     * @param NonceOwnerInterface|null $owner
+     * @param DateInterval|null $expiresIn
+     * @param string $namespace
+     * @return NonceEntity
      */
-    public function createNonce(
-        NonceOwnerInterface $owner,
-        $namespace = 'default',
+    private function _create(
+        $nonce,
+        NonceOwnerInterface $owner = null,
         DateInterval $expiresIn = null,
-        $length = 10
+        $namespace = 'default'
     ) {
-        do {
-            $nonce = strtr(Rand::getString($length), '+/', '-_');
-        } while ($this->repository->has($owner, $nonce, $namespace));
-
         $entity = new NonceEntity();
         $entity->setOwner($owner);
         $entity->setNonce($nonce);
@@ -107,16 +109,17 @@ public function createNonce(
         return $entity;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function consume(
-        NonceOwnerInterface $owner,
+    private function _consume(
         $nonce,
+        NonceOwnerInterface $owner = null,
         $namespace = 'default',
         RequestInterface $request = null
     ) {
-        $nonce = $this->repository->get($owner, $nonce, $namespace);
+        if ($owner) {
+            $nonce = $this->repository->get($owner, $nonce, $namespace);
+        } else {
+            $nonce = $this->repository->getUnassociated($nonce, $namespace);
+        }
 
         if (! $nonce) {
             throw new Exception\NonceNotFoundException;
@@ -146,4 +149,52 @@ public function consume(
 
         $this->objectManager->flush();
     }
+
+    /**
+     * {@Inheritdoc}
+     */
+    public function createNonce(
+        NonceOwnerInterface $owner,
+        $namespace = 'default',
+        DateInterval $expiresIn = null,
+        $length = 10
+    ) {
+        do {
+            $nonce = strtr(Rand::getString($length), '+/', '-_');
+        } while ($this->repository->has($owner, $nonce, $namespace));
+
+        return $this->_create($owner, $expiresIn, $namespace);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createUnassociatedNonce($namespace = 'default', DateInterval $expiresIn = null, $length = 10)
+    {
+        do {
+            $nonce = strtr(Rand::getString($length), '+/', '-_');
+        } while ($this->repository->hasUnassociated($nonce, $namespace));
+
+        return $this->_create($nonce, null, $expiresIn, $namespace);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function consume(
+        NonceOwnerInterface $owner,
+        $nonce,
+        $namespace = 'default',
+        RequestInterface $request = null
+    ) {
+        $this->_consume($nonce, $owner, $namespace, $request);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function consumeUnassociated($nonce, $namespace = 'default', RequestInterface $request = null)
+    {
+        $this->_consume($nonce, null, $namespace, $request);
+    }
 }

src/Roave/NonceUtility/Service/NonceServiceInterface.php

@@ -64,6 +64,17 @@ public function createNonce(
         $length = 10
     );
 
+    /**
+     * Create a new nonce without an associated owner
+     *
+     * @param string $namespace
+     * @param DateInterval|null $expiresIn
+     * @param int $length
+     *
+     * @return NonceEntity
+     */
+    public function createUnassociatedNonce($namespace = 'default', DateInterval $expiresIn = null, $length = 10);
+
     /**
      * Consume a nonce
      *
@@ -84,4 +95,15 @@ public function consume(
         $namespace = 'default',
         RequestInterface $request = null
     );
+
+    /**
+     * Consume a nonce without an associated owner
+     *
+     * @param $nonce
+     * @param string $namespace
+     * @param RequestInterface|null $request
+     *
+     * @return void
+     */
+    public function consumeUnassociated($nonce ,$namespace = 'default', RequestInterface $request = null);
 }