Merge pull request #373 from lilHermit/feature/callback-result-support

Feature/callback Result support
cakephp · May 9, 2020 · b5a1779 · b5a1779
2 parents 26f552a + e359dd0
commit b5a1779
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/Identifier/CallbackIdentifier.php b/src/Identifier/CallbackIdentifier.php
@@ -17,6 +17,7 @@
 namespace Authentication\Identifier;
 
 use ArrayAccess;
+use Authentication\Authenticator\Result;
 use InvalidArgumentException;
 use RuntimeException;
 
@@ -70,6 +71,11 @@ public function identify(array $data)
         $callback = $this->getConfig('callback');
 
         $result = $callback($data);
+        if ($result instanceof Result) {
+            $this->_errors = $result->getErrors();
+
+            return $result->getData();
+        }
         if ($result === null || $result instanceof ArrayAccess) {
             return $result;
         }

diff --git a/tests/TestCase/Identifier/CallbackIdentifierTest.php b/tests/TestCase/Identifier/CallbackIdentifierTest.php
@@ -17,6 +17,7 @@
 namespace Authentication\Test\TestCase\Identifier;
 
 use ArrayAccess;
+use Authentication\Authenticator\Result;
 use Authentication\Identifier\CallbackIdentifier;
 use Authentication\Test\TestCase\AuthenticationTestCase as TestCase;
 use Cake\ORM\Entity;
@@ -113,4 +114,31 @@ public function testInvalidReturnValue()
         ]);
         $identifier->identify([]);
     }
+
+    /**
+     * testResultReturn
+     *
+     * @return void
+     */
+    public function testResultReturn()
+    {
+        $identifier = new CallbackIdentifier([
+            'callback' => function ($data) {
+                if (isset($data['username']) && $data['username'] === 'florian') {
+                    return new Result(new Entity($data), Result::SUCCESS);
+                }
+
+                return new Result(null, Result::FAILURE_OTHER, ['message' => 'Access denied by 3rd party API']);
+            },
+        ]);
+        $result = $identifier->identify(['username' => 'florian']);
+
+        $this->assertInstanceOf(Entity::class, $result);
+        $this->assertEquals('florian', $result->username);
+
+        $result = $identifier->identify(['username' => 'larry']);
+
+        $this->assertNull($result);
+        $this->assertEquals(['message' => 'Access denied by 3rd party API'], $identifier->getErrors());
+    }
 }