Update code organization

stevenmaguire · Mar 12, 2018 · f695340 · f695340
1 parent ca77bc8
commit f695340
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 21 deletions.
diff --git a/src/Provider/Exception/EncryptionConfigurationException.php b/src/Provider/Exception/EncryptionConfigurationException.php
@@ -6,5 +6,17 @@
 
 class EncryptionConfigurationException extends Exception
 {
-    // nothing special here, just a name
+    /**
+     * Returns properly formatted exception when response decryption fails.
+     *
+     * @return \Stevenmaguire\OAuth2\Client\Provider\Exception\EncryptionConfigurationException
+     */
+    public static function undeterminedEncryption()
+    {
+        return new static(
+            'The given response may be encrypted and sufficient '.
+            'encryption configuration has not been provided.',
+            400
+        );
+    }
 }
diff --git a/src/Provider/Keycloak.php b/src/Provider/Keycloak.php
@@ -76,28 +76,24 @@ public function __construct(array $options = [], array $collaborators = [])
      */
     public function decryptResponse($response)
     {
-        if (is_string($response)) {
-            if ($this->encryptionAlgorithm && $this->encryptionKey) {
-                $response = json_decode(
-                    json_encode(
-                        JWT::decode(
-                            $response,
-                            $this->encryptionKey,
-                            array($this->encryptionAlgorithm)
-                        )
-                    ),
-                    true
-                );
-            } else {
-                throw new EncryptionConfigurationException(
-                    'The given response may be encrypted and sufficient '.
-                    'encryption configuration has not been provided.',
-                    400
-                );
-            }
+        if (!is_string($response)) {
+            return $response;
         }
 
-        return $response;
+        if ($this->usesEncryption()) {
+            return json_decode(
+                json_encode(
+                    JWT::decode(
+                        $response,
+                        $this->encryptionKey,
+                        array($this->encryptionAlgorithm)
+                    )
+                ),
+                true
+            );
+        }
+
+        throw EncryptionConfigurationException::undeterminedEncryption();
     }
 
     /**
@@ -270,4 +266,14 @@ public function setEncryptionKeyPath($encryptionKeyPath)
 
         return $this;
     }
+
+    /**
+     * Checks if provider is configured to use encryption.
+     *
+     * @return bool
+     */
+    public function usesEncryption()
+    {
+        return (bool) $this->encryptionAlgorithm && $this->encryptionKey;
+    }
 }