@@ -9,7 +9,6 @@ |
||
9 | 9 | use plunner\Http\Controllers\Controller; |
10 | 10 | use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers; |
11 | 11 | use Tymon\JWTAuth\Support\auth\ThrottlesLogins; |
12 | -use Log; |
|
13 | 12 | |
14 | 13 | class AuthController extends Controller |
15 | 14 | { |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use plunner\Http\Requests; |
|
8 | 6 | use plunner\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class GroupsController extends Controller |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use plunner\Http\Requests; |
|
8 | 6 | use plunner\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class GroupsController extends Controller |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace plunner\Http\Controllers\Employees; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use plunner\Http\Requests; |
|
8 | 6 | use plunner\Http\Controllers\Controller; |
9 | 7 | |
10 | 8 | class GroupsController extends Controller |
@@ -23,9 +23,9 @@ |
||
23 | 23 | $custom = $this->convertToArray($custom); |
24 | 24 | Debug::info('headers: '.implode('-',$request->all())); |
25 | 25 | if($token = $this->auth->setRequest($request)->getToken()) { |
26 | - }else if ($this->auth->getUserModel()){ |
|
26 | + } else if ($this->auth->getUserModel()){ |
|
27 | 27 | $token = $this->auth->fromUser($this->auth->getUserModel(), $custom); |
28 | - }else { |
|
28 | + } else { |
|
29 | 29 | return $this->respond('tymon.jwt.absent', 'token_not_provided', 401); |
30 | 30 | } |
31 | 31 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace plunner\Http\Middleware; |
4 | 4 | |
5 | -use Doctrine\Common\Util\Debug; |
|
6 | 5 | use Log; |
7 | 6 | use Tymon\JWTAuth\Exceptions\JWTException; |
8 | 7 | use Tymon\JWTAuth\Exceptions\TokenExpiredException; |
@@ -64,8 +64,9 @@ |
||
64 | 64 | $str = explode(';', $str); |
65 | 65 | foreach($str as $value) { |
66 | 66 | $tmp = explode('-', $value); |
67 | - if(count($tmp) != 2) |
|
68 | - return []; |
|
67 | + if(count($tmp) != 2) { |
|
68 | + return []; |
|
69 | + } |
|
69 | 70 | $ret[$tmp[0]] = $tmp[1]; |
70 | 71 | } |
71 | 72 | return $ret; |