Merge pull request #564 from lucadegasperi/lumen

Improved Lumen support

Author: vinkla

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 5.1.0 (upcoming)
+
+- Improved Lumen support
+
 ## 5.0.1 (released 2015-08-19)
 
 - Added middleware registration

composer.json

@@ -49,7 +49,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.0-dev"
+            "dev-master": "5.1-dev"
         }
     },
     "minimum-stability": "dev",

src/Lumen/OAuth2ServerServiceProvider.php

@@ -11,44 +11,16 @@
 
 namespace LucaDegasperi\OAuth2Server\Lumen;
 
-use LucaDegasperi\OAuth2Server\OAuth2ServerServiceProvider as BaseOAuth2ServerServiceProvider;
+use LucaDegasperi\OAuth2Server\OAuth2ServerServiceProvider as ServiceProvider;
 
 /**
  * This is the Lumen oauth server service provider class.
  *
+ * @deprecated since version 5.1. Use the base OAuth2ServerServiceProvider instead.
+ *
  * @author Luca Degasperi <[email protected]>
  */
-class OAuth2ServerServiceProvider extends BaseOAuth2ServerServiceProvider
+class OAuth2ServerServiceProvider extends ServiceProvider
 {
-    /**
-     * Boot the service provider.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        // Lumen does not support route filters.
-    }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        parent::register();
-
-        $this->registerConfiguration();
-    }
-
-    /**
-     * Register the configuration.
-     *
-     * @return void
-     */
-    public function registerConfiguration()
-    {
-        $this->app->configure('oauth2');
-    }
+    //
 }

src/OAuth2ServerServiceProvider.php

@@ -11,6 +11,7 @@
 
 namespace LucaDegasperi\OAuth2Server;
 
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\ResourceServer;
@@ -39,34 +40,44 @@ class OAuth2ServerServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->setupConfig();
-        $this->setupMigrations();
+        $this->setupConfig($this->app);
+        $this->setupMigrations($this->app);
     }
 
     /**
      * Setup the config.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function setupConfig()
+    protected function setupConfig(Application $app)
     {
         $source = realpath(__DIR__.'/../config/oauth2.php');
 
-        $this->publishes([$source => config_path('oauth2.php')]);
+        if (class_exists('Illuminate\Foundation\Application', false) && $app->runningInConsole()) {
+            $this->publishes([$source => config_path('oauth2.php')]);
+        } elseif (class_exists('Laravel\Lumen\Application', false)) {
+            $app->configure('oauth2');
+        }
 
         $this->mergeConfigFrom($source, 'oauth2');
     }
 
     /**
      * Setup the migrations.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function setupMigrations()
+    protected function setupMigrations(Application $app)
     {
         $source = realpath(__DIR__.'/../database/migrations/');
 
-        $this->publishes([$source => database_path('migrations')], 'migrations');
+        if (class_exists('Illuminate\Foundation\Application', false) && $app->runningInConsole()) {
+            $this->publishes([$source => database_path('migrations')], 'migrations');
+        }
     }
 
     /**
@@ -90,17 +101,17 @@ public function registerAuthorizer()
         $this->app->bindShared('oauth2-server.authorizer', function ($app) {
             $config = $app['config']->get('oauth2');
             $issuer = $app->make(AuthorizationServer::class)
-                          ->setClientStorage($app->make(ClientInterface::class))
-                          ->setSessionStorage($app->make(SessionInterface::class))
-                          ->setAuthCodeStorage($app->make(AuthCodeInterface::class))
-                          ->setAccessTokenStorage($app->make(AccessTokenInterface::class))
-                          ->setRefreshTokenStorage($app->make(RefreshTokenInterface::class))
-                          ->setScopeStorage($app->make(ScopeInterface::class))
-                          ->requireScopeParam($config['scope_param'])
-                          ->setDefaultScope($config['default_scope'])
-                          ->requireStateParam($config['state_param'])
-                          ->setScopeDelimiter($config['scope_delimiter'])
-                          ->setAccessTokenTTL($config['access_token_ttl']);
+                ->setClientStorage($app->make(ClientInterface::class))
+                ->setSessionStorage($app->make(SessionInterface::class))
+                ->setAuthCodeStorage($app->make(AuthCodeInterface::class))
+                ->setAccessTokenStorage($app->make(AccessTokenInterface::class))
+                ->setRefreshTokenStorage($app->make(RefreshTokenInterface::class))
+                ->setScopeStorage($app->make(ScopeInterface::class))
+                ->requireScopeParam($config['scope_param'])
+                ->setDefaultScope($config['default_scope'])
+                ->requireStateParam($config['state_param'])
+                ->setScopeDelimiter($config['scope_delimiter'])
+                ->setAccessTokenTTL($config['access_token_ttl']);
 
             // add the supported grant types to the authorization server
             foreach ($config['grant_types'] as $grantIdentifier => $grantParams) {
@@ -112,15 +123,19 @@ public function registerAuthorizer()
                     $verifier = $app->make($className);
                     $grant->setVerifyCredentialsCallback([$verifier, $method]);
                 }
+
                 if (array_key_exists('auth_token_ttl', $grantParams)) {
                     $grant->setAuthTokenTTL($grantParams['auth_token_ttl']);
                 }
+
                 if (array_key_exists('refresh_token_ttl', $grantParams)) {
                     $grant->setRefreshTokenTTL($grantParams['refresh_token_ttl']);
                 }
+
                 if (array_key_exists('rotate_refresh_tokens', $grantParams)) {
                     $grant->setRefreshTokenRotation($grantParams['rotate_refresh_tokens']);
                 }
+
                 $issuer->addGrantType($grant);
             }
 
@@ -141,7 +156,8 @@ public function registerAuthorizer()
     }
 
     /**
-     * Register the Middleware to the IoC container because some middleware need additional parameters.
+     * Register the Middleware to the IoC container because
+     * some middleware need additional parameters.
      *
      * @return void
      */

tests/functional/bootstrap/FeatureContext.php

@@ -31,6 +31,7 @@ public function down()
     {
         $this->resetMigrations();
     }
+
     /**
      * @Given /^An authorization server exists that supports the "([^"]*)" grant type$/
      */

tests/unit/LucaDegasperi/OAuth2Server/AuthorizerSpec.php

@@ -17,7 +17,6 @@
 use League\OAuth2\Server\Entity\SessionEntity;
 use League\OAuth2\Server\Grant\AuthCodeGrant;
 use League\OAuth2\Server\ResourceServer;
-use League\OAuth2\Server\TokenType\TokenTypeInterface;
 use League\OAuth2\Server\Util\RedirectUri;
 use PhpSpec\ObjectBehavior;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,6 +27,7 @@ public function let(AuthorizationServer $issuer, ResourceServer $checker)
     {
         $this->beConstructedWith($issuer, $checker);
     }
+
     public function it_is_initializable()
     {
         $this->shouldHaveType('LucaDegasperi\OAuth2Server\Authorizer');
@@ -161,12 +161,4 @@ public function it_sets_a_redirect_uri_generator(RedirectUri $redirectUri)
 
         $this->getRedirectUriGenerator()->shouldReturn($redirectUri);
     }
-
-    /*function it_sets_a_custom_token_type(AuthorizationServer $issuer, ResourceServer $checker, TokenTypeInterface $tokenType)
-    {
-        $issuer->setTokenType($tokenType)->shouldBeCalled();
-        $checker->setTokenType($tokenType)->shouldBeCalled();
-
-        $this->setTokenType($tokenType);
-    }*/
 }