Merge branch 'master' of https://github.com/firevel/firebase-authenti…

…cation
firevel · Oct 14, 2020 · fe1cde0 · fe1cde0
2 parents dbb9352 + d01b76e
commit fe1cde0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/FirebaseAuthenticationServiceProvider.php b/src/FirebaseAuthenticationServiceProvider.php
@@ -31,9 +31,15 @@ public function boot()
     public function register()
     {
         $this->app->singleton(Verifier::class, function ($app) {
+            $project = config('firebase.project_id', env('GOOGLE_CLOUD_PROJECT'));
+
+            if (empty($project)) {
+                throw new \Exception('Missing GOOGLE_CLOUD_PROJECT env variable.');
+            }
+
             $keyStore = new HttpKeyStore(null, cache()->store());
 
-            return new Verifier(config('firebase.project_id', env('GOOGLE_CLOUD_PROJECT')), $keyStore);
+            return new Verifier($project, $keyStore);
         });
     }
 }
diff --git a/src/FirebaseGuard.php b/src/FirebaseGuard.php
@@ -35,6 +35,10 @@ public function user(Request $request)
     {
         $token = $request->bearerToken();
 
+        if (empty($token)) {
+            return;
+        }
+
         try {
             $token = $this->verifier->verifyIdToken($token);
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,10 @@ public function user(Request $request) @@
         {
             $token = $request->bearerToken();
+            if (empty($token)) {
+                return;
+            }
             try {
                 $token = $this->verifier->verifyIdToken($token);
@@ Expand Down @@