Merge pull request #19 from cristianopacheco/update_jwt_lib

This closes #10

Thanks a lot @cristianopacheco

Author: vedovelli

README.md

@@ -44,6 +44,7 @@ Make sure you have installed **Node** and [**Yarn**](https://yarnpkg.com/) (late
         * `touch database/database.sqlite` to create an empty database file
         * `cp .env.example .env` to configure installation
         * `php artisan key:generate` to generate unique key for the project
+        * `php artisan jwt:secret` to generate unique key for the project
         * `php artisan migrate` to create all the tables
         * `php artisan db:seed` to fill the tables with fake data
         * `php artisan serve` to serve application on localhost:8000

webservice/.env.example

@@ -33,3 +33,5 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_KEY=
 PUSHER_SECRET=
+
+JWT_SECRET=

webservice/app/Http/Controllers/LoginController.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Auth;
-use JWTAuth;
 use JWTException;
 
 class LoginController extends Controller
@@ -16,15 +15,15 @@ public function login(Request $request)
 
         try {
             // attempt to verify the credentials and create a token for the user
-            if (! $token = JWTAuth::attempt($credentials)) {
+            if (!$token = Auth::guard('api')->attempt($credentials)) {
                 return response()->json(['messages' => ['E-mail ou senha não conferem']], 401);
             }
         } catch (JWTException $e) {
             // something went wrong whilst attempting to encode the token
             return response()->json(['messages' => ['Não foi possível gerar o token']], 500);
         }
 
-        $user = Auth::user();
+        $user = Auth::guard('api')->user();
 
         // all good so return the token
         return response()->json(compact('token', 'user'));

webservice/app/User.php

@@ -4,8 +4,9 @@
 
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Tymon\JWTAuth\Contracts\JWTSubject;
 
-class User extends Authenticatable
+class User extends Authenticatable implements JWTSubject
 {
     use Notifiable;
 
@@ -26,4 +27,14 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    public function getJWTIdentifier()
+    {
+        return $this->id;
+    }
+
+    public function getJWTCustomClaims()
+    {
+        return [];
+    }
 }

webservice/composer.json

@@ -4,11 +4,13 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "type": "project",
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "require": {
         "php": ">=5.6.4",
         "laravel/framework": "5.3.*",
         "barryvdh/laravel-cors": "^0.8.2",
-        "tymon/jwt-auth": "0.5.*",
+        "tymon/jwt-auth": "~1.0",
         "predis/predis": "^1.1"
     },
     "require-dev": {