Dev master

.gitattributes

@@ -1,13 +1,13 @@
 * text=auto
 
 /tests export-ignore
+/docs export-ignore
 /.codecov.yml export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.styleci.yml export-ignore
 /.travis.yml export-ignore
-/CODE_OF_CONDUCT.md export-ignore
-/CONTRIBUTING.md export-ignore
+/.github export-ignore
 /phpunit.xml.dist export-ignore
 /README.md export-ignore

.github/workflows/run-tests.yml

@@ -0,0 +1,44 @@
+name: Run tests
+
+on:
+  push:
+
+jobs:
+  php-tests:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        php: [7.4]
+        laravel: [6.*, 7.*]
+        os: [ubuntu-latest, windows-latest]
+        coverage: ['none', 'xdebug']
+
+    name: '[P${{ matrix.php }}] [L${{ matrix.laravel }}] [${{ matrix.os }}] [${{ matrix.coverage }}]'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, gmp, exif, iconv, imagick
+          coverage: ${{ matrix.coverage }}
+
+      - name: Install dependencies
+        run: |
+          composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --prefer-stable --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: composer test:ci
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v1
+        if: matrix.coverage == 'xdebug'
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          yml: ./codecov.yml

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 build
 coverage.xml
+/.phpunit.*

.styleci.yml

@@ -6,5 +6,4 @@ enabled:
   - phpdoc_order
   - phpdoc_separation
   - unalign_double_arrow
-
-linting: true
+  - php_unit_no_expectation_annotation

.travis.yml

@@ -15,64 +15,14 @@ env:
 
 matrix:
   include:
-    - php: hhvm-3.18
-      sudo: required
-      dist: trusty
-      env: LARAVEL='5.4.*' XDEBUG=1
-      group: edge
-    - php: 5.5.9
-      env: LARAVEL='5.1.*'
-    - php: 5.5.9
-      env: LARAVEL='5.2.*'
-    - php: 5.5
-      env: LARAVEL='5.1.*'
-    - php: 5.5
-      env: LARAVEL='5.2.*'
-    - php: 5.6
-      env: LARAVEL='5.1.*'
-    - php: 5.6
-      env: LARAVEL='5.2.*'
-    - php: 5.6
-      env: LARAVEL='5.3.*'
-    - php: 5.6
-      env: LARAVEL='5.4.*'
-    - php: 7.0
-      env: LARAVEL='5.1.*'
-    - php: 7.0
-      env: LARAVEL='5.2.*'
-    - php: 7.0
-      env: LARAVEL='5.3.*'
-    - php: 7.0
-      env: LARAVEL='5.4.*'
-    - php: 7.0
-      env: LARAVEL='5.5.*'
-    - php: 7.1
-      env: LARAVEL='5.1.*'
-    - php: 7.1
-      env: LARAVEL='5.2.*'
-    - php: 7.1
-      env: LARAVEL='5.3.*'
-    - php: 7.1
-      env: LARAVEL='5.4.*'
-    - php: 7.1
-      env: LARAVEL='5.5.*'
-    - php: 7.1
-      env: LARAVEL='5.6.*'
-    - php: 7.2
-      env: LARAVEL='5.1.*' XDEBUG=1
-    - php: 7.2
-      env: LARAVEL='5.2.*' XDEBUG=1
-    - php: 7.2
-      env: LARAVEL='5.3.*' XDEBUG=1
-    - php: 7.2
-      env: LARAVEL='5.4.*' XDEBUG=1
-    - php: 7.2
-      env: LARAVEL='5.5.*' XDEBUG=1
-    - php: 7.2
-      env: COVERAGE=1 LARAVEL='5.6.*' XDEBUG=1
+    - php: 7.4
+      env: LARAVEL='5.7.*' XDEBUG=1
+    - php: 7.4
+      env: LARAVEL='5.8.*' XDEBUG=1
+    - php: 7.4
+      env: COVERAGE=1 LARAVEL='6.*' XDEBUG=1
   fast_finish: true
 
-
 before_install:
   - if [[ $XDEBUG = 0 ]]; then phpenv config-rm xdebug.ini; fi
   - travis_retry composer self-update
@@ -82,8 +32,7 @@ install:
   - travis_retry composer install --prefer-dist --no-interaction --no-suggest
 
 script:
-  - if [[ $LARAVEL = '5.1.*' ]]; then composer test:ci -- --exclude-group laravel-5.2; fi
-  - if [[ $LARAVEL != '5.1.*' ]]; then composer test:ci; fi
+  - composer test:ci
 
 after_success:
   - if [[ $COVERAGE = 1 ]]; then bash <(curl -s https://codecov.io/bash); fi

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Sean Tymon
+Copyright (c) Sean Tymon
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,13 +1,11 @@
 ![jwt-auth-banner](https://cloud.githubusercontent.com/assets/1801923/9915273/119b9350-5cae-11e5-850b-c941cac60b32.png)
 
-[![Build Status](http://img.shields.io/travis/tymondesigns/jwt-auth/master.svg?style=flat-square)](https://travis-ci.org/tymondesigns/jwt-auth)
-[![Codecov branch](https://img.shields.io/codecov/c/github/tymondesigns/jwt-auth/develop.svg?style=flat-square)](https://codecov.io/github/tymondesigns/jwt-auth)
-[![StyleCI](https://styleci.io/repos/23680678/shield?style=flat-square)](https://styleci.io/repos/23680678)
-[![Latest Version](http://img.shields.io/packagist/v/tymon/jwt-auth.svg?style=flat-square)](https://packagist.org/packages/tymon/jwt-auth)
-[![Latest Dev Version](https://img.shields.io/packagist/vpre/tymon/jwt-auth.svg?style=flat-square)](https://packagist.org/packages/tymon/jwt-auth#dev-develop)
-[![Monthly Downloads](https://img.shields.io/packagist/dm/tymon/jwt-auth.svg?style=flat-square)](https://packagist.org/packages/tymon/jwt-auth)
-[![Dependency Status](https://www.versioneye.com/php/tymon:jwt-auth/dev-develop/badge?style=flat-square)](https://www.versioneye.com/php/tymon:jwt-auth/dev-develop)
-[![PHP-Eye](https://php-eye.com/badge/tymon/jwt-auth/tested.svg?style=flat-square)](https://php-eye.com/package/tymon/jwt-auth)
+[![Build Status](http://img.shields.io/travis/tymondesigns/jwt-auth/master.svg?style=flat-square&logo=travis)](https://travis-ci.org/tymondesigns/jwt-auth)
+[![Codecov branch](https://img.shields.io/codecov/c/github/tymondesigns/jwt-auth/develop.svg?style=flat-square&logo=codecov)](https://codecov.io/github/tymondesigns/jwt-auth)
+[![StyleCI](https://styleci.io/repos/23680678/shield?style=flat-square&logo=styleci)](https://styleci.io/repos/23680678)
+[![Latest Version](http://img.shields.io/packagist/v/tymon/jwt-auth.svg?style=flat-square&logo=packagist)](https://packagist.org/packages/tymon/jwt-auth)
+[![Latest Dev Version](https://img.shields.io/packagist/vpre/tymon/jwt-auth.svg?style=flat-square&logo=packagist)](https://packagist.org/packages/tymon/jwt-auth#dev-develop)
+[![Monthly Downloads](https://img.shields.io/packagist/dm/tymon/jwt-auth.svg?style=flat-square&logo=packagist)](https://packagist.org/packages/tymon/jwt-auth)
 
 ## Documentation
 

composer.json

@@ -23,24 +23,32 @@
         }
     ],
     "require": {
-        "php": "^5.5.9 || ^7.0",
-        "illuminate/auth": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "illuminate/contracts": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "illuminate/http": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+        "php": "^7.4|^8.0.0",
+        "illuminate/contracts": "^6|^7",
+        "illuminate/http": "^6|^7",
+        "illuminate/support": "^6|^7",
         "lcobucci/jwt": "^3.2",
-        "namshi/jose": "^7.0",
-        "nesbot/carbon": "^1.0"
+        "nesbot/carbon": "^2.0",
+        "web-token/jwt-checker": "^2.1",
+        "web-token/jwt-core": "^2.1",
+        "web-token/jwt-key-mgmt": "^2.1",
+        "web-token/jwt-signature": "^2.1",
+        "web-token/jwt-signature-algorithm-ecdsa": "^2.1",
+        "web-token/jwt-signature-algorithm-hmac": "^2.1",
+        "web-token/jwt-signature-algorithm-rsa": "^2.1"
     },
     "require-dev": {
-        "cartalyst/sentinel": "2.0.*",
-        "illuminate/console": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "illuminate/routing": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
-        "mockery/mockery": ">=0.9.9",
-        "phpunit/phpunit": "~4.8 || ~6.0"
+        "illuminate/auth": "^6|^7",
+        "illuminate/console": "^6|^7",
+        "illuminate/database": "^6|^7",
+        "illuminate/routing": "^6|^7",
+        "mockery/mockery": "^1.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
+        "files": [
+            "src/Support/helpers.php"
+        ],
         "psr-4": {
             "Tymon\\JWTAuth\\": "src/"
         }
@@ -52,12 +60,12 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.0-dev"
+            "2.0": "2.0-dev"
         },
         "laravel": {
             "aliases": {
-                "JWTAuth": "Tymon\\JWTAuth\\Facades\\JWTAuth",
-                "JWTFactory": "Tymon\\JWTAuth\\Facades\\JWTFactory"
+                "JWTManager": "Tymon\\JWTAuth\\Facades\\JWTManager",
+                "JWTProvider": "Tymon\\JWTAuth\\Facades\\JWTProvider"
             },
             "providers": [
                 "Tymon\\JWTAuth\\Providers\\LaravelServiceProvider"

config/config.php

@@ -9,6 +9,8 @@
  * file that was distributed with this source code.
  */
 
+use Tymon\JWTAuth\Claims;
+
 return [
 
     /*
@@ -91,7 +93,7 @@
     |--------------------------------------------------------------------------
     |
     | Specify the length of time (in minutes) that the token will be valid for.
-    | Defaults to 1 hour.
+    | Defaults to 30 minutes.
     |
     | You can also set this to null, to yield a never expiring token.
     | Some people may want this behaviour for e.g. a mobile app.
@@ -100,26 +102,21 @@
     |
     */
 
-    'ttl' => env('JWT_TTL', 60),
+    'ttl' => env('JWT_TTL', 30),
 
     /*
     |--------------------------------------------------------------------------
-    | Refresh time to live
+    | Max refresh period
     |--------------------------------------------------------------------------
     |
-    | Specify the length of time (in minutes) that the token can be refreshed
-    | within. I.E. The user can refresh their token within a 2 week window of
-    | the original token being created until they must re-authenticate.
-    | Defaults to 2 weeks.
+    | Specify the length of time (in minutes) that the token will be
+    | refreshable for.
     |
-    | You can also set this to null, to yield an infinite refresh time.
-    | Some may want this instead of never expiring tokens for e.g. a mobile app.
-    | This is not particularly recommended, so make sure you have appropriate
-    | systems in place to revoke the token if necessary.
+    | Defaults to null, which will allow tokens to be refreshable forever.
     |
     */
 
-    'refresh_ttl' => env('JWT_REFRESH_TTL', 20160),
+    'max_refresh_period' => env('JWT_MAX_REFRESH_PERIOD'),
 
     /*
     |--------------------------------------------------------------------------
@@ -128,8 +125,11 @@
     |
     | Specify the hashing algorithm that will be used to sign the token.
     |
-    | See here: https://github.com/namshi/jose/tree/master/src/Namshi/JOSE/Signer/OpenSSL
-    | for possible values.
+    | Possible values:
+    |
+    | 'HS256', 'HS384', 'HS512',
+    | 'RS256', 'RS384', 'RS512',
+    | 'ES256', 'ES384', 'ES512'
     |
     */
 
@@ -147,42 +147,24 @@
     */
 
     'required_claims' => [
-        'iss',
-        'iat',
-        'exp',
-        'nbf',
-        'sub',
-        'jti',
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Persistent Claims
-    |--------------------------------------------------------------------------
-    |
-    | Specify the claim keys to be persisted when refreshing a token.
-    | `sub` and `iat` will automatically be persisted, in
-    | addition to the these claims.
-    |
-    | Note: If a claim does not exist then it will be ignored.
-    |
-    */
-
-    'persistent_claims' => [
-        // 'foo',
-        // 'bar',
+        Claims\Issuer::NAME,
+        Claims\IssuedAt::NAME,
+        Claims\Expiration::NAME,
+        Claims\Subject::NAME,
+        Claims\JwtId::NAME,
     ],
 
     /*
     |--------------------------------------------------------------------------
     | Lock Subject
     |--------------------------------------------------------------------------
     |
-    | This will determine whether a `prv` claim is automatically added to
-    | the token. The purpose of this is to ensure that if you have multiple
-    | authentication models e.g. `App\User` & `App\OtherPerson`, then we
-    | should prevent one authentication request from impersonating another,
-    | if 2 tokens happen to have the same id across the 2 different models.
+    | This will determine whether a HashedSubject (hsu) claim is automatically
+    | added to the token. The purpose of this is to ensure that if you have
+    | multiple authentication models e.g. `App\User` & `App\OtherPerson`,
+    | then we should prevent one authentication request from impersonating
+    | another, if 2 tokens happen to have the same id across the 2 different
+    | models.
     |
     | Under specific circumstances, you may want to disable this behaviour
     | e.g. if you only have one authentication model, then you would save
@@ -276,17 +258,6 @@
 
         'jwt' => Tymon\JWTAuth\Providers\JWT\Lcobucci::class,
 
-        /*
-        |--------------------------------------------------------------------------
-        | Authentication Provider
-        |--------------------------------------------------------------------------
-        |
-        | Specify the provider that is used to authenticate users.
-        |
-        */
-
-        'auth' => Tymon\JWTAuth\Providers\Auth\Illuminate::class,
-
         /*
         |--------------------------------------------------------------------------
         | Storage Provider

docs/_coverpage.md

@@ -0,0 +1,11 @@
+# jwt-auth
+
+> JSON Web Token Authentication for Laravel & Lumen
+
+- Simple and lightweight (~21kB gzipped)
+- No statically built html files
+- Multiple themes
+
+[Get Started](laravel-installation.md)
+[GitHub](https://github.com/tymondesigns/jwt-auth)
+