Remove uri references to string returns

src/Jwt/JwtOAuthCallbackHandler.php

@@ -24,20 +24,32 @@ public function __construct(
         $this->userService = $userService;
     }
 
-    public function handle(AccessToken $accessToken, UriInterface $destination): ResponseInterface
+    public function handle(AccessToken $accessToken, string $destination): ResponseInterface
     {
         $claims = $this->userService
             ->getUserClaims($accessToken)
             ->toArray();
 
         $jwt = $this->encoderService->encode($claims);
 
-        $q = $destination->getQuery();
-
-        $q .= ($q?'&':'') . 'jwt=' . $jwt;
+        $destination = $this->addJwtTokenToRedirectUri($destination, $jwt);
 
         return new RedirectResponse(
-            (string) $destination->withQuery($q)
+            $destination
         );
     }
+
+    private function addJwtTokenToRedirectUri(string $destination, \Lcobucci\JWT\Token $jwt)
+    {
+        $urlParts = parse_url($destination);
+
+        if (empty($urlParts['query'])) {
+            $newQuery = 'jwt=' . $jwt;
+        } else {
+            $newQuery = $urlParts['query'] . '&jwt=' . $jwt;
+        }
+
+        $destination = str_replace($urlParts['query'], $newQuery, $destination);
+        return $destination;
+    }
 }

src/OAuth/OAuthCallbackHandlerInterface.php

@@ -8,5 +8,5 @@
 
 interface OAuthCallbackHandlerInterface
 {
-    public function handle(AccessToken $accessToken, UriInterface $destination): ResponseInterface;
+    public function handle(AccessToken $accessToken, string $destination): ResponseInterface;
 }

src/OAuth/OAuthController.php

@@ -34,7 +34,7 @@ public function __construct(
     public function connect(ServerRequestInterface $request): ResponseInterface
     {
         try {
-            $callbackUrl = (string) $this->oAuthUrlHelper->createCallbackUri($request);
+            $callbackUrl = $this->oAuthUrlHelper->createCallbackUri($request);
         } catch (InvalidArgumentException $e) {
             return ResponseFactory::create(400, $e->getMessage());
         }
@@ -53,7 +53,7 @@ public function connect(ServerRequestInterface $request): ResponseInterface
     public function register(ServerRequestInterface $request): ResponseInterface
     {
         try {
-            $callbackUrl = (string) $this->oAuthUrlHelper->createCallbackUri($request);
+            $callbackUrl = $this->oAuthUrlHelper->createCallbackUri($request);
         } catch (InvalidArgumentException $e) {
             return ResponseFactory::create(400, $e->getMessage());
         }

src/OAuth/OAuthUrlHelper.php

@@ -1,11 +1,11 @@
 <?php
 namespace CultuurNet\UDB3\JwtProvider\OAuth;
 
-use GuzzleHttp\Psr7\Uri;
 use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
 use CultuurNet\Auth\TokenCredentials as RequestToken;
+use Slim\Psr7\Uri;
 
 class OAuthUrlHelper
 {
@@ -24,14 +24,12 @@ public function __construct(
         $this->authorizationPath = trim($authorizationPath, '/');
     }
 
-    public function createCallbackUri(ServerRequestInterface $request): UriInterface
+    public function createCallbackUri(ServerRequestInterface $request): string
     {
         $baseUrl = $this->getBaseUrlFromRequest($request);
-        $query = http_build_query([self::DESTINATION => (string) $this->getDestinationUri($request)]);
+        $query = http_build_query([self::DESTINATION => $this->getDestinationUri($request)]);
 
-        $url = $baseUrl . '/' . $this->authorizationPath . '?' . $query;
-
-        return new Uri($url);
+        return $baseUrl . '/' . $this->authorizationPath . '?' . $query;
     }
 
     public function hasValidRequestToken(
@@ -51,13 +49,13 @@ public function getOAuthVerifier(ServerRequestInterface $request): ?string
         $verifier = $request->getQueryParams()[self::OAUTH_VERIFIER] ?? null;
 
         if ($verifier === null) {
-            return $verifier;
+            return null;
         }
 
         return (string) $verifier;
     }
 
-    public function getDestinationUri(ServerRequestInterface $request): UriInterface
+    public function getDestinationUri(ServerRequestInterface $request): string
     {
         $destination = $request->getQueryParams()[self::DESTINATION] ?? null;
 
@@ -67,7 +65,7 @@ public function getDestinationUri(ServerRequestInterface $request): UriInterface
             );
         }
 
-        return new Uri($destination);
+        return $destination;
     }
 
     private function getBaseUrlFromRequest(ServerRequestInterface $request): string

tests/Jwt/JwtOAuthCallbackHandlerTest.php

@@ -2,15 +2,13 @@
 
 namespace CultuurNet\UDB3\JwtProvider\Jwt;
 
-use PHPUnit_Framework_MockObject_MockObject;
 use PHPUnit\Framework\MockObject\MockObject;
 use CultuurNet\Auth\TokenCredentials;
 use CultuurNet\Auth\User as AccessToken;
 use CultuurNet\UDB3\Jwt\JwtEncoderServiceInterface;
 use CultuurNet\UDB3\JwtProvider\Http\RedirectResponse;
 use CultuurNet\UDB3\JwtProvider\User\UserClaims;
 use CultuurNet\UDB3\JwtProvider\User\UserServiceInterface;
-use GuzzleHttp\Psr7\Uri;
 use Lcobucci\JWT\Signature;
 use Lcobucci\JWT\Token as Jwt;
 use PHPUnit\Framework\TestCase;
@@ -57,7 +55,7 @@ public function it_returns_a_redirect_response_to_the_destination_with_a_jwt_as_
             )
         );
 
-        $destination = new Uri('http://bar.com/sub/directory?query=value');
+        $destination = 'http://bar.com/sub/directory?query=value';
 
         $userClaims = new UserClaims(
             $userId,

tests/OAuth/OAuthUrlHelperTest.php

@@ -41,7 +41,7 @@ public function it_creates_callback_uri_from_request(): void
 
         $callbackUri = $this->oAuthUrlHelper->createCallbackUri($request);
 
-        $this->assertEquals($expectedUri, (string) $callbackUri);
+        $this->assertEquals($expectedUri, $callbackUri);
     }
 
     /**