general code quality and utility changes

1Password · Nov 16, 2023 · f06876d · f06876d
1 parent d12be97
commit f06876d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/passkey-client/src/lib.rs b/passkey-client/src/lib.rs
@@ -58,9 +58,7 @@ impl From<ctap2::StatusCode> for WebauthnError {
     fn from(value: ctap2::StatusCode) -> Self {
         match value {
             ctap2::StatusCode::Ctap1(u2f) => WebauthnError::AuthenticatorError(u2f.into()),
-            ctap2::StatusCode::Ctap2(ctap2code)
-                if ctap2code == ctap2::Ctap2Code::Known(ctap2::Ctap2Error::NoCredentials) =>
-            {
+            ctap2::StatusCode::Ctap2(ctap2::Ctap2Code::Known(ctap2::Ctap2Error::NoCredentials)) => {
                 WebauthnError::CredentialNotFound
             }
             ctap2::StatusCode::Ctap2(ctap2code) => {

diff --git a/passkey-types/src/webauthn/attestation.rs b/passkey-types/src/webauthn/attestation.rs
@@ -350,7 +350,7 @@ pub struct AuthenticatorSelectionCriteria {
 /// <https://w3c.github.io/webauthn/#enumdef-residentkeyrequirement>
 ///
 /// [discoverable credential]: https://w3c.github.io/webauthn/#client-side-discoverable-credential
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 #[typeshare(serialized_as = "String")]
 pub enum ResidentKeyRequirement {
@@ -387,7 +387,7 @@ pub enum ResidentKeyRequirement {
 /// <https://w3c.github.io/webauthn/#enumdef-attestationconveyancepreference>
 ///
 /// [attestation conveyance]: https://w3c.github.io/webauthn/#attestation-conveyance
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 #[typeshare(serialized_as = "String")]
 pub enum AttestationConveyancePreference {
@@ -436,7 +436,7 @@ pub enum AttestationConveyancePreference {
 ///
 /// [1]: https://www.iana.org/assignments/webauthn/webauthn.xhtml#webauthn-attestation-statement-format-ids
 /// [2]: https://w3c.github.io/webauthn/#sctn-attstn-fmt-ids
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 #[typeshare]
 pub enum AttestationStatementFormatIdentifiers {
@@ -559,7 +559,7 @@ pub struct CollectedClientData {
 }
 
 /// Used to limit the values of [`CollectedClientData::ty`] and serializes to static strings.
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[typeshare]
 pub enum ClientDataType {
     /// Serializes to the string `"webauthn.create"`

diff --git a/passkey-types/src/webauthn/common.rs b/passkey-types/src/webauthn/common.rs
@@ -20,7 +20,7 @@ use crate::webauthn::{
 /// type of the authenticator.
 ///
 /// <https://w3c.github.io/webauthn/#enumdef-publickeycredentialtype>
-#[derive(Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 #[typeshare(serialized_as = "String")]
 pub enum PublicKeyCredentialType {
@@ -91,7 +91,7 @@ impl PublicKeyCredentialDescriptor {
 /// <https://w3c.github.io/webauthn/#enumdef-userverificationrequirement>
 ///
 /// [user verification]: https://w3c.github.io/webauthn/#user-verification
-#[derive(Debug, Default, Deserialize, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 #[typeshare(serialized_as = "String")]
 pub enum UserVerificationRequirement {
@@ -148,7 +148,7 @@ pub enum AuthenticatorTransport {
 /// authenticator attachment modality used to complete a registration or authentication ceremony.
 ///
 /// <https://w3c.github.io/webauthn/#enumdef-authenticatorattachment>
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "kebab-case")]
 #[typeshare(serialized_as = "String")]
 pub enum AuthenticatorAttachment {