Set auth middleware depending on Authorization header

knowfox · May 24, 2018 · da18821 · da18821
1 parent 372f36a
commit da18821
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 2 deletions.
diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
@@ -8,6 +8,11 @@
 
 class ApiController extends Controller
 {
+    public function __construct(Request $request)
+    {
+        $this->setAuthMiddleware($request);
+    }
+
     public function show(Concept $concept, Request $request)
     {
         $this->authorize('view', $concept);

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -19,6 +19,7 @@
 namespace Knowfox\Http\Controllers;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -37,4 +38,14 @@ protected function fromToken($token)
 
         return $email_login->user;
     }
+
+    protected function setAuthMiddleWare(Request $request)
+    {
+        if ($request->hasHeader('authorization')) {
+            $this->middleware('auth:api');
+        }
+        else {
+            $this->middleware('web');
+        }
+    }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -25,6 +25,11 @@
 
 class UserController extends Controller
 {
+    public function __construct(Request $request)
+    {
+        $this->setAuthMiddleware($request);
+    }
+
     /**
      * Display a listing of the resource.
      *

diff --git a/public/ui/styles.css b/public/ui/styles.css
@@ -6,6 +6,8 @@ body {
 }
 
 #toolbar {
+  display: flex;
+  justify-content: space-between;
   position: fixed;
   width: 100%;
   top: 0;
@@ -15,6 +17,10 @@ body {
   color: #FFF;
 }
 
+#toolbar > div:last-child {
+  margin-right: 18px;
+}
+
 main {
   padding-top: 30px;
   display: flex;

diff --git a/resources/views/ui.blade.php b/resources/views/ui.blade.php
@@ -7,7 +7,16 @@
   <link rel="stylesheet" href="/ui/styles.css">
 </head>
 <body>
-  <nav id="toolbar">toolbar</nav>
+  <nav id="toolbar">
+    <div>
+      left
+    </div>
+    <div>
+      @if (Auth::check())
+        {{ Auth::user()->name }}
+      @endif
+    </div>
+  </nav>
   <main>
     <section id="tree"></section>
     <section id="editor">

diff --git a/routes/api.php b/routes/api.php
@@ -13,7 +13,7 @@
 |
 */
 
-Route::group(['middleware' => 'auth:api'], function () {
+Route::group([], function () {
 
     Route::get('user', function (Request $request) {
         return $request->user();

diff --git a/routes/web.php b/routes/web.php
@@ -97,6 +97,8 @@
         'uses' => 'ConceptController@store',
     ]);
 
+    // Route::resource('api/concept', 'ApiController');
+
     Route::get('/{concept}', function ($concept) {
         return redirect()->route('concept.show', [$concept]);
     })->where('concept', '[0-9]+')->name('concept.short');