Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion flask_jwt_extended/view_decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ def verify_jwt_in_request(
is in the request.
"""
if request.method in config.exempt_methods:
return None
if not optional:
g._jwt_extended_jwt = {}
g._jwt_extended_jwt_header = {}
g._jwt_extended_jwt_user = {"loaded_user": None}
g._jwt_extended_jwt_location = None
return None

try:
jwt_data, jwt_header, jwt_location = _decode_jwt_from_request(
Expand Down
27 changes: 26 additions & 1 deletion tests/test_options_method.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import pytest
from flask import Flask

from flask_jwt_extended import create_access_token
from flask_jwt_extended import get_jwt_identity
from flask_jwt_extended import jwt_required
from flask_jwt_extended import JWTManager

Expand All @@ -14,7 +16,13 @@ def app():
@app.route("/jwt_required", methods=["GET", "OPTIONS"])
@jwt_required()
def jwt_required_endpoint():
return "ok"
return get_jwt_identity() or "ok"

@app.route("/jwt_optional", methods=["GET", "OPTIONS"])
@jwt_required(optional=True)
def jwt_optional_endpoint():
identity = get_jwt_identity()
return identity if identity is not None else "none"

@app.route("/fresh_jwt_required", methods=["GET", "OPTIONS"])
@jwt_required(fresh=True)
Expand All @@ -35,6 +43,23 @@ def test_access_jwt_required_enpoint(app):
assert res.data == b"ok"


def test_access_jwt_optional_endpoint_without_token(app):
res = app.test_client().options("/jwt_optional")
assert res.status_code == 200
assert res.data == b"none"


def test_access_jwt_optional_endpoint_with_token(app):
with app.test_request_context():
token = create_access_token(identity="test_user")

res = app.test_client().options(
"/jwt_optional", headers={"Authorization": f"Bearer {token}"}
)
assert res.status_code == 200
assert res.data == b"test_user"


def test_access_jwt_refresh_token_required_enpoint(app):
res = app.test_client().options("/jwt_refresh_token_required")
assert res.status_code == 200
Expand Down