Don't split header_name into access_header_name and refresh_header_name

This could use some more thought. Curreently, I don't think this would
be a desired feature by anyone, and I want to avoid as much unnecessary
options as possible. But, if this is something people want, I should be
able to just revert this commit to get it back

Author: vimalloc

flask_jwt_extended/config.py

@@ -34,35 +34,13 @@ def jwt_in_cookies(self):
     def jwt_in_headers(self):
         return 'headers' in self.token_location
 
-    @staticmethod
-    def _get_depreciated_header_name():
-        # This used to be the same option for access and refresh header names.
-        # This gives users a warning if they are still using the old behavior
-        old_name = current_app.config.get('JWT_HEADER_NAME', None)
-        if old_name:
-            msg = (
-                "JWT_HEADER_NAME is depreciated. Use JWT_ACCESS_HEADER_NAME "
-                "or JWT_REFRESH_HEADER_NAME instead"
-            )
-            warn(msg, DeprecationWarning)
-        return old_name
-
     @property
-    def access_header_name(self):
-        name = self._get_depreciated_header_name() or \
-               current_app.config['JWT_ACCESS_HEADER_NAME']
+    def header_name(self):
+        name = current_app.config['JWT_HEADER_NAME']
         if not name:
             raise RuntimeError("JWT_ACCESS_HEADER_NAME cannot be empty")
         return name
 
-    @property
-    def refresh_header_name(self):
-        name = self._get_depreciated_header_name() or \
-               current_app.config['JWT_REFRESH_HEADER_NAME']
-        if not name:
-            raise RuntimeError("JWT_REFRESH_HEADER_NAME cannot be empty")
-        return name
-
     @property
     def header_type(self):
         return current_app.config['JWT_HEADER_TYPE']

flask_jwt_extended/decorators.py

@@ -75,13 +75,9 @@ def wrapper(*args, **kwargs):
     return wrapper
 
 
-def _decode_jwt_from_headers(request_type):
-    if request_type == 'access':
-        header_name = config.access_header_name
-        header_type = config.header_type
-    else:
-        header_name = config.refresh_header_name
-        header_type = config.header_type
+def _decode_jwt_from_headers():
+    header_name = config.header_name
+    header_type = config.header_type
 
     # Verify we have the auth header
     jwt_header = request.headers.get(header_name, None)
@@ -146,11 +142,11 @@ def _decode_jwt_from_request(request_type):
             decoded_token = _decode_jwt_from_cookies(request_type)
         except NoAuthorizationError:
             try:
-                decoded_token = _decode_jwt_from_headers(request_type)
+                decoded_token = _decode_jwt_from_headers()
             except NoAuthorizationError:
                 raise NoAuthorizationError("Missing JWT in headers and cookies")
     elif config.jwt_in_headers:
-        decoded_token = _decode_jwt_from_headers(request_type)
+        decoded_token = _decode_jwt_from_headers()
     else:
         decoded_token = _decode_jwt_from_cookies(request_type)
 

flask_jwt_extended/jwt_manager.py

@@ -110,8 +110,7 @@ def _set_default_configuration_options(app):
         app.config.setdefault('JWT_TOKEN_LOCATION', ['headers'])
 
         # Options for JWTs when the TOKEN_LOCATION is headers
-        app.config.setdefault('JWT_ACCESS_HEADER_NAME', 'Authorization')
-        app.config.setdefault('JWT_REFRESH_HEADER_NAME', 'Authorization')
+        app.config.setdefault('JWT_HEADER_NAME', 'Authorization')
         app.config.setdefault('JWT_HEADER_TYPE', 'Bearer')
 
         # Option for JWTs when the TOKEN_LOCATION is cookies

tests/test_config.py

@@ -19,8 +19,7 @@ def setUp(self):
     def test_default_configs(self):
         with self.app.test_request_context():
             self.assertEqual(config.token_location, ['headers'])
-            self.assertEqual(config.access_header_name, 'Authorization')
-            self.assertEqual(config.refresh_header_name, 'Authorization')
+            self.assertEqual(config.header_name, 'Authorization')
             self.assertEqual(config.header_type, 'Bearer')
 
             self.assertEqual(config.cookie_secure, False)
@@ -46,8 +45,7 @@ def test_default_configs(self):
 
     def test_override_configs(self):
         self.app.config['JWT_TOKEN_LOCATION'] = 'cookies'
-        self.app.config['JWT_ACCESS_HEADER_NAME'] = 'Auth'
-        self.app.config['JWT_REFRESH_HEADER_NAME'] = 'Auth'
+        self.app.config['JWT_HEADER_NAME'] = 'Auth'
         self.app.config['JWT_HEADER_TYPE'] = 'JWT'
 
         self.app.config['JWT_COOKIE_SECURE'] = True
@@ -71,8 +69,7 @@ def test_override_configs(self):
 
         with self.app.test_request_context():
             self.assertEqual(config.token_location, ['cookies'])
-            self.assertEqual(config.access_header_name, 'Auth')
-            self.assertEqual(config.refresh_header_name, 'Auth')
+            self.assertEqual(config.header_name, 'Auth')
             self.assertEqual(config.header_type, 'JWT')
 
             self.assertEqual(config.cookie_secure, True)
@@ -94,16 +91,13 @@ def test_override_configs(self):
             self.assertEqual(config.blacklist_checks, 'all')
 
         self.app.config['JWT_TOKEN_LOCATION'] = 'banana'
-        self.app.config['JWT_ACCESS_HEADER_NAME'] = ''
-        self.app.config['JWT_REFRESH_HEADER_NAME'] = ''
+        self.app.config['JWT_HEADER_NAME'] = ''
         self.app.config['JWT_ACCESS_TOKEN_EXPIRES'] = 'banana'
         self.app.config['JWT_REFRESH_TOKEN_EXPIRES'] = 'banana'
 
         with self.app.test_request_context():
             with self.assertRaises(RuntimeError):
-                config.access_header_name
-            with self.assertRaises(RuntimeError):
-                config.refresh_header_name
+                config.header_name
             with self.assertRaises(RuntimeError):
                 config.access_expires
             with self.assertRaises(RuntimeError):