Added RouteRegistrar (partially taken from laravel/passport) and rewo…

…rked the way routes are registered (closer to that of laravel/passport)
dusterio · May 5, 2017 · 3e123c1 · 3e123c1
1 parent 86406b2
commit 3e123c1
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 102 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 vendor/
+.idea/
diff --git a/src/LumenPassport.php b/src/LumenPassport.php
@@ -60,4 +60,29 @@ public static function tokensExpireIn(DateTimeInterface $date = null, $clientId
 
         return new static;
     }
+
+    /**
+     * Get a Passport route registrar.
+     *
+     * @param  array  $options
+     * @return RouteRegistrar
+     */
+    public static function routes($callback = null, array $options = [])
+    {
+        $callback = $callback ?: function ($router) {
+            $router->all();
+        };
+
+        $defaultOptions = [
+            'prefix' => 'oauth',
+            'namespace' => '\Laravel\Passport\Http\Controllers',
+        ];
+
+        $options = array_merge($defaultOptions, $options);
+
+        $callback->group($options, function ($router) use ($callback) {
+            $routes = new RouteRegistrar($router);
+            $routes->all();
+        });
+    }
 }
diff --git a/src/PassportServiceProvider.php b/src/PassportServiceProvider.php
@@ -28,113 +28,11 @@ public function boot()
                 Purge::class
             ]);
         }
-
-        $this->registerRoutes();
     }
     /**
      * @return void
      */
     public function register()
     {
     }
-
-    /**
-     * Register routes for transient tokens, clients, and personal access tokens.
-     *
-     * @return void
-     */
-    public function registerRoutes()
-    {
-        $this->forAccessTokens();
-        $this->forTransientTokens();
-        $this->forClients();
-        $this->forPersonalAccessTokens();
-    }
-
-    /**
-     * Register the routes for retrieving and issuing access tokens.
-     *
-     * @return void
-     */
-    public function forAccessTokens()
-    {
-        $this->app->post('/oauth/token', [
-            'uses' => '\Dusterio\LumenPassport\Http\Controllers\AccessTokenController@issueToken'
-        ]);
-
-        $this->app->group(['middleware' => ['auth']], function () {
-            $this->app->get('/oauth/tokens', [
-                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@forUser',
-            ]);
-
-            $this->app->delete('/oauth/tokens/{token_id}', [
-                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@destroy',
-            ]);
-        });
-    }
-
-    /**
-     * Register the routes needed for refreshing transient tokens.
-     *
-     * @return void
-     */
-    public function forTransientTokens()
-    {
-        $this->app->post('/oauth/token/refresh', [
-            'middleware' => ['auth'],
-            'uses' => '\Laravel\Passport\Http\Controllers\TransientTokenController@refresh',
-        ]);
-    }
-
-    /**
-     * Register the routes needed for managing clients.
-     *
-     * @return void
-     */
-    public function forClients()
-    {
-        $this->app->group(['middleware' => ['auth']], function () {
-            $this->app->get('/oauth/clients', [
-                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@forUser',
-            ]);
-
-            $this->app->post('/oauth/clients', [
-                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@store',
-            ]);
-
-            $this->app->put('/oauth/clients/{client_id}', [
-                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@update',
-            ]);
-
-            $this->app->delete('/oauth/clients/{client_id}', [
-                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@destroy',
-            ]);
-        });
-    }
-
-    /**
-     * Register the routes needed for managing personal access tokens.
-     *
-     * @return void
-     */
-    public function forPersonalAccessTokens()
-    {
-        $this->app->group(['middleware' => ['auth']], function () {
-            $this->app->get('/oauth/scopes', [
-                'uses' => '\Laravel\Passport\Http\Controllers\ScopeController@all',
-            ]);
-
-            $this->app->get('/oauth/personal-access-tokens', [
-                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@forUser',
-            ]);
-
-            $this->app->post('/oauth/personal-access-tokens', [
-                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@store',
-            ]);
-
-            $this->app->delete('/oauth/personal-access-tokens/{token_id}', [
-                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@destroy',
-            ]);
-        });
-    }
 }
diff --git a/src/RouteRegistrar.php b/src/RouteRegistrar.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace Dusterio\LumenPassport;
+
+class RouteRegistrar
+{
+    /**
+     * Application
+     */
+    private $app;
+
+    /**
+     * Create a new route registrar instance.
+     *
+     * @param  $app
+     * @return void
+     */
+    public function __construct($app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Register routes for transient tokens, clients, and personal access tokens.
+     *
+     * @return void
+     */
+    public function all()
+    {
+        $this->forAccessTokens();
+        $this->forTransientTokens();
+        $this->forClients();
+        $this->forPersonalAccessTokens();
+    }
+
+    /**
+     * Register the routes for retrieving and issuing access tokens.
+     *
+     * @return void
+     */
+    public function forAccessTokens()
+    {
+        $this->app->post('/token', [
+            'uses' => '\Dusterio\LumenPassport\Http\Controllers\AccessTokenController@issueToken'
+        ]);
+
+        $this->app->group(['middleware' => ['auth']], function () {
+            $this->app->get('/tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@forUser',
+            ]);
+
+            $this->app->delete('/tokens/{token_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@destroy',
+            ]);
+        });
+    }
+
+    /**
+     * Register the routes needed for refreshing transient tokens.
+     *
+     * @return void
+     */
+    public function forTransientTokens()
+    {
+        $this->app->post('/token/refresh', [
+            'middleware' => ['auth'],
+            'uses' => '\Laravel\Passport\Http\Controllers\TransientTokenController@refresh',
+        ]);
+    }
+
+    /**
+     * Register the routes needed for managing clients.
+     *
+     * @return void
+     */
+    public function forClients()
+    {
+        $this->app->group(['middleware' => ['auth']], function () {
+            $this->app->get('/clients', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@forUser',
+            ]);
+
+            $this->app->post('/clients', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@store',
+            ]);
+
+            $this->app->put('/clients/{client_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@update',
+            ]);
+
+            $this->app->delete('/clients/{client_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@destroy',
+            ]);
+        });
+    }
+
+    /**
+     * Register the routes needed for managing personal access tokens.
+     *
+     * @return void
+     */
+    public function forPersonalAccessTokens()
+    {
+        $this->app->group(['middleware' => ['auth']], function () {
+            $this->app->get('/scopes', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ScopeController@all',
+            ]);
+
+            $this->app->get('/personal-access-tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@forUser',
+            ]);
+
+            $this->app->post('/personal-access-tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@store',
+            ]);
+
+            $this->app->delete('/personal-access-tokens/{token_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@destroy',
+            ]);
+        });
+    }
+}