dsd-meetme / backend

app/Http/Controllers/Companies/Auth/AuthController.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -2,11 +2,11 @@
 
 namespace plunner\Http\Controllers\Companies\Auth;
 
-use plunner\Company;
-use Validator;
-use plunner\Http\Controllers\Controller;
 use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers;
 use Tymon\JWTAuth\Support\auth\ThrottlesLogins;
+use Validator;
+use plunner\Company;
+use plunner\Http\Controllers\Controller;
 
 class AuthController extends Controller
 {

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode'=>'cn'];
+    protected $custom = [ 'mode'=>'cn' ];
 
     /**
      * Create a new authentication controller instance.
@@ -48,8 +48,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
     }
 
     /**
@@ -76,22 +76,22 @@ 
     protected function create(array $data)
     {
         return Company::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
 
     public function postLogin(Request $request)
     {
         //remember me
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
-        if($request->input('remember', false))
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
+        if ($request->input('remember', false))
         {
-            config(['jwt.ttl' =>'43200']); //30 days
-            $this->custom = array_merge($this->custom, ['remember'=>'true']);
-        }else
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
+        } else
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
         return $this->postLoginOriginal($request);
     }
 

Braces +3 added lines, -2 removed lines

@@ -90,8 +90,9 @@
         {
             config(['jwt.ttl' =>'43200']); //30 days
             $this->custom = array_merge($this->custom, ['remember'=>'true']);
-        }else
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
+        } else {
+                    $this->custom = array_merge($this->custom, ['remember'=>'false']);
+        }
         return $this->postLoginOriginal($request);
     }
 

app/Http/Controllers/Employees/Auth/AuthController.php

Unused Use Statements +4 added lines, -5 removed lines

@@ -3,13 +3,12 @@
 namespace plunner\Http\Controllers\Employees\Auth;
 
 use Illuminate\Http\Request;
-use plunner\Company;
-use plunner\employee;
-use Validator;
-use plunner\Http\Controllers\Controller;
 use Tymon\JWTAuth\Support\auth\AuthenticatesAndRegistersUsers;
 use Tymon\JWTAuth\Support\auth\ThrottlesLogins;
-use Log;
+use Validator;
+use plunner\Company;
+use plunner\Http\Controllers\Controller;
+use plunner\employee;
 
 class AuthController extends Controller
 {

Spacing +15 added lines, -15 removed lines

@@ -43,7 +43,7 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode'=>'en'];
+    protected $custom = [ 'mode'=>'en' ];
 
     /**
      * @var company
@@ -56,8 +56,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
     }
 
     /**
@@ -84,15 +84,15 @@ 
     protected function create(array $data)
     {
         return $this->company->save(new employee([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]));
     }
 
     public function postRegister(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
         return $this->postRegisterOriginal($request);
     }
@@ -101,18 +101,18 @@ 
     public function postLogin(Request $request)
     {
         //get company ID and impiled it in the request
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
 
         //remember me
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
-        if($request->input('remember', false))
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
+        if ($request->input('remember', false))
         {
-            config(['jwt.ttl' =>'43200']); //30 days
-            $this->custom = array_merge($this->custom, ['remember'=>'true']);
-        }else
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
+        } else
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
 
         return $this->postLoginOriginal($request);
     }

Braces +3 added lines, -2 removed lines

@@ -111,8 +111,9 @@
         {
             config(['jwt.ttl' =>'43200']); //30 days
             $this->custom = array_merge($this->custom, ['remember'=>'true']);
-        }else
-            $this->custom = array_merge($this->custom, ['remember'=>'false']);
+        } else {
+                    $this->custom = array_merge($this->custom, ['remember'=>'false']);
+        }
 
         return $this->postLoginOriginal($request);
     }

app/Http/Middleware/GetUserAndRefresh.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 24/12/15
- * Time: 22.53
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 24/12/15
+     * Time: 22.53
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Http\Middleware;
 

Spacing +4 added lines, -4 removed lines

@@ -25,14 +25,14 @@
     public function handle($request, \Closure $next, $custom = '')
     {
         $remember = false;
-        if($this->auth->setRequest($request)->getToken() && $remember = $this->auth->getPayload()->get('remember') &&
-                $remember == 'true'){
-            config(['jwt.ttl' =>'43200']); //30 days
+        if ($this->auth->setRequest($request)->getToken() && $remember = $this->auth->getPayload()->get('remember') &&
+                $remember == 'true') {
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
         }
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom.';remember-'.$remember?'true':'false';
+        $custom = $custom.';remember-'.$remember ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }
 

app/Http/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
         'auth' => \plunner\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
-        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
+        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
     ];
 }