Merge pull request #94 from sashahilton00/master

Fix X-Authorization Error
chrisbjr · Feb 9, 2016 · eeb59f2 · eeb59f2
2 parents d76e382 + 0d1a64a
commit eeb59f2
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Http/Middleware/ApiGuard.php b/src/Http/Middleware/ApiGuard.php
@@ -192,14 +192,22 @@ public function handle($request, Closure $next, $serializedApiMethods=null)
 
         // login User
         $headers = apache_request_headers();
-        $api_key = $headers[Config::get('apiguard.keyName', 'X-Authorization')];
+        //$api_key = $headers[Config::get('apiguard.keyName', 'X-Authorization')];
+
+        if (empty($headers[Config::get('apiguard.keyName', 'X-Authorization')])) {
+            $api_key = null;
+        } else {
+            $api_key = $headers[Config::get('apiguard.keyName', 'X-Authorization')];
+        }
+
+        if(!empty($api_key)) {
 
         $user_id = App::make(Config::get('apiguard.model', 'Chrisbjr\ApiGuard\Models\ApiKey'))->where('key', $api_key)
             ->pluck('user_id');
 
         if($user_id !== 0)
             Auth::loginUsingId($user_id);
-
+        }
         return $next($request);
     }
 }