Allow store and state_handler to be passed in from config

Author: joshcanhelp

src/Auth0/Login/Auth0Service.php

@@ -2,6 +2,7 @@
 
 namespace Auth0\Login;
 
+use Auth0\SDK\API\Helpers\State\StateHandler;
 use Auth0\SDK\API\Helpers\State\SessionStateHandler;
 use Auth0\SDK\Auth0;
 use Auth0\SDK\Helpers\Cache\CacheHandler;
@@ -36,23 +37,26 @@ class Auth0Service
      */
     public function __construct(
         array $auth0Config = null,
-        StoreInterface $sessionStorage = null,
-        SessionStateHandler $sessionStateHandler = null
+        StoreInterface $store = null,
+        StateHandler $stateHandler = null
     )
     {
-        // Backwards compatible fallbacks
         if (!$auth0Config instanceof Repository && !is_array($auth0Config)) {
             $auth0Config = config('laravel-auth0');
         }
-        if (!$sessionStorage instanceof StoreInterface) {
-            $sessionStorage = new LaravelSessionStore();
+
+        $store = $auth0Config['store'] ?? $store;
+        if (false !== $store && !$store instanceof StoreInterface) {
+            $store = new LaravelSessionStore();
         }
-        if (!$sessionStateHandler instanceof SessionStateHandler) {
-            $sessionStateHandler = new SessionStateHandler($sessionStorage);
+
+        $stateHandler = $auth0Config['state_handler'] ?? $stateHandler;
+        if (false !== $stateHandler && !$stateHandler instanceof StateHandler) {
+            $stateHandler = new SessionStateHandler($store);
         }
 
-        $auth0Config['store'] = $sessionStorage;
-        $auth0Config['state_handler'] = $sessionStateHandler;
+        $auth0Config['store'] = $store;
+        $auth0Config['state_handler'] = $stateHandler;
         $this->auth0 = new Auth0($auth0Config);
     }
 

src/Auth0/Login/LoginServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Auth0\SDK\API\Helpers\ApiClient;
 use Auth0\SDK\API\Helpers\InformationHeaders;
+use Auth0\SDK\API\Helpers\State\StateHandler;
 use Auth0\SDK\API\Helpers\State\SessionStateHandler;
 use Auth0\SDK\Store\StoreInterface;
 use Illuminate\Support\ServiceProvider;
@@ -49,7 +50,7 @@ public function register()
             return new LaravelSessionStore();
         });
 
-        $this->app->bind(SessionStateHandler::class, function ($app) {
+        $this->app->bind(StateHandler::class, function ($app) {
             return new SessionStateHandler($app->make(LaravelSessionStore::class));
         });
 
@@ -58,7 +59,7 @@ public function register()
             return new Auth0Service(
                 $app->make('config')->get('laravel-auth0'),
                 $app->make(StoreInterface::class),
-                $app->make(SessionStateHandler::class)
+                $app->make(StateHandler::class)
             );
         });
         $this->app->singleton('auth0', function () {