Build for version v8.0.0

isu73 · Sep 17, 2021 · d9a3cda · d9a3cda
1 parent d6a689a
commit d9a3cda
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 396 deletions.
diff --git a/Upgrade.md b/Upgrade.md
@@ -1,5 +1,20 @@
 # Upgrade
 
+### 7.2.0 > 8.0.0
+
+#### requestAuthViaTotpWithMobileSupport
+Method has been removed
+
+#### authenticateChannel
+Method has been removed
+
+#### updateChannelStatus
+Method has been removed
+
+#### IntegrationUser
+Field 'push_id' has been removed.
+Field 'has_mobile_user' has been removed.
+
 ### 6.0.0 > 7.0.0
 Main class renamed to `Sdk`.
 Php version requirement increased to `>=5.4`.
@@ -32,4 +47,4 @@ You can do it in Integration edit in [dashboard](https://dashboard.2fas.com).
 
 #### Exceptions
 AESCipher, AESGeneratedKey, AESIVGenerator and Cryptographer methods will 
-throw AesException on openssl failure.
+throw AesException on openssl failure.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Hydrator.php b/src/Hydrator.php
@@ -23,9 +23,7 @@ public function getIntegrationUserFromResponse(ReadKey $keyStorage, Response $re
         $user
             ->setId($data['id'])
             ->setExternalId($data['external_id'])
-            ->setPushId($data['push_id'])
             ->setBackupCodesCount($data['backup_codes_count'])
-            ->setHasMobileUser($data['has_mobile_user'])
             ->setPhoneNumber($cryptographer->decrypt($data['phone_number']))
             ->setEmail($cryptographer->decrypt($data['email']))
             ->setTotpSecret($cryptographer->decrypt($data['totp_secret']));
@@ -50,4 +48,4 @@ public function getAuthenticationFromResponse(Response $response)
             Dates::convertUTCFormatToLocal($data['valid_to'])
         );
     }
-}
+}
diff --git a/src/IntegrationUser.php b/src/IntegrationUser.php
@@ -37,21 +37,11 @@ final class IntegrationUser
      */
     private $totpSecret;
 
-    /**
-     * @var null|string
-     */
-    private $pushId;
-
     /**
      * @var int
      */
     private $backupCodesCount;
 
-    /**
-     * @var bool
-     */
-    private $hasMobileUser;
-
     /**
      * @return string
      */
@@ -169,51 +159,6 @@ public function setTotpSecret($totpSecret)
         return $this;
     }
 
-    /**
-     * @return null|string
-     */
-    public function getPushId()
-    {
-        return $this->pushId;
-    }
-
-    /**
-     * @param null|string $pushId
-     *
-     * @return IntegrationUser
-     */
-    public function setPushId($pushId)
-    {
-        if (null === $pushId || '' === $pushId) {
-            $this->pushId = null;
-            return $this;
-        }
-        $this->pushId = (string) $pushId;
-        return $this;
-    }
-
-    /**
-     * @deprecated
-     *
-     * @return null|string
-     */
-    public function getMobileSecret()
-    {
-        return $this->getPushId();
-    }
-
-    /**
-     * @deprecated
-     *
-     * @param null|string $mobileSecret
-     *
-     * @return IntegrationUser
-     */
-    public function setMobileSecret($mobileSecret)
-    {
-        return $this->setPushId($mobileSecret);
-    }
-
     /**
      * @return int
      */
@@ -237,29 +182,6 @@ public function setBackupCodesCount($backupCodesCount)
         return $this;
     }
 
-    /**
-     * @return bool
-     */
-    public function hasMobileUser()
-    {
-        return $this->hasMobileUser;
-    }
-
-    /**
-     * @param bool $hasMobileUser
-     *
-     * @return $this
-     */
-    public function setHasMobileUser($hasMobileUser)
-    {
-        if (!is_bool($hasMobileUser)) {
-            throw new InvalidArgumentException('Has Mobile User should be a boolean');
-        }
-
-        $this->hasMobileUser = $hasMobileUser;
-        return $this;
-    }
-
     /**
      * @param Cryptographer $cryptographer
      *
@@ -270,10 +192,9 @@ public function getEncryptedDataAsArray(Cryptographer $cryptographer)
         return [
             'id'           => $this->id,
             'external_id'  => $this->externalId,
-            'push_id'      => $this->pushId,
             'phone_number' => $cryptographer->encrypt($this->getPhoneNumber()->phoneNumber()),
             'email'        => $cryptographer->encrypt($this->getEmail()),
             'totp_secret'  => $cryptographer->encrypt($this->getTotpSecret())
         ];
     }
-}
+}
diff --git a/src/MobileSecretGenerator.php b/src/MobileSecretGenerator.php
diff --git a/src/Sdk.php b/src/Sdk.php
@@ -34,7 +34,7 @@ class Sdk
     /**
      * @var string
      */
-    const VERSION = '7.2.0';
+    const VERSION = '8.0.0';
 
     /**
      * @var string
@@ -301,39 +301,6 @@ public function requestAuthViaTotp($secret)
         throw $response->getError();
     }
 
-    /**
-     * @param string $secret
-     * @param string $pushId
-     * @param string $sessionId
-     * @param string $browserVersion
-     *
-     * @return Authentication
-     *
-     * @throws AuthorizationException
-     * @throws InvalidDateException
-     * @throws ValidationException
-     * @throws Exception
-     */
-    public function requestAuthViaTotpWithMobileSupport($secret, $pushId, $sessionId, $browserVersion)
-    {
-        $response = $this->call(
-            'POST',
-            $this->createEndpoint('v3/auth/totp/mobile'),
-            [
-                'totp_secret'     => (string) $secret,
-                'push_id'         => (string) $pushId,
-                'session_id'      => (string) $sessionId,
-                'browser_version' => (string) $browserVersion,
-            ]
-        );
-
-        if ($response->matchesHttpCode(HttpCodes::CREATED)) {
-            return $this->hydrator->getAuthenticationFromResponse($response);
-        }
-
-        throw $response->getError();
-    }
-
     /**
      * Used for validating code entered by user.
      *
@@ -421,70 +388,6 @@ public function checkBackupCode(IntegrationUser $user, array $authentications, $
         throw $response->getError();
     }
 
-    /**
-     * @param int    $integrationId
-     * @param string $sessionId
-     * @param string $socketId
-     *
-     * @return array
-     *
-     * @throws AuthorizationException
-     * @throws ValidationException
-     * @throws Exception
-     */
-    public function authenticateChannel($integrationId, $sessionId, $socketId)
-    {
-        $channelName = 'private-wp_' . $integrationId . '_' . $sessionId;
-
-        $response = $this->call(
-            'POST',
-            $this->createEndpoint('v2/integration/authenticate_channel'),
-            [
-                'channel_name' => (string) $channelName,
-                'socket_id'    => (string) $socketId
-            ]
-        );
-
-        if ($response->matchesHttpCode(HttpCodes::OK)) {
-            return $response->getData();
-        }
-
-        throw $response->getError();
-    }
-
-    /**
-     * @param string $channelName
-     * @param int    $statusId
-     * @param string $status
-     *
-     * @return array
-     *
-     * @throws AuthorizationException
-     * @throws InvalidArgumentException
-     * @throws ValidationException
-     * @throws Exception
-     */
-    public function updateChannelStatus($channelName, $statusId, $status)
-    {
-        if (!in_array($status, ChannelStatuses::getAllowedStatuses())) {
-            throw new InvalidArgumentException('Channel status is not valid.');
-        }
-
-        $response = $this->call(
-            'POST',
-            $this->createEndpoint('v2/integration/channel/' . $channelName . '/status/' . $statusId),
-            [
-                'status' => (string) $status
-            ]
-        );
-
-        if ($response->matchesHttpCode(HttpCodes::OK)) {
-            return $response->getData();
-        }
-
-        throw $response->getError();
-    }
-
     /**
      * Used for getting paginated list of integration users from 2fas.
      *

diff --git a/tests/Exception/ValidationExceptionTest.php b/tests/Exception/ValidationExceptionTest.php
@@ -83,51 +83,6 @@ public function testUniquePhoneNumberValidationRule()
         $this->assertEquals([ValidationRules::UNIQUE_PHONE_NUMBER], $exception->getError('code'));
     }
 
-    public function testPusherSocketIdValidationRule()
-    {
-        $errors = ['error' => [
-            'code' => 9030,
-            'msg'  => [
-                'code' => [
-                    'validation.pusher_socket_id'
-                ]
-            ]
-        ]];
-
-        $exception = $this->getException($errors);
-        $this->assertEquals([ValidationRules::PUSHER_SOCKET_ID], $exception->getError('code'));
-    }
-
-    public function testPusherChannelNameValidationRule()
-    {
-        $errors = ['error' => [
-            'code' => 9030,
-            'msg'  => [
-                'code' => [
-                    'validation.pusher_channel_name'
-                ]
-            ]
-        ]];
-
-        $exception = $this->getException($errors);
-        $this->assertEquals([ValidationRules::PUSHER_CHANNEL_NAME], $exception->getError('code'));
-    }
-
-    public function testIntegrationChannelNameValidationRule()
-    {
-        $errors = ['error' => [
-            'code' => 9030,
-            'msg'  => [
-                'code' => [
-                    'validation.private_integration_channel'
-                ]
-            ]
-        ]];
-
-        $exception = $this->getException($errors);
-        $this->assertEquals([ValidationRules::INTEGRATION_CHANNEL_NAME], $exception->getError('code'));
-    }
-
     public function testRegexDot()
     {
         $errors = ['error' => [

diff --git a/tests/MobileSecretGeneratorTest.php b/tests/MobileSecretGeneratorTest.php