dsd-meetme / backend

app/Http/Middleware/GetUserAndRefresh.php

Spacing +13 added lines, -13 removed lines

@@ -22,27 +22,27 @@ 
     {
         $custom = $this->convertToArray($custom);
         $headers = $request->headers->all();
-        foreach($headers as $header)
-            Log::info('header: '.implode('-',$header));
+        foreach ($headers as $header)
+            Log::info('header: '.implode('-', $header));
 
-        if($token = $this->auth->setRequest($request)->getToken()) {
-        }else if ($this->auth->getUserModel()){
+        if ($token = $this->auth->setRequest($request)->getToken()) {
+        } else if ($this->auth->getUserModel()) {
             $token = $this->auth->fromUser($this->auth->getUserModel(), $custom);
-        }else {
+        } else {
             return $this->respond('tymon.jwt.absent', 'token_not_provided', 401);
         }
 
         try {
             $user = $this->auth->authenticate($token, $custom);
         } catch (TokenExpiredException $e) {
-            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
-        } catch(InvalidClaimException $e) {
-            return $this->respond('tymon.jwt.invalid', 'claim_invalid', $e->getStatusCode(), [$e]);
+            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [ $e ]);
+        } catch (InvalidClaimException $e) {
+            return $this->respond('tymon.jwt.invalid', 'claim_invalid', $e->getStatusCode(), [ $e ]);
         } catch (JWTException $e) {
-            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [ $e ]);
         }
 
-        if (! $user) {
+        if (!$user) {
             return $this->respond('tymon.jwt.user_not_found', 'user_not_found', 404);
         }
 
@@ -58,13 +58,13 @@ 
         try {
             $newToken = $this->auth->refresh($token, $custom);
         } catch (TokenExpiredException $e) {
-            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [$e]);
+            return $this->respond('tymon.jwt.expired', 'token_expired', $e->getStatusCode(), [ $e ]);
         } catch (JWTException $e) {
-            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [$e]);
+            return $this->respond('tymon.jwt.invalid', 'token_invalid', $e->getStatusCode(), [ $e ]);
         }
 
         // send the refreshed token back to the client
-        $response->headers->set('Authorization', 'Bearer ' . $newToken);
+        $response->headers->set('Authorization', 'Bearer '.$newToken);
 
         return $response;
     }

Braces +5 added lines, -4 removed lines

@@ -22,13 +22,14 @@
     {
         $custom = $this->convertToArray($custom);
         $headers = $request->headers->all();
-        foreach($headers as $header)
-            Log::info('header: '.implode('-',$header));
+        foreach($headers as $header) {
+                    Log::info('header: '.implode('-',$header));
+        }
 
         if($token = $this->auth->setRequest($request)->getToken()) {
-        }else if ($this->auth->getUserModel()){
+        } else if ($this->auth->getUserModel()){
             $token = $this->auth->fromUser($this->auth->getUserModel(), $custom);
-        }else {
+        } else {
             return $this->respond('tymon.jwt.absent', 'token_not_provided', 401);
         }