From 005efec015b3337e62037115d9fad05304161f97 Mon Sep 17 00:00:00 2001 From: Vika Date: Wed, 9 Apr 2025 23:10:30 +0300 Subject: kittybox-indieauth: 0.2.0 → 0.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `ClientMetadata` now returns a `ClientIdMismatch` error type. Change-Id: I51d3adfd2114f6cb89948bb5ba54588dde795142 --- indieauth/src/lib.rs | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'indieauth/src/lib.rs') diff --git a/indieauth/src/lib.rs b/indieauth/src/lib.rs index 0fcd32c..459d943 100644 --- a/indieauth/src/lib.rs +++ b/indieauth/src/lib.rs @@ -36,20 +36,18 @@ pub use rand; /// mandatory. #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] #[non_exhaustive] +#[serde(rename_all = "snake_case")] pub enum IntrospectionEndpointAuthMethod { /// `Authorization` header with a `Bearer` token. + #[serde(rename = "CamelCase")] Bearer, /// A token passed as part of a POST request. - #[serde(rename = "snake_case")] ClientSecretPost, /// Username and password passed using HTTP Basic authentication. - #[serde(rename = "snake_case")] ClientSecretBasic, /// TLS client auth with a certificate signed by a valid CA. - #[serde(rename = "snake_case")] TlsClientAuth, /// TLS client auth with a self-signed certificate. - #[serde(rename = "snake_case")] SelfSignedTlsClientAuth } @@ -311,17 +309,27 @@ pub struct ClientMetadata { pub homepage_uri: Option } +/// Error that occurs when creating [`ClientMetadata`] with mismatched `client_id` and `client_uri`. +#[derive(Debug)] +pub struct ClientIdMismatch; + +impl std::error::Error for ClientIdMismatch {} +impl std::fmt::Display for ClientIdMismatch { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "client_id must be a prefix of client_uri") + } +} + impl ClientMetadata { - /// Create a new [`ClientMetadata`] with all the optional fields - /// omitted. + /// Create a new [`ClientMetadata`] with all the optional fields omitted. /// /// # Errors /// - /// Returns `()` if the `client_uri` is not a prefix of - /// `client_id` as required by the IndieAuth spec. - pub fn new(client_id: url::Url, client_uri: url::Url) -> Result { + /// Returns `()` if the `client_uri` is not a prefix of `client_id` as required by the IndieAuth + /// spec. + pub fn new(client_id: url::Url, client_uri: url::Url) -> Result { if client_id.as_str().as_bytes()[..client_uri.as_str().len()] != *client_uri.as_str().as_bytes() { - return Err(()); + return Err(ClientIdMismatch); } Ok(Self { @@ -961,7 +969,7 @@ pub enum ErrorKind { /// AutoAuth/OAuth2 Device Flow: Access was denied by the /// authorization endpoint. AccessDenied, - + } // TODO consider relying on serde_variant for these conversions impl AsRef for ErrorKind { -- cgit 1.4.1