From edf4919810b70cf153cfa5a20dd1cb023bfce0d4 Mon Sep 17 00:00:00 2001 From: Illia Volochii Date: Wed, 26 Dec 2018 22:23:57 +0200 Subject: [PATCH 1/2] Update docs according to c5f32c337d8d191e93ab80152640090ddb664639 --- docs/options.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/options.rst b/docs/options.rst index 4b9e66ab..7434b860 100644 --- a/docs/options.rst +++ b/docs/options.rst @@ -17,8 +17,8 @@ General Options: ================================= ========================================= ``JWT_TOKEN_LOCATION`` Where to look for a JWT when processing a request. The options are ``'headers'``, ``'cookies'``, ``'query_string'``, or ``'json'``. You can pass - in a list to check more then one location, such as: ``['headers', 'cookies']``. - Defaults to ``'headers'`` + in a sequence or a set to check more then one location, such as: + ``('headers', 'cookies')``. Defaults to ``('headers',)`` ``JWT_ACCESS_TOKEN_EXPIRES`` How long an access token should live before it expires. This takes a ``datetime.timedelta``, and defaults to 15 minutes. Can be set to ``False`` to disable expiration. @@ -155,7 +155,7 @@ Blacklist Options: ================================= ========================================= ``JWT_BLACKLIST_ENABLED`` Enable/disable token revoking. Defaults to ``False`` ``JWT_BLACKLIST_TOKEN_CHECKS`` What token types to check against the blacklist. The options are - ``'refresh'`` or ``'access'``. You can pass in a list to check - more then one type. Defaults to ``['access', 'refresh']``. + ``'refresh'`` or ``'access'``. You can pass in a sequence or a set to check + more then one type. Defaults to ``('access', 'refresh')``. Only used if blacklisting is enabled. ================================= ========================================= From ae2dad86242f9228bd2209603e18196a7148e9a8 Mon Sep 17 00:00:00 2001 From: Illia Volochii Date: Thu, 10 Jan 2019 21:59:21 +0200 Subject: [PATCH 2/2] Change default value of `JWT_TOKEN_LOCATION` to list in documentation --- docs/options.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/options.rst b/docs/options.rst index 7d6b7273..a3797546 100644 --- a/docs/options.rst +++ b/docs/options.rst @@ -18,7 +18,7 @@ General Options: ``JWT_TOKEN_LOCATION`` Where to look for a JWT when processing a request. The options are ``'headers'``, ``'cookies'``, ``'query_string'``, or ``'json'``. You can pass in a sequence or a set to check more then one location, such as: - ``('headers', 'cookies')``. Defaults to ``('headers',)`` + ``('headers', 'cookies')``. Defaults to ``['headers']`` ``JWT_ACCESS_TOKEN_EXPIRES`` How long an access token should live before it expires. This takes a ``datetime.timedelta``, and defaults to 15 minutes. Can be set to ``False`` to disable expiration.