Merge pull request #12 from VirgilSecurity/develop

VirgilSecurity · Feb 27, 2019 · 92824ed · 92824ed
2 parents 2b4ffb3 + 4b34410
commit 92824ed
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 46 deletions.
diff --git a/passw0rd/Credentials/UpdateToken.php b/passw0rd/Credentials/UpdateToken.php
@@ -45,7 +45,6 @@
  */
 class UpdateToken
 {
-    private $updateToken;
     private $version;
     private $value;
 
@@ -72,7 +71,7 @@ private function validateAndSet(string $updateToken): void
         $parts = explode(".", $updateToken);
 
         if (count($parts) !== 3 || $parts[0] !== self::PREFIX)
-            throw new UpdateTokenException("Invalid string: $this->updateToken");
+            throw new UpdateTokenException("Invalid format: $updateToken");
 
         if ((int)$parts[1] < 1)
             throw new UpdateTokenException("Invalid version: $parts[1]");

diff --git a/passw0rd/Http/HttpVirgilAgent.php b/passw0rd/Http/HttpVirgilAgent.php
@@ -45,7 +45,7 @@ class HttpVirgilAgent
 {
     const PRODUCT = 'passw0rd';
     const FAMILY = 'php';
-    const VERSION = '1.3.0'; // TODO: Add composer.lock parser!
+    const VERSION = '1.3.1'; // TODO: Add composer.lock parser!
 
     private $platform;
 

diff --git a/passw0rd/Protocol/ProtocolContext.php b/passw0rd/Protocol/ProtocolContext.php
@@ -39,7 +39,6 @@
 
 use passw0rd\Core\PHEClient;
 use passw0rd\Credentials\InputCredentialsChecker;
-use passw0rd\Exeptions\InputCredentialsCheckerException;
 use passw0rd\Exeptions\ProtocolContextException;
 
 /**
@@ -76,12 +75,7 @@ public function create(array $credentials): ProtocolContext
     {
         $credentialsChecker = new InputCredentialsChecker($credentials);
 
-        try {
-            $credentialsChecker->check();
-        } catch (InputCredentialsCheckerException $e) {
-            var_dump($e->getMessage());
-            die;
-        }
+        $credentialsChecker->check();
 
         $this->mainSetter($credentials);
 
@@ -96,28 +90,22 @@ public function mainSetter(array $credentials)
     {
         $this->setCredentials($credentials);
 
-        try {
-            if ($this->isKeysVersionsEquals())
-                $this->version = (int) $this->getServicePublicKey(true);
+        if ($this->isKeysVersionsEquals())
+            $this->version = (int) $this->getServicePublicKey(true);
 
-            if(!is_null($this->getUpdateToken()))
-            {
-                if((int) $this->getUpdateToken(true)!==$this->getVersion()+1)
-                    throw new \Exception("Incorrect token version ".$this->getUpdateToken(true));
+        if(!is_null($this->getUpdateToken()))
+        {
+            if((int) $this->getUpdateToken(true)!==$this->getVersion()+1)
+                throw new ProtocolContextException("Incorrect token version ".$this->getUpdateToken(true));
 
-                $this->version = (int) $this->getUpdateToken(true);
-            }
-
-            try {
-                $this->setPHEClient($this->getAppSecretKey(), $this->getServicePublicKey(), $this->getUpdateToken());
-            } catch (\Exception $e) {
-                throw new ProtocolContextException('Protocol error with PHE client constructor or setKeys method');
-            }
+            $this->version = (int) $this->getUpdateToken(true);
+        }
 
+        try {
+            $this->setPHEClient($this->getAppSecretKey(), $this->getServicePublicKey(), $this->getUpdateToken());
         } catch (\Exception $e) {
-            throw new \Exception($e->getMessage());
+            throw new ProtocolContextException('Protocol error with PHE client constructor or setKeys method');
         }
-
     }
 
     /**
@@ -152,46 +140,35 @@ public function getAppToken(): string
         return $this->appToken;
     }
 
+
     /**
      * @param bool $returnVersion
      * @return string
+     * @throws ProtocolContextException
      */
     public function getServicePublicKey(bool $returnVersion = false): string
     {
-        try {
-            return $this->getParsedContext(self::PK_PREFIX, $this->servicePublicKey, $returnVersion);
-        } catch (ProtocolContextException $e) {
-            var_dump($e->getMessage());
-            die;
-        }
+        return $this->getParsedContext(self::PK_PREFIX, $this->servicePublicKey, $returnVersion);
     }
 
     /**
      * @param bool $returnVersion
      * @return string
+     * @throws ProtocolContextException
      */
     public function getAppSecretKey(bool $returnVersion = false): string
     {
-        try {
-            return $this->getParsedContext(self::SK_PREFIX, $this->appSecretKey, $returnVersion);
-        } catch (ProtocolContextException $e) {
-            var_dump($e->getMessage());
-            die;
-        }
+        return $this->getParsedContext(self::SK_PREFIX, $this->appSecretKey, $returnVersion);
     }
 
     /**
      * @param bool $returnVersion
      * @return null|string
+     * @throws ProtocolContextException
      */
     public function getUpdateToken(bool $returnVersion = false):? string
     {
-        try {
-            return $this->getParsedContext(self::UT_PREFIX, $this->updateToken, $returnVersion);
-        } catch (ProtocolContextException $e) {
-            var_dump($e->getMessage());
-            die;
-        }
+        return $this->getParsedContext(self::UT_PREFIX, $this->updateToken, $returnVersion);
     }
 
     /**
@@ -231,7 +208,7 @@ public function getVersion(): int
     }
 
     /**
-     * @return void
+     * @throws ProtocolContextException
      */
     public function setUpdateTokenVersion(): void
     {