Merge pull request #32 from oat-sa/fix/TR-890/fix_incorrect_score_url

fix: buildEndpointUrl remove too much when trimming line item URL
oat-sa · Apr 23, 2021 · 0f976dc · 0f976dc
2 parents 2d0c7c4 + 3c91c5c
commit 0f976dc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.6.1
+-----
+
+* Fixed buildEndpointUrl of ScoreServiceClient when trimming line item URL provided by AGS claims
+
 0.6.0
 -----
 

diff --git a/src/Service/Score/Client/ScoreServiceClient.php b/src/Service/Score/Client/ScoreServiceClient.php
@@ -129,9 +129,13 @@ public function publish(
     private function buildEndpointUrl(string $lineItemUrl): string
     {
         $parsedUrl = parse_url($lineItemUrl);
-
         $parsedUrl['path'] = rtrim($parsedUrl['path'], '/');
-        $parsedUrl['path'] = rtrim($parsedUrl['path'], '/lineitem');
+
+        $endStringToRemove = '/lineitem';
+
+        if (str_ends_with($parsedUrl['path'], $endStringToRemove)) {
+            $parsedUrl['path'] = substr($parsedUrl['path'], 0, -1 * strlen($endStringToRemove));
+        }
 
         $username = $parsedUrl['user'] ?? '';
         $password = isset($parsedUrl['pass']) ? ':' . $parsedUrl['pass']  : '';