Merge pull request #30 from Saeven/feature/travis-change

Added method to helper, requireIdentity
Saeven · Dec 12, 2017 · c7e864f · c7e864f
2 parents 869b8bc + e0a78ca
commit c7e864f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/bundle/Spec/CirclicalUser/Controller/Plugin/AuthenticationPluginSpec.php b/bundle/Spec/CirclicalUser/Controller/Plugin/AuthenticationPluginSpec.php
@@ -2,6 +2,7 @@
 
 namespace Spec\CirclicalUser\Controller\Plugin;
 
+use CirclicalUser\Exception\UserRequiredException;
 use CirclicalUser\Provider\UserInterface as User;
 use CirclicalUser\Service\AccessService;
 use CirclicalUser\Service\AuthenticationService;
@@ -49,4 +50,16 @@ public function it_creates_users($authenticationService, $newUser)
         $authenticationService->create($newUser, 'userA', '123')->shouldBeCalled();
         $this->create($newUser, 'userA', '123');
     }
+
+    public function it_fails_on_require_when_there_is_no_auth(AuthenticationService $authenticationService)
+    {
+        $authenticationService->getIdentity()->willReturn(null);
+        $this->shouldThrow(UserRequiredException::class)->during('requireIdentity');
+    }
+
+    public function it_succeeds_on_require_when_there_is_auth(AuthenticationService $authenticationService, User $user)
+    {
+        $authenticationService->getIdentity()->willReturn($user);
+        $this->requireIdentity()->shouldBe($user);
+    }
 }
diff --git a/phpspec.yml b/phpspec.yml
@@ -17,5 +17,4 @@ extensions:
      - src
     blacklist:
      - src/CirclicalUser/Mapper
-     - src/CirclicalUser/Entity
      - src/CirclicalUser/Exception
diff --git a/src/CirclicalUser/Controller/Plugin/AuthenticationPlugin.php b/src/CirclicalUser/Controller/Plugin/AuthenticationPlugin.php
@@ -2,6 +2,7 @@
 
 namespace CirclicalUser\Controller\Plugin;
 
+use CirclicalUser\Exception\UserRequiredException;
 use CirclicalUser\Provider\UserInterface as User;
 use CirclicalUser\Service\AccessService;
 use CirclicalUser\Service\AuthenticationService;
@@ -47,6 +48,21 @@ public function getIdentity()
         return $this->authenticationService->getIdentity();
     }
 
+    /**
+     * Get a user identity, or else!
+     * @return User|null
+     * @throws UserRequiredException
+     */
+    public function requireIdentity()
+    {
+        $user = $this->authenticationService->getIdentity();
+        if (!$user) {
+            throw new UserRequiredException();
+        }
+
+        return $user;
+    }
+
     /**
      * Clear identity and reset tokens
      */

diff --git a/src/CirclicalUser/Mapper/UserResetTokenMapper.php b/src/CirclicalUser/Mapper/UserResetTokenMapper.php
@@ -69,12 +69,10 @@ public function invalidateUnusedTokens(AuthenticationRecordInterface $authentica
             ->set('r.status', UserResetTokenInterface::STATUS_INVALID)
             ->where('r.authentication = :authentication')
             ->andWhere('r.status = :status_unused')
-            ->setParameters(
-                [
-                    'authentication' => $authenticationRecord,
-                    'status_unused' => UserResetTokenInterface::STATUS_UNUSED,
-                ]
-            )
+            ->setParameters([
+                'authentication' => $authenticationRecord,
+                'status_unused' => UserResetTokenInterface::STATUS_UNUSED,
+            ])
             ->getQuery();
 
         $query->execute();