Merge branch 'master' of github.com:sfelix-martins/passport-multiauth

README.md

@@ -10,8 +10,6 @@
 
 Add multi-authentication support to [Laravel Passport](https://laravel.com/docs/5.5/passport)
 
-**OBS:** Based on [renanwilian](https://github.com/renanwilliam) responses to [Passport Multi-Auth issue](https://github.com/laravel/passport/issues/161)
-
 ## Important
 
 The instructions below are from the developing version (Branch `master`). Please prefer stable versions! Stable docs [HERE](https://github.com/sfelix-martins/passport-multiauth/tree/v1.0.1)
@@ -327,3 +325,7 @@ class AuthTest extends TestCase
     }
 }
 ```
+
+### Contributors
+
+Based on [renanwilian](https://github.com/renanwilliam) responses to [Passport Multi-Auth issue](https://github.com/laravel/passport/issues/161).

src/Http/Middleware/MultiAuthenticate.php

@@ -13,8 +13,8 @@
 use SMartins\PassportMultiauth\Provider as Token;
 use SMartins\PassportMultiauth\ProviderRepository;
 use SMartins\PassportMultiauth\Guards\GuardChecker;
+use SMartins\PassportMultiauth\Facades\ServerRequest;
 use League\OAuth2\Server\Exception\OAuthServerException;
-use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 
 class MultiAuthenticate extends Authenticate
 {
@@ -60,7 +60,7 @@ public function handle($request, Closure $next, ...$guards)
             return $next($request);
         }
 
-        $psrRequest = (new DiactorosFactory())->createRequest($request);
+        $psrRequest = ServerRequest::createRequest($request);
 
         try {
             $psrRequest = $this->server->validateAuthenticatedRequest($psrRequest);

src/Providers/MultiauthServiceProvider.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Events\AccessTokenCreated;
 use SMartins\PassportMultiauth\ProviderRepository;
+use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 
 class MultiauthServiceProvider extends ServiceProvider
 {
@@ -22,6 +23,11 @@ public function boot(ProviderRepository $providers)
 
         $this->createAccessTokenProvider($providers);
 
+        // Register the facade ServerRequest returning an instance of DiactorosFactory.
+        $this->app->singleton('ServerRequest', function () {
+            return new DiactorosFactory;
+        });
+
         // Register the middleware as signleton to use the same middleware
         // instance when the handle and terminate methods are called.
         $this->app->singleton(\SMartins\PassportMultiauth\Http\Middleware\AddCustomProvider::class);