Merge pull request #147 from ovidiumght/private_and_public_path_shoul…

…d_not_be_required Made the public and private key paths not required…
lexik · Mar 24, 2016 · 940528b · chalasr · Apr 1, 2016 · 940528b
2 parents bd9040f + 9a7c452
commit 940528b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -24,11 +24,9 @@ public function getConfigTreeBuilder()
             ->addDefaultsIfNotSet()
             ->children()
                 ->scalarNode('private_key_path')
-                    ->isRequired()
                     ->cannotBeEmpty()
                 ->end()
                 ->scalarNode('public_key_path')
-                    ->isRequired()
                     ->cannotBeEmpty()
                 ->end()
                 ->scalarNode('pass_phrase')

diff --git a/Encoder/JWTEncoder.php b/Encoder/JWTEncoder.php
@@ -77,14 +77,26 @@ public function decode($token)
      */
     protected function getPrivateKey()
     {
-        return openssl_pkey_get_private('file://' . $this->privateKey, $this->passPhrase);
+        $key = openssl_pkey_get_private('file://' . $this->privateKey, $this->passPhrase);
+
+        if(!$key) {
+            throw new \RuntimeException('The public key cannot be loaded, have you set the %lexik_jwt_authentication.public_key_path% parameter ?');
+        }
+
+        return $key;
     }
 
     /**
      * @return resource
      */
     protected function getPublicKey()
     {
-        return openssl_pkey_get_public('file://' . $this->publicKey);
+        $key = openssl_pkey_get_public('file://' . $this->publicKey);
+
+        if(!$key) {
+            throw new \RuntimeException('The public key cannot be loaded, have you set the %lexik_jwt_authentication.public_key_path% parameter ?');
+        }
+
+        return $key;
     }
 }