Merge pull request #127 from Payum/token-factory-fix-absolute-url-han…

…dling [security] GenericTokenFactory did not handle afterPath correctly, when ...
Payum · Apr 10, 2014 · 6ba94e7 · 6ba94e7
2 parents 6f55f10 + 0f4ebc7
commit 6ba94e7
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Security/AbstractGenericTokenFactory.php b/Security/AbstractGenericTokenFactory.php
@@ -66,7 +66,15 @@ public function createToken($paymentName, $model, $targetPath, array $targetPara
             $token->setTargetUrl($this->generateUrl($targetPath, $targetParameters));
         }
 
-        if ($afterPath) {
+        if ($afterPath && 0 === strpos($afterPath, 'http')) {
+            if (false !== strpos($afterPath, '?')) {
+                $afterPath .= '&'.http_build_query($afterParameters);
+            } else {
+                $afterPath .= '?'.http_build_query($afterParameters);
+            }
+
+            $token->setAfterUrl($afterPath);
+        } elseif ($afterPath) {
             $token->setAfterUrl($this->generateUrl($afterPath, $afterParameters));
         }