refactor: reformat code

Author: Steve Porter

.gitignore

@@ -0,0 +1,9 @@
+*.project
+*.sublime-project
+*.sublime-workspace
+.DS_Store
+.idea/
+composer.lock
+composer.phar
+phpunit.phar
+vendor

composer.json

@@ -1,28 +1,35 @@
 {
-    "name": "arietimmerman/laravel-oauth-introspect-middleware",
+    "name": "designmynight/laravel-oauth-introspect-middleware",
     "description": "Laravel Middleware for letting a resource owner verify a OAuth2 access tokens with a remote authorization server",
     "type": "library",
     "license": "MIT",
     "authors": [
         {
-            "name": "Arie Timmerman",
-            "email": "arietimmerman@gmail.com"
-        }
+            "name": "Steve Porter",
+            "email": "steve@designmynight.com"
+        },
     ],
     "require": {
 		"php": "^7.0",
      	"guzzlehttp/guzzle": "~6.0",
         "laravel/framework": "^5.5"
     },
     "autoload": {
-        "psr-4": {"ArieTimmerman\\Laravel\\OAuth2\\": "src/"}
+        "psr-4": {"DesignMyNight\\Laravel\\OAuth2\\": "src/"}
     },
     "autoload-dev": {
         "psr-4": {
-            "ArieTimmerman\\Laravel\\OAuth2\\Tests\\": "tests"
+            "DesignMyNight\\Laravel\\OAuth2\\Tests\\": "tests"
         }
     },
     "require-dev": {
         "orchestra/testbench": "~3.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "DesignMyNight\\Laravel\\OAuth2\\IntrospectMiddlewareServiceProvider"
+            ]
+        }
     }
 }

config/authorizationserver.php

@@ -1,13 +1,10 @@
 <?php
 
 return [
-
-		'authorization_server_authorization_url' => env('AUTHORIZATION_SERVER_AUTHORIZATION_URL', false),
-		'authorization_server_redirect_url' => env('AUTHORIZATION_SERVER_REDIRECT_URL', false),
-		'authorization_server_token_url' => env('AUTHORIZATION_SERVER_TOKEN_URL', false),
-		'authorization_server_introspect_url' => env('AUTHORIZATION_SERVER_INTROSPECT_URL', false),
-		'authorization_server_client_id' => env('AUTHORIZATION_SERVER_CLIENT_ID', false),
-		'authorization_server_client_secret' => env('AUTHORIZATION_SERVER_CLIENT_SECRET', false)
-		
+    'authorization_url' => env('AUTHORIZATION_SERVER_AUTHORIZATION_URL'),
+    'redirect_url' => env('AUTHORIZATION_SERVER_REDIRECT_URL'),
+    'token_url' => env('AUTHORIZATION_SERVER_TOKEN_URL'),
+    'introspect_url' => env('AUTHORIZATION_SERVER_INTROSPECT_URL'),
+    'client_id' => env('AUTHORIZATION_SERVER_CLIENT_ID'),
+    'client_secret' => env('AUTHORIZATION_SERVER_CLIENT_SECRET'),
 ];
-

routes/routes.php

@@ -1,19 +1,19 @@
 <?php
 
 /**
- * Redirectiong endpoint for initiating the OAuth2 Implicit Grant flow.
+ * Redirecting endpoint for initiating the OAuth2 Implicit Grant flow.
  * The retrieved access token can be used to call the APIs as protected with the provided middleware.
- * 
+ *
  * Note: this module does not provide any logic for extracting the access tokens from the url.
- * 
+ *
  */
 Route::get('/redirect', function (Request $request) {
-	$query = http_build_query([
-			'client_id' => config('authorizationserver.authorization_server_client_id'),
-			'redirect_uri' => config('authorizationserver.authorization_server_redirect_url'),
-			'response_type' => 'token',
-			'scope' => 'place-orders',
-	]);
+    $query = http_build_query([
+        'client_id' => config('authorizationserver.client_id'),
+        'redirect_uri' => config('authorizationserver.redirect_url'),
+        'response_type' => 'token',
+        'scope' => 'place-orders',
+    ]);
 
-	return redirect(config('authorizationserver.authorization_server_authorization_url') . '?' . $query);
+    return redirect(config('authorizationserver.authorization_url') . '?' . $query);
 });

src/Exceptions/InvalidAccessTokenException.php

@@ -1,7 +1,6 @@
 <?php
+namespace DesignMyNight\Laravel\OAuth2\Exceptions;
 
-namespace ArieTimmerman\Laravel\OAuth2\Exceptions;
-
-class InvalidAccessTokenException extends \Exception{
-
-}
+class InvalidAccessTokenException extends \Exception
+{
+}

src/Exceptions/InvalidEndpointException.php

@@ -1,7 +1,6 @@
 <?php
+namespace DesignMyNight\Laravel\OAuth2\Exceptions;
 
-namespace ArieTimmerman\Laravel\OAuth2\Exceptions;
-
-class InvalidEndpointException extends InvalidAccessTokenException{
-    
-}
+class InvalidEndpointException extends InvalidAccessTokenException
+{
+}

src/Exceptions/InvalidInputException.php

@@ -1,7 +1,6 @@
 <?php
+namespace DesignMyNight\Laravel\OAuth2\Exceptions;
 
-namespace ArieTimmerman\Laravel\OAuth2\Exceptions;
-
-class InvalidInputException extends InvalidAccessTokenException{
-    
-}
+class InvalidInputException extends InvalidAccessTokenException
+{
+}

src/IntrospectMiddlewareServiceProvider.php

@@ -0,0 +1,34 @@
+<?php
+namespace DesignMyNight\Laravel\OAuth2;
+
+use Illuminate\Foundation\Application as LaravelApplication;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Lumen\Application as LumenApplication;
+
+class IntrospectMiddlewareServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        $source = realpath(__DIR__ . '/../config/authorizationserver.php');
+
+        if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
+            $this->publishes([$source => config_path('authorizationserver.php')]);
+        } else if ($this->app instanceof LumenApplication) {
+            $this->app->configure('authorizationserver');
+        }
+
+        $routes = realpath(__DIR__ . '/../routes/routes.php');
+
+        $this->loadRoutesFrom($routes);
+        $this->mergeConfigFrom($source, 'authorizationserver');
+    }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+}