Merge pull request #70 from silverDuy/remove-last-slashes-for-endpoint

Added EndPointTrait for supporting to remove the unnecessary last slashes of an endpoint

Author: vienthuong

CHANGELOG.md

@@ -6,6 +6,9 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ### 2.0.0
 - Updated the entity-schema for Shopware version 6.5
+- Added EndPointTrait for supporting to remove the unnecessary last slashes of an endpoint
+- Updated `AdminAuthenticator` and `Context` to remove the unnecessary last slashes of the provided endpoint
+- [Fix Call to a member function getSource() on null](https://github.com/vienthuong/shopware-php-sdk/issues/65)
 
 ### 1.7.3
 - [Fix Schema caching](https://github.com/vienthuong/shopware-php-sdk/pull/62)

src/Client/AdminAuthenticator.php

@@ -10,11 +10,13 @@
 use Vin\ShopwareSdk\Client\GrantType\PasswordGrantType;
 use Vin\ShopwareSdk\Client\GrantType\RefreshTokenGrantType;
 use Vin\ShopwareSdk\Data\AccessToken;
+use Vin\ShopwareSdk\Data\EndPointTrait;
 use Vin\ShopwareSdk\Exception\AuthorizationFailedException;
 
 class AdminAuthenticator
 {
     use CreateClientTrait;
+    use EndPointTrait;
 
     public const OAUTH_TOKEN_ENDPOINT = '/api/oauth/token';
 
@@ -43,7 +45,7 @@ public function __construct(GrantType $grantType, string $endpoint, array $confi
 
         $this->httpClient = $this->httpClient ?? $this->createHttpClient($this->config);
         $this->grantType = $grantType;
-        $this->endpoint = $endpoint;
+        $this->endpoint = $this->removeLastSlashes($endpoint);
     }
 
     public function fetchAccessToken(): AccessToken

src/Data/Context.php

@@ -4,6 +4,8 @@
 
 class Context
 {
+    use EndPointTrait;
+
     public string $languageId = Defaults::LANGUAGE_SYSTEM;
 
     public string $currencyId = Defaults::CURRENCY;
@@ -36,7 +38,7 @@ public function __construct(
         $this->compatibility = $compatibility;
         $this->inheritance = $inheritance;
         $this->accessToken = $accessToken;
-        $this->apiEndpoint = $apiEndpoint;
+        $this->apiEndpoint = $this->removeLastSlashes($apiEndpoint);
         $this->additionalHeaders = $additionalHeaders;
     }
 }

src/Data/EndPointTrait.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace Vin\ShopwareSdk\Data;
+
+trait EndPointTrait
+{
+    private function removeLastSlashes(string $endpoint): string
+    {
+        while (substr($endpoint, -1) === '/') {
+            $endpoint = rtrim($endpoint, '/');
+        }
+
+        return $endpoint;
+    }
+}

tests/AdminAuthenticatorTest.php

@@ -102,4 +102,17 @@ public function testTokenExpired(): void
 
         static::assertFalse($accessToken->isExpired());
     }
+
+    public function testRemoveLastSlashesFromEndPoint(): void
+    {
+        $grantType = GrantType::createFromConfig([
+            'grant_type' => GrantType::PASSWORD,
+            'username' => 'admin',
+            'password' => 'shopware'
+        ]);
+
+        $this->authenticator = new AdminAuthenticator($grantType, 'http://test.com///////');
+
+        static::assertEquals('http://test.com', $this->authenticator->getEndpoint());
+    }
 }