Merge pull request #30 from mickadoo/cleanup

Cleanup
auth0 · May 26, 2016 · a33e4ec · a33e4ec
2 parents 85d9082 + 0a21c0c
commit a33e4ec
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
     },
 
     "require-dev": {
+        "phpunit/phpunit": "^5.1"
     },
 
     "suggest": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="Tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="JWTAuthBundle Test Suite">
-            <directory>tests/</directory>
+            <directory>Tests/</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -24,8 +24,7 @@ public function getConfigTreeBuilder()
             ->children()
             ->scalarNode('client_id')->isRequired()->cannotBeEmpty()->end()
             ->scalarNode('client_secret')->isRequired()->cannotBeEmpty()->end()
-            ->scalarNode('domain')->defaultValue('')->end()
-            ->booleanNode('secret_base64_encoded')->defaultTrue()->end();
+            ->scalarNode('domain')->defaultValue('')->end();
 
         return $treeBuilder;
     }

diff --git a/src/DependencyInjection/JWTAuthExtension.php b/src/DependencyInjection/JWTAuthExtension.php
@@ -23,7 +23,5 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('jwt_auth.client_id', $config['client_id']);
         $container->setParameter('jwt_auth.client_secret', $config['client_secret']);
         $container->setParameter('jwt_auth.domain', $config['domain']);
-        $container->setParameter('jwt_auth.secret_base64_encoded', $config['secret_base64_encoded']);
     }
-
 }
diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -1,7 +1,7 @@
 services:
     jwt_auth.auth0_service:
         class: "Auth0\\JWTAuthBundle\\Security\\Auth0Service"
-        arguments: [%jwt_auth.client_id%, %jwt_auth.client_secret%, %jwt_auth.domain%, %jwt_auth.secret_base64_encoded%]
+        arguments: [%jwt_auth.client_id%, %jwt_auth.client_secret%, %jwt_auth.domain%]
 
     jwt_auth.jwt_authenticator:
         class:     "Auth0\\JWTAuthBundle\\Security\\JWTAuthenticator"

diff --git a/src/Security/Auth0Service.php b/src/Security/Auth0Service.php
@@ -16,14 +16,17 @@ class Auth0Service {
     private $client_id;
     private $client_secret;
     private $domain;
-    private $oauth_client;
 
-    public function __construct($client_id, $client_secret, $domain, $secret_base64_encoded)
+    /**
+     * @param string $client_id
+     * @param string $client_secret
+     * @param string $domain
+     */
+    public function __construct($client_id, $client_secret, $domain)
     {
         $this->client_id = $client_id;
         $this->client_secret = $client_secret;
         $this->domain = $domain;
-        $this->secret_base64_encoded = $secret_base64_encoded;
     }
 
     /**
@@ -40,7 +43,7 @@ public function getUserProfileByA0UID($jwt, $a0UID)
     /**
      * Decodes the JWT and validate it
      *
-     * @return stdClass
+     * @return \stdClass
      */
     public function decodeJWT($encToken)
     {