lint + remove unnecessary get_auth_password

miguelgrinberg · Aug 3, 2024 · bfaccfe · bfaccfe
1 parent 98ec906
commit bfaccfe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/flask_httpauth.py b/src/flask_httpauth.py
@@ -197,7 +197,11 @@ def ensure_sync(self, f):
 
 class HTTPCookieAuth(HTTPAuth):
     def __init__(self, scheme=None, realm=None, cookie_name=None):
-        super(HTTPCookieAuth, self).__init__(scheme or 'Bearer', realm, cookie_name)
+        super(HTTPCookieAuth, self).__init__(
+            scheme or 'Bearer',
+            realm,
+            cookie_name
+        )
 
         self.verify_cookie_callback = None
         self.cookie_name = cookie_name
@@ -216,7 +220,8 @@ def get_auth(self):
         cookie_val = request.cookies.get(expected_cookie_name, '')
         token = ''
         if self.scheme != 'ApiKey':
-            # if scheme is Bearer or anything else besides ApiKey, split on scheme name
+            # if scheme is Bearer or anything else besides ApiKey,
+            # split on scheme name
             if isinstance(cookie_val, str) and len(cookie_val) > 0:
                 try:
                     scheme, token = cookie_val.split(' ')
@@ -232,12 +237,6 @@ def get_auth(self):
         auth = Authorization(self.scheme, token=token)
         return auth
 
-    def get_auth_password(self, auth):
-        try:
-            return getattr(auth, 'token', '')
-        except KeyError:
-            return ""
-
 
 class HTTPBasicAuth(HTTPAuth):
     def __init__(self, scheme=None, realm=None):

diff --git a/tests/test_cookie.py b/tests/test_cookie.py
@@ -65,7 +65,7 @@ def cookie_default_auth_route():
         self.app = app
         self.cookie_auth = cookie_auth
         self.client = app.test_client()
-    
+
     def tearDown(self) -> None:
         self.client._cookies.clear()
 
@@ -96,7 +96,8 @@ def test_cookie_auth_login_optional(self):
         self.assertEqual(response.data.decode('utf-8'), 'cookie_auth:None')
 
     def test_cookie_auth_login_invalid_token(self):
-        self.client.set_cookie("Authorization", "MyToken this-is-not-the-token!")
+        self.client.set_cookie("Authorization",
+                               "MyToken this-is-not-the-token!")
         response = self.client.get('/protected')
         self.assertEqual(response.status_code, 401)
         self.assertTrue('WWW-Authenticate' in response.headers)
@@ -151,7 +152,7 @@ def test_cookie_auth_header_precedence(self):
         self.client.set_cookie("X-API-Key", "this-is-the-token!")
         basic_creds = base64.b64encode(b'susan:bye').decode('utf-8')
         response = self.client.get(
-            '/protected3', headers={'Authorization': 'Basic ' + basic_creds,})
+            '/protected3', headers={'Authorization': 'Basic ' + basic_creds})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data.decode('utf-8'), 'cookie_auth3:user')
 
@@ -189,4 +190,4 @@ def test_cookie_auth_default_bearer_missing_cookie(self):
         self.assertEqual(response.status_code, 401)
         self.assertTrue('WWW-Authenticate' in response.headers)
         self.assertEqual(response.headers['WWW-Authenticate'],
-                         'Bearer realm="Authentication Required"')
+                         'Bearer realm="Authentication Required"')
diff --git a/tests/test_cookie_async.py b/tests/test_cookie_async.py
@@ -65,7 +65,7 @@ async def cookie_default_auth_route():
         self.app = app
         self.cookie_auth = cookie_auth
         self.client = app.test_client()
-    
+
     def tearDown(self) -> None:
         self.client._cookies.clear()
 
@@ -96,7 +96,8 @@ def test_cookie_auth_login_optional(self):
         self.assertEqual(response.data.decode('utf-8'), 'cookie_auth:None')
 
     def test_cookie_auth_login_invalid_token(self):
-        self.client.set_cookie("Authorization", "MyToken this-is-not-the-token!")
+        self.client.set_cookie("Authorization",
+                               "MyToken this-is-not-the-token!")
         response = self.client.get('/protected')
         self.assertEqual(response.status_code, 401)
         self.assertTrue('WWW-Authenticate' in response.headers)
@@ -151,7 +152,7 @@ def test_cookie_auth_header_precedence(self):
         self.client.set_cookie("X-API-Key", "this-is-the-token!")
         basic_creds = base64.b64encode(b'susan:bye').decode('utf-8')
         response = self.client.get(
-            '/protected3', headers={'Authorization': 'Basic ' + basic_creds,})
+            '/protected3', headers={'Authorization': 'Basic ' + basic_creds})
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.data.decode('utf-8'), 'cookie_auth3:user')
 
@@ -189,4 +190,4 @@ def test_cookie_auth_default_bearer_missing_cookie(self):
         self.assertEqual(response.status_code, 401)
         self.assertTrue('WWW-Authenticate' in response.headers)
         self.assertEqual(response.headers['WWW-Authenticate'],
-                         'Bearer realm="Authentication Required"')
+                         'Bearer realm="Authentication Required"')