Fix more code styling issues with black and isort

lib/galaxy/authnz/custos_authnz.py

@@ -23,8 +23,8 @@ from galaxy.model import (
     User,
 )
 from galaxy.model.orm.util import add_object_to_object_session
-from ..authnz import IdentityProvider
 from . import pkce_utils
+from ..authnz import IdentityProvider
 
 log = logging.getLogger(__name__)
 STATE_COOKIE_NAME = "galaxy-oidc-state"
@@ -72,8 +72,8 @@ class CustosAuthnz(IdentityProvider):
             extra_params["idphint"] = idphint
         if self.config["pkce_support"]:
             code_verifier, code_challenge = pkce_utils.generate_pkce_pair(96)
-            extra_params['code_challenge'] = code_challenge
-            extra_params['code_challenge_method'] = 'S256'
+            extra_params["code_challenge"] = code_challenge
+            extra_params["code_challenge_method"] = "S256"
             trans.set_cookie(value=code_verifier, name=VERIFIER_COOKIE_NAME)
         if "extra_params" in self.config:
             extra_params.update(self.config["extra_params"])
@@ -260,22 +260,19 @@ class CustosAuthnz(IdentityProvider):
         token_endpoint = self.config["token_endpoint"]
         clientIdAndSec = f"{self.config['client_id']}:{self.config['client_secret']}"  # for custos
 
-        params = {'client_secret': client_secret,
-                  'authorization_response': trans.request.url,
-                  'headers':
-                      {
-                          "Authorization": f"Basic {util.unicodify(base64.b64encode(util.smart_str(clientIdAndSec)))}"
-                      },  # for custos
-                  'verify': self._get_verify_param()
-                  }
+        params = {
+            "client_secret": client_secret,
+            "authorization_response": trans.request.url,
+            "headers": {
+                "Authorization": f"Basic {util.unicodify(base64.b64encode(util.smart_str(clientIdAndSec)))}"
+            },  # for custos
+            "verify": self._get_verify_param(),
+        }
         if self.config["pkce_support"]:
             code_verifier = trans.get_cookie(name=VERIFIER_COOKIE_NAME)
-            trans.set_cookie('', name=VERIFIER_COOKIE_NAME, age=-1)
-            params['code_verifier'] = code_verifier
-        return oauth2_session.fetch_token(
-            token_endpoint,
-            **params
-        )
+            trans.set_cookie("", name=VERIFIER_COOKIE_NAME, age=-1)
+            params["code_verifier"] = code_verifier
+        return oauth2_session.fetch_token(token_endpoint, **params)
 
     def _get_userinfo(self, oauth2_session):
         userinfo_endpoint = self.config["userinfo_endpoint"]

lib/galaxy/authnz/pkce_utils.py

@@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 """
-import secrets
-import hashlib
 import base64
+import hashlib
+import secrets
 from typing import Tuple
 
 
@@ -46,7 +46,7 @@ def generate_code_verifier(length: int = 128) -> str:
         When `43 <= length <= 128` is not verified.
     """
     if not 43 <= length <= 128:
-        msg = 'Parameter `length` must verify `43 <= length <= 128`.'
+        msg = "Parameter `length` must verify `43 <= length <= 128`."
         raise ValueError(msg)
     code_verifier = secrets.token_urlsafe(96)[:length]
     return code_verifier
@@ -69,8 +69,8 @@ def generate_pkce_pair(code_verifier_length: int = 128) -> Tuple[str, str]:
         When `43 <= code_verifier_length <= 128` is not verified.
     """
     if not 43 <= code_verifier_length <= 128:
-        msg = 'Parameter `code_verifier_length` must verify '
-        msg += '`43 <= code_verifier_length <= 128`.'
+        msg = "Parameter `code_verifier_length` must verify "
+        msg += "`43 <= code_verifier_length <= 128`."
         raise ValueError(msg)
     code_verifier = generate_code_verifier(code_verifier_length)
     code_challenge = get_code_challenge(code_verifier)
@@ -93,10 +93,10 @@ def get_code_challenge(code_verifier: str) -> str:
         When `43 <= len(code_verifier) <= 128` is not verified.
     """
     if not 43 <= len(code_verifier) <= 128:
-        msg = 'Parameter `code_verifier` must verify '
-        msg += '`43 <= len(code_verifier) <= 128`.'
+        msg = "Parameter `code_verifier` must verify "
+        msg += "`43 <= len(code_verifier) <= 128`."
         raise ValueError(msg)
-    hashed = hashlib.sha256(code_verifier.encode('ascii')).digest()
+    hashed = hashlib.sha256(code_verifier.encode("ascii")).digest()
     encoded = base64.urlsafe_b64encode(hashed)
-    code_challenge = encoded.decode('ascii')[:-1]
+    code_challenge = encoded.decode("ascii")[:-1]
     return code_challenge

test/unit/app/authnz/test_custos_authnz.py

@@ -17,7 +17,10 @@ import jwt
 import requests
 
 from galaxy.app_unittest_utils.galaxy_mock import MockTrans
-from galaxy.authnz import custos_authnz, pkce_utils
+from galaxy.authnz import (
+    custos_authnz,
+    pkce_utils,
+)
 from galaxy.model import (
     CustosAuthnzToken,
     User,