ApiToken docs and filter update.

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }

docs/guides/api-tokens.md

@@ -0,0 +1,78 @@
+# Protecting an API with Access Tokens
+
+Access Tokens can be used to authenticate users for your own site, or when allowing third-party developers to access your API. When making requests using access tokens, the token should be included in the `Authorization` header as a `Bearer` token.
+
+Tokens are issued with the `generateAccessToken()` method on the user. This returns a `CodeIgniter\Shield\Entities\AccessToken` instance. Tokens are hashed using a SHA-256 algorithm before being saved to the database. The access token returned when you generate it will include a `raw_token` field that contains the plain-text, un-hashed, token. You should display this to your user at once so they have a chance to copy it somewhere safe, as this is the only time this will be available. After this request, there is no way to get the raw token.
+
+The `generateAccessToken()` method requires a name for the token. These are free strings and are often used to identify the user/device the token was generated from, like 'Johns MacBook Air'.
+
+```php
+$routes->get('/access/token', static function() {
+ $token = auth()->user()->generateAccessToken(service('request')->getVar('token_name));
+
+ return json_encode(['token' => $token->raw_token]);
+});
+```
+
+You can access all of the user's tokens with the `accessTokens()` method on that user.
+
+```php
+$tokens = $user->accessTokens();
+foreach($tokens as $token) {
+ //
+}
+```
+
+## Token Permissions
+
+Access tokens can be given `scopes`, which are basically permission strings, for the token. This is generally not the same as the permission the user has, but is used to specify the permissions on the API itself. If not specified, the token is granted all access to all scopes. This might be enough for a smaller API.
+
+```php
+return $user->generateAccessToken('token-name', ['users-read'])->raw_token;
+```
+
+> **Note**
+> At this time, scope names should avoid using a colon (`:`) as this causes issues with the route filters being correctly recognized.
+
+When handling incoming requests you can check if the token has been granted access to the scope with the `tokenCan()` method.
+
+```php
+if ($user->tokenCan('users-read')) {
+ //
+}
+```
+
+### Revoking Tokens
+
+Tokens can be revoked by deleting them from the database with the `revokeAccessToken($rawToken)` or `revokeAllAccessTokens()` methods.
+
+```php
+$user->revokeAccessToken($rawToken);
+$user->revokeAllAccessTokens();
+```
+
+## Protecting Routes
+
+The first way to specify which routes are protected is to use the `tokens` controller filter.
+
+For example, to ensure it protects all routes under the `/api` route group, you would use the `$filters` setting on `app/Config/Filters.php`.
+
+```php
+public $filters = [
+ 'tokens' => ['before' => ['api/*']],
+];
+```
+
+You can also specify the filter should run on one or more routes within the routes file itself:
+
+```php
+$routes->group('api', ['filter' => 'tokens'], function($routes) {
+ //
+});
+$routes->get('users', 'UserController::list', ['filter' => 'tokens:users-read']);
+```
+
+When the filter runs, it checks the `Authorization` header for a `Bearer` value that has the raw token. It then hashes the raw token and looks it up in the database. Once found, it can determine the correct user, which will then be available through an `auth()->user()` call.
+
+> **Note**
+> Currently only a single scope can be used on a route filter. If multiple scopes are passed in, only the first one is checked.

docs/index.md

@@ -9,3 +9,6 @@
 * [Events](events.md)
 * [Testing](testing.md)
 * [Customization](customization.md)
+
+Guides:
+* [Protecting an API with Access Tokens](guides/api-tokens.md)

src/Filters/TokenAuth.php

@@ -48,7 +48,7 @@ public function before(RequestInterface $request, $arguments = null)
  'token' => $request->getHeaderLine(setting('Auth.authenticatorHeader')['tokens'] ?? 'Authorization'),
  ]);
 
- if (! $result->isOK()) {
+ if (! $result->isOK() || (! empty($arguments) && $result->extraInfo()->tokenCant($arguments[0]))) {
  return redirect()->to('/login');
  }
 

tests/Authentication/Filters/AbstractFilterTest.php

@@ -61,6 +61,9 @@ static function ($routes): void {
  echo 'Open';
  });
  $routes->get('login', 'AuthController::login', ['as' => 'login']);
+ $routes->get('protected-user-route', static function (): void {
+ echo 'Protected';
+ }, ['filter' => $this->alias . ':users-read']);
 
  Services::injectMock('routes', $routes);
  }

tests/Authentication/Filters/TokenFilterTest.php

@@ -63,4 +63,27 @@ public function testRecordActiveDate(): void
  // Last Active should be greater than 'updated_at' column
  $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
  }
+
+ public function testFiltersProtectsWithScopes(): void
+ {
+ /** @var User $user1 */
+ $user1 = fake(UserModel::class);
+ $token1 = $user1->generateAccessToken('foo', ['users-read']);
+ /** @var User $user2 */
+ $user2 = fake(UserModel::class);
+ $token2 = $user2->generateAccessToken('foo', ['users-write']);
+
+ // User 1 should be able to access the route
+ $this->withHeaders(['Authorization' => 'Bearer ' . $token1->raw_token])
+ ->get('protected-user-route');
+
+ // Last Active should be greater than 'updated_at' column
+ $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+
+ // User 2 should NOT be able to access the route
+ $result = $this->withHeaders(['Authorization' => 'Bearer ' . $token2->raw_token])
+ ->get('protected-user-route');
+
+ $result->assertRedirectTo('/login');
+ }
 }