fix-external-url-handling (#452)

knpuniversity · Oct 2, 2024 · c38ca88 · c38ca88
1 parent ca2048e
commit c38ca88
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/DependencyInjection/ProviderFactory.php b/src/DependencyInjection/ProviderFactory.php
@@ -37,8 +37,9 @@ public function __construct(UrlGeneratorInterface $generator)
     public function createProvider($class, array $options, ?string $redirectUri = null, array $redirectParams = [], array $collaborators = [])
     {
         if (null !== $redirectUri) {
-            $redirectUri = $this->generator
-                ->generate($redirectUri, $redirectParams, UrlGeneratorInterface::ABSOLUTE_URL);
+            $redirectUri = filter_var($redirectUri, \FILTER_VALIDATE_URL)
+                ? $redirectUri
+                : $this->generator->generate($redirectUri, $redirectParams, UrlGeneratorInterface::ABSOLUTE_URL);
 
             $options['redirectUri'] = $redirectUri;
         }

diff --git a/tests/DependencyInjection/ProviderFactoryTest.php b/tests/DependencyInjection/ProviderFactoryTest.php
@@ -45,6 +45,21 @@ public function testShouldCreateProviderWithNullRedirectUrl()
         $this->assertEquals([], $result->getCollaborators());
     }
 
+    public function testShouldCreateProviderWithExternalRedirectUrl()
+    {
+        $mockGenerator = $this->getMockBuilder(UrlGeneratorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockGenerator->expects($this->never())->method('generate');
+
+        $testProviderFactory = new ProviderFactory($mockGenerator);
+        $externalRedirectUri = 'https://external-site.com/callback';
+        $result = $testProviderFactory->createProvider(MockProvider::class, [], $externalRedirectUri);
+
+        $this->assertInstanceOf(MockProvider::class, $result);
+        $this->assertEquals(['redirectUri' => $externalRedirectUri], $result->getOptions());
+    }
+
     private function getMockGenerator($generateReturn)
     {
         $mockGenerator = $this->getMockBuilder(UrlGeneratorInterface::class)->disableOriginalConstructor()->getMock();