Chores

- Renamed the FirebaseMiddleware file
- Changed the seeder to not overwrite any data

app/Http/Middleware/FirebaseMiddleware.php

@@ -1,67 +1,66 @@
-<?php
+<?php
-
+
-
+
-namespace App\Http\Middleware;
+namespace App\Http\Middleware;
-
+
-use App\User;
+use App\User;
-use Closure;
+use Closure;
-use Illuminate\Support\Facades\Log;
+use Kreait\Laravel\Firebase\Facades\FirebaseAuth;
-use Kreait\Laravel\Firebase\Facades\FirebaseAuth;
+
-
+class FirebaseMiddleware
-class FirebaseMiddleware
+{
-{
+    protected $auth0;
-    protected $auth0;
+
-
+    public function __construct()
-    public function __construct()
+    {
-    {
+    }
-    }
+
-
+    /**
-    /**
+     * Run the request filter.
-     * Run the request filter.
+     *
-     *
+     * @param \Illuminate\Http\Request $request
-     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
-     * @param \Closure $next
+     * @return mixed
-     * @return mixed
+     */
-     */
+    public function handle($request, Closure $next)
-    public function handle($request, Closure $next)
+    {
-    {
+        $token = $request->bearerToken();
-        $token = $request->bearerToken();
+        if (!$token) {
-        if (!$token) {
+            return response()->json('No token provided', 403);
-            return response()->json('No token provided', 403);
+        }
-        }
+
-
+        $user = $this->validateToken($token);
-        $user = $this->validateToken($token);
+
-
+        if ($user === null) {
-        if ($user === null) {
+            return response()->json('User not found', 403);
-            return response()->json('User not found', 403);
+        }
-        }
+        $request->request->add(['user' => $user]);
-        $request->request->add(['user' => $user]);
+
-
+        return $next($request);
-        return $next($request);
+    }
-    }
+
-
+    public function validateToken($token)
-    public function validateToken($token)
+    {
-    {
+        try {
-        try {
+            $decoded = FirebaseAuth::verifyIdToken($token);
-            $decoded = FirebaseAuth::verifyIdToken($token);
+            $uid = $decoded->getClaim('sub');
-            $uid = $decoded->getClaim('sub');
+            $user = User::where('provider_id', $uid)->get();
-            $user = User::where('provider_id', $uid)->get();
+            $user = $user[0] ?? null;
-            $user = $user[0] ?? null;
+
-
+            if (!$user) {
-            if (!$user) {
+                /** @var \Kreait\Firebase\Auth\UserRecord $data */
-                /** @var \Kreait\Firebase\Auth\UserRecord $data */
+                $data = FirebaseAuth::getUser($uid);
-                $data = FirebaseAuth::getUser($uid);
+                $user = new User();
-                $user = new User();
+                $user->provider_id = $data->uid;
-                $user->provider_id = $data->uid;
+                $user->email = $data->email;
-                $user->email = $data->email;
+                $user->name = $data->displayName ?? 'No Name User';
-                $user->name = $data->displayName ?? 'No Name User';
+                $user->image = $data->photoUrl ?? '';
-                $user->image = $data->photoUrl ?? '';
+                $user->save();
-                $user->save();
+            }
-            }
+
-
+            return $user;
-            return $user;
+        } catch (\Exception $e) {
-        } catch (\Exception $e) {
+            return null;
-            return null;
+        };
-        };
+    }
-    }
+}
-}

database/seeds/FormatSeeder.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Model\Format;
 use Illuminate\Database\Seeder;
 
 class FormatSeeder extends Seeder
@@ -11,7 +12,7 @@ class FormatSeeder extends Seeder
      */
     public function run()
     {
-        \App\Model\Format::create(['name' => 'Commander']);
+        Format::firstOrCreate(['name' => 'Commander']);
-        \App\Model\Format::create(['name' => 'Brawl']);
+        Format::firstOrCreate(['name' => 'Brawl']);
     }
 }