fix(jwk): update key type hint

authlib · Jul 12, 2023 · 3c5dff7 · 3c5dff7
1 parent 7c43c20
commit 3c5dff7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/joserfc/rfc7517/models.py b/src/joserfc/rfc7517/models.py
@@ -16,8 +16,8 @@
 )
 
 
-NativePublicKey = t.TypeVar("NativePublicKey")
 NativePrivateKey = t.TypeVar("NativePrivateKey")
+NativePublicKey = t.TypeVar("NativePublicKey")
 
 
 class NativeKeyBinding(object, metaclass=ABCMeta):
@@ -66,7 +66,7 @@ def validate_dict_key_use_operations(cls, dict_key: KeyDict):
                     raise ValueError('"use" and "key_ops" does not match')
 
 
-class BaseKey(t.Generic[NativePublicKey, NativePrivateKey]):
+class BaseKey(t.Generic[NativePrivateKey, NativePublicKey]):
     key_type: str
     value_registry: KeyParameterRegistryDict
     param_registry: KeyParameterRegistryDict = JWK_PARAMETER_REGISTRY
@@ -230,7 +230,7 @@ def generate_key(cls, size_or_crv, parameters: KeyParameters = None, private: bo
         raise NotImplementedError()
 
 
-class SymmetricKey(BaseKey[NativePublicKey, NativePrivateKey], metaclass=ABCMeta):
+class SymmetricKey(BaseKey[NativePrivateKey, NativePublicKey], metaclass=ABCMeta):
     @property
     def raw_value(self) -> bytes:
         """The raw key in bytes."""
@@ -252,7 +252,7 @@ def private_key(self) -> bytes:
         return self.raw_value
 
 
-class AsymmetricKey(BaseKey[NativePublicKey, NativePrivateKey], metaclass=ABCMeta):
+class AsymmetricKey(BaseKey[NativePrivateKey, NativePublicKey], metaclass=ABCMeta):
     @property
     def raw_value(self) -> t.Union[NativePublicKey, NativePrivateKey]:
         return self._raw_value
@@ -271,7 +271,7 @@ def as_der(self, private=None, password=None) -> bytes:
         return self.as_bytes(encoding="DER", private=private, password=password)
 
 
-class CurveKey(AsymmetricKey[NativePublicKey, NativePrivateKey]):
+class CurveKey(AsymmetricKey[NativePrivateKey, NativePublicKey]):
     @property
     @abstractmethod
     def curve_name(self) -> str:

diff --git a/src/joserfc/rfc7518/ec_key.py b/src/joserfc/rfc7518/ec_key.py
@@ -75,7 +75,7 @@ def export_public_key(key: EllipticCurvePublicKey) -> Dict[str, str]:
         }
 
 
-class ECKey(CurveKey[EllipticCurvePublicKey, EllipticCurvePrivateKey]):
+class ECKey(CurveKey[EllipticCurvePrivateKey, EllipticCurvePublicKey]):
     key_type: str = "EC"
     #: Registry definition for EC Key
     #: https://www.rfc-editor.org/rfc/rfc7518#section-6.2

diff --git a/src/joserfc/rfc7518/rsa_key.py b/src/joserfc/rfc7518/rsa_key.py
@@ -80,7 +80,7 @@ def export_public_key(key: RSAPublicKey) -> Dict[str, str]:
         return {"n": int_to_base64(numbers.n), "e": int_to_base64(numbers.e)}
 
 
-class RSAKey(AsymmetricKey[RSAPublicKey, RSAPrivateKey]):
+class RSAKey(AsymmetricKey[RSAPrivateKey, RSAPublicKey]):
     key_type: str = "RSA"
     #: Registry definition for RSA Key
     #: https://www.rfc-editor.org/rfc/rfc7518#section-6.3

diff --git a/src/joserfc/rfc8037/okp_key.py b/src/joserfc/rfc8037/okp_key.py
@@ -64,7 +64,7 @@ def export_public_key(key: PublicOKPKey) -> Dict[str, str]:
         }
 
 
-class OKPKey(CurveKey[PublicOKPKey, PrivateOKPKey]):
+class OKPKey(CurveKey[PrivateOKPKey, PublicOKPKey]):
     """Key class of the ``OKP`` key type."""
 
     key_type: str = "OKP"