From be75e929f1fef54e2a8ce5cd21dfcc8db31316a4 Mon Sep 17 00:00:00 2001 From: Kevin ANATOLE Date: Sat, 31 Oct 2020 21:50:36 +0000 Subject: [PATCH] Chores - Renamed the FirebaseMiddleware file - Changed the seeder to not overwrite any data --- ...eMIddleware.php => FirebaseMiddleware.php} | 133 +++++++++--------- database/seeds/FormatSeeder.php | 5 +- 2 files changed, 69 insertions(+), 69 deletions(-) rename app/Http/Middleware/{FirebaseMIddleware.php => FirebaseMiddleware.php} (94%) diff --git a/app/Http/Middleware/FirebaseMIddleware.php b/app/Http/Middleware/FirebaseMiddleware.php similarity index 94% rename from app/Http/Middleware/FirebaseMIddleware.php rename to app/Http/Middleware/FirebaseMiddleware.php index 1fd1d7f..f5e2a90 100644 --- a/app/Http/Middleware/FirebaseMIddleware.php +++ b/app/Http/Middleware/FirebaseMiddleware.php @@ -1,67 +1,66 @@ -bearerToken(); - if (!$token) { - return response()->json('No token provided', 403); - } - - $user = $this->validateToken($token); - - if ($user === null) { - return response()->json('User not found', 403); - } - $request->request->add(['user' => $user]); - - return $next($request); - } - - public function validateToken($token) - { - try { - $decoded = FirebaseAuth::verifyIdToken($token); - $uid = $decoded->getClaim('sub'); - $user = User::where('provider_id', $uid)->get(); - $user = $user[0] ?? null; - - if (!$user) { - /** @var \Kreait\Firebase\Auth\UserRecord $data */ - $data = FirebaseAuth::getUser($uid); - $user = new User(); - $user->provider_id = $data->uid; - $user->email = $data->email; - $user->name = $data->displayName ?? 'No Name User'; - $user->image = $data->photoUrl ?? ''; - $user->save(); - } - - return $user; - } catch (\Exception $e) { - return null; - }; - } -} +bearerToken(); + if (!$token) { + return response()->json('No token provided', 403); + } + + $user = $this->validateToken($token); + + if ($user === null) { + return response()->json('User not found', 403); + } + $request->request->add(['user' => $user]); + + return $next($request); + } + + public function validateToken($token) + { + try { + $decoded = FirebaseAuth::verifyIdToken($token); + $uid = $decoded->getClaim('sub'); + $user = User::where('provider_id', $uid)->get(); + $user = $user[0] ?? null; + + if (!$user) { + /** @var \Kreait\Firebase\Auth\UserRecord $data */ + $data = FirebaseAuth::getUser($uid); + $user = new User(); + $user->provider_id = $data->uid; + $user->email = $data->email; + $user->name = $data->displayName ?? 'No Name User'; + $user->image = $data->photoUrl ?? ''; + $user->save(); + } + + return $user; + } catch (\Exception $e) { + return null; + }; + } +} diff --git a/database/seeds/FormatSeeder.php b/database/seeds/FormatSeeder.php index f6737ac..2ab2144 100644 --- a/database/seeds/FormatSeeder.php +++ b/database/seeds/FormatSeeder.php @@ -1,5 +1,6 @@ 'Commander']); - \App\Model\Format::create(['name' => 'Brawl']); + Format::firstOrCreate(['name' => 'Commander']); + Format::firstOrCreate(['name' => 'Brawl']); } }