Merge 621ecce into 3733c92

Rebilly · Aug 28, 2023 · fea4020 · fea4020
2 parents 3733c92 + 621ecce
commit fea4020
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,13 @@ Security - in case of vulnerabilities.
 
 _TBD_
 
+## [2.24.0] 2023-08-28
+
+### Removed
+
+- [x] Removed `UserService` methods: `signin`, `signup`, `activate`
+- [x] Removed `SessionService` service
+
 ## [2.23.1] 2023-07-20
 
 ### Fixed

diff --git a/src/Client.php b/src/Client.php
@@ -65,7 +65,6 @@
  * @method Services\OrganizationService organizations()
  * @method Services\CustomFieldService customFields()
  * @method Services\GatewayAccountService gatewayAccounts()
- * @method Services\SessionService sessions()
  * @method Services\UserService users()
  * @method Services\ApiTrackingService apiTracking()
  * @method Services\ShippingRateService shippingRates()
@@ -105,7 +104,7 @@ final class Client
      */
     public const CURRENT_VERSION = 'v2.1';
 
-    public const SDK_VERSION = '2.23.1';
+    public const SDK_VERSION = '2.24.0';
 
     private static $services = [
         'authenticationOptions' => Services\AuthenticationOptionsService::class,
@@ -136,7 +135,6 @@ final class Client
         'organizations' => Services\OrganizationService::class,
         'customFields' => Services\CustomFieldService::class,
         'gatewayAccounts' => Services\GatewayAccountService::class,
-        'sessions' => Services\SessionService::class,
         'users' => Services\UserService::class,
         'apiTracking' => Services\ApiTrackingService::class,
         'apiKeys' => Services\ApiKeyService::class,

diff --git a/src/Services/SessionService.php b/src/Services/SessionService.php
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
@@ -30,30 +30,6 @@
  */
 final class UserService extends Service
 {
-    /**
-     * @param array|JsonSerializable|Login $data
-     *
-     * @throws DataValidationException if input data is not valid
-     *
-     * @return Session
-     */
-    public function signin($data)
-    {
-        return $this->client()->post($data, 'signin');
-    }
-
-    /**
-     * @param array|JsonSerializable|Signup $data
-     *
-     * @throws DataValidationException if input data is not valid
-     *
-     * @return User
-     */
-    public function signup($data)
-    {
-        return $this->client()->post($data, 'signup');
-    }
-
     /**
      * @param array|JsonSerializable|ForgotPassword $data
      *
@@ -116,17 +92,6 @@ public function create($data, $userId = null)
         return $this->client()->post($data, 'users');
     }
 
-    /**
-     * @param string $token
-     *
-     * @throws DataValidationException The token is not valid
-     *
-     * @return User
-     */
-    public function activate($token)
-    {
-        return $this->client()->post([], 'activation/{token}', ['token' => $token]);
-    }
 
     /**
      * @param string $userId

diff --git a/tests/Api/ServiceTest.php b/tests/Api/ServiceTest.php
@@ -755,41 +755,6 @@ public function userService()
         $service = $client->users();
         $result = $service->load('userId');
         self::assertInstanceOf(Entities\User::class, $result);
-
-        $handler = $this->createMock(CurlHandler::class);
-        $handler
-            ->expects(self::any())
-            ->method('__invoke')
-            ->willReturn($client->createResponse()->withHeader('Location', 'users/signup'));
-        $client = new Client([
-            'apiKey' => 'QWERTY',
-            'httpHandler' => $handler,
-        ]);
-        $service = $client->users();
-        $result = $service->signup([]);
-        self::assertInstanceOf(Entities\User::class, $result);
-
-        $handler = $this->createMock(CurlHandler::class);
-        $handler
-            ->expects(self::any())
-            ->method('__invoke')
-            ->willReturn($client->createResponse()->withHeader('Location', 'users/signin'));
-        $client = new Client([
-            'apiKey' => 'QWERTY',
-            'httpHandler' => $handler,
-        ]);
-        $service = $client->users();
-        $result = $service->signin([]);
-        self::assertInstanceOf(Entities\User::class, $result);
-
-        $handler = $this->createMock(CurlHandler::class);
-        $handler
-            ->expects(self::any())
-            ->method('__invoke')
-            ->willReturn($client->createResponse()->withHeader('Location', 'users/userId'));
-
-        $result = $service->activate('token');
-        self::assertInstanceOf(Entities\User::class, $result);
     }
 
     /**
@@ -1265,11 +1230,6 @@ public function provideServiceClasses()
                 Services\PayPalAccountService::class,
                 Entities\PayPalAccount::class,
             ],
-            [
-                'sessions',
-                Services\SessionService::class,
-                Entities\Session::class,
-            ],
             [
                 'users',
                 Services\UserService::class,