From bce3b52ce2c2dc31f3e930a3aec27ffc2e998068 Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu, 8 Dec 2016 20:35:35 +0000
Subject: [PATCH] Use a middleware to define micropub dev token

---
 app/Http/Kernel.php                        |  1 +
 app/Http/Middleware/DevTokenMiddleware.php | 28 +++++++++++++++++
 app/Providers/MicropubSessionProvider.php  | 35 ----------------------
 config/app.php                             |  1 -
 4 files changed, 29 insertions(+), 36 deletions(-)
 create mode 100644 app/Http/Middleware/DevTokenMiddleware.php
 delete mode 100644 app/Providers/MicropubSessionProvider.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 0a782b36..d66a8f77 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -31,6 +31,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\LinkHeadersMiddleware::class,
+            \App\Http\Middleware\DevTokenMiddleware::class,
         ],
 
         'api' => [
diff --git a/app/Http/Middleware/DevTokenMiddleware.php b/app/Http/Middleware/DevTokenMiddleware.php
new file mode 100644
index 00000000..b1d5e02e
--- /dev/null
+++ b/app/Http/Middleware/DevTokenMiddleware.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Storage;
+
+class DevTokenMiddleware
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (config('app.env') !== 'production') {
+            session(['me' => env('APP_URL')]);
+            if (Storage::exists('dev-token')) {
+                session(['token' => Storage::get('dev-token')]);
+            }
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Providers/MicropubSessionProvider.php b/app/Providers/MicropubSessionProvider.php
deleted file mode 100644
index 84a588fb..00000000
--- a/app/Providers/MicropubSessionProvider.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\ServiceProvider;
-
-class MicropubSessionProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap the application services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        //allow micropub use in development
-        if (config('app.env') !== 'production') {
-            session(['me' => env('APP_URL')]);
-            if (Storage::exists('dev-token')) {
-                session(['token' => Storage::get('dev-token')]);
-            }
-        }
-    }
-
-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
-}
diff --git a/config/app.php b/config/app.php
index 850c268f..ee0e5969 100644
--- a/config/app.php
+++ b/config/app.php
@@ -182,7 +182,6 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        App\Providers\MicropubSessionProvider::class,
 
         /*
          * Laravel Debugbar