Add public methods for instantiating TokenResponse and ErrorResponse.

Author: ramosbugs

src/lib.rs

@@ -1304,11 +1304,67 @@ where
     TT: TokenType,
 {
     ///
-    /// Extra fields defined by client application.
+    /// Instantiate a new OAuth2 token response.
+    ///
+    pub fn new(access_token: AccessToken, token_type: TT, extra_fields: EF) -> Self {
+        Self {
+            access_token,
+            token_type,
+            expires_in: None,
+            refresh_token: None,
+            scopes: None,
+            extra_fields,
+        }
+    }
+
+    ///
+    /// Set the `access_token` field.
+    ///
+    pub fn set_access_token(&mut self, access_token: AccessToken) {
+        self.access_token = access_token;
+    }
+
+    ///
+    /// Set the `token_type` field.
+    ///
+    pub fn set_token_type(&mut self, token_type: TT) {
+        self.token_type = token_type;
+    }
+
+    ///
+    /// Set the `expires_in` field.
+    ///
+    pub fn set_expires_in(&mut self, expires_in: Option<u64>) {
+        self.expires_in = expires_in;
+    }
+
+    ///
+    /// Set the `refresh_token` field.
+    ///
+    pub fn set_refresh_token(&mut self, refresh_token: Option<RefreshToken>) {
+        self.refresh_token = refresh_token;
+    }
+
+    ///
+    /// Set the `scopes` field.
+    ///
+    pub fn set_scopes(&mut self, scopes: Option<Vec<Scope>>) {
+        self.scopes = scopes;
+    }
+
+    ///
+    /// Extra fields defined by the client application.
     ///
     pub fn extra_fields(&self) -> &EF {
         &self.extra_fields
     }
+
+    ///
+    /// Set the extra fields defined by the client application.
+    ///
+    pub fn set_extra_fields(&mut self, extra_fields: EF) {
+        self.extra_fields = extra_fields;
+    }
 }
 
 impl<EF, TT> TokenResponse<TT> for StandardTokenResponse<EF, TT>
@@ -1392,6 +1448,30 @@ pub struct ErrorResponse<T: ErrorResponseType> {
 }
 
 impl<T: ErrorResponseType> ErrorResponse<T> {
+    ///
+    /// Instantiate a new `ErrorResponse`.
+    ///
+    /// # Arguments
+    ///
+    /// * `error` - REQUIRED. A single ASCII error code deserialized to the generic parameter.
+    ///   `ErrorResponseType`.
+    /// * `error_description` - OPTIONAL. Human-readable ASCII text providing additional
+    ///   information, used to assist the client developer in understanding the error that
+    ///   occurred. Values for this parameter MUST NOT include characters outside the set
+    ///   `%x20-21 / %x23-5B / %x5D-7E`.
+    /// * `error_uri` - OPTIONAL. A URI identifying a human-readable web page with information
+    ///   about the error used to provide the client developer with additional information about
+    ///   the error. Values for the "error_uri" parameter MUST conform to the URI-reference
+    ///   syntax and thus MUST NOT include characters outside the set `%x21 / %x23-5B / %x5D-7E`.
+    ///
+    pub fn new(error: T, error_description: Option<String>, error_uri: Option<String>) -> Self {
+        Self {
+            error,
+            error_description,
+            error_uri,
+        }
+    }
+
     ///
     /// REQUIRED. A single ASCII error code deserialized to the generic parameter
     /// `ErrorResponseType`.
@@ -1401,14 +1481,17 @@ impl<T: ErrorResponseType> ErrorResponse<T> {
     }
     ///
     /// OPTIONAL. Human-readable ASCII text providing additional information, used to assist
-    /// the client developer in understanding the error that occurred.
+    /// the client developer in understanding the error that occurred. Values for this
+    /// parameter MUST NOT include characters outside the set `%x20-21 / %x23-5B / %x5D-7E`.
     ///
     pub fn error_description(&self) -> Option<&String> {
         self.error_description.as_ref()
     }
     ///
     /// OPTIONAL. A URI identifying a human-readable web page with information about the error,
     /// used to provide the client developer with additional information about the error.
+    /// Values for the "error_uri" parameter MUST conform to the URI-reference syntax and
+    /// thus MUST NOT include characters outside the set `%x21 / %x23-5B / %x5D-7E`.
     ///
     pub fn error_uri(&self) -> Option<&String> {
         self.error_uri.as_ref()

tests/lib.rs

@@ -914,9 +914,9 @@ mod colorful_extension {
     pub struct ColorfulFields {
         #[serde(rename = "shape")]
         #[serde(skip_serializing_if = "Option::is_none")]
-        shape: Option<String>,
+        pub shape: Option<String>,
         #[serde(rename = "height")]
-        height: u32,
+        pub height: u32,
     }
     impl ColorfulFields {
         pub fn shape(&self) -> Option<&String> {
@@ -1142,6 +1142,60 @@ fn test_extension_with_simple_json_error() {
     );
 }
 
+#[test]
+fn test_extension_serializer() {
+    use colorful_extension::{ColorfulFields, ColorfulTokenResponse, ColorfulTokenType};
+    let mut token_response = ColorfulTokenResponse::new(
+        AccessToken::new("mysecret".to_string()),
+        ColorfulTokenType::Red,
+        ColorfulFields {
+            shape: Some("circle".to_string()),
+            height: 10,
+        },
+    );
+    token_response.set_expires_in(Some(3600));
+    token_response.set_refresh_token(Some(RefreshToken::new("myothersecret".to_string())));
+    let serialized = serde_json::to_string(&token_response).unwrap();
+    assert_eq!(
+        "{\
+         \"access_token\":\"mysecret\",\
+         \"token_type\":\"red\",\
+         \"expires_in\":3600,\
+         \"refresh_token\":\"myothersecret\",\
+         \"shape\":\"circle\",\
+         \"height\":10\
+         }",
+        serialized,
+    );
+}
+
+#[test]
+fn test_error_response_serializer() {
+    assert_eq!(
+        "{\"error\":\"unauthorized_client\"}",
+        serde_json::to_string(&BasicErrorResponse::new(
+            BasicErrorResponseType::UnauthorizedClient,
+            None,
+            None,
+        ))
+        .unwrap(),
+    );
+
+    assert_eq!(
+        "{\
+         \"error\":\"invalid_client\",\
+         \"error_description\":\"Invalid client_id\",\
+         \"error_uri\":\"https://example.com/errors/invalid_client\"\
+         }",
+        serde_json::to_string(&BasicErrorResponse::new(
+            BasicErrorResponseType::InvalidClient,
+            Some("Invalid client_id".to_string()),
+            Some("https://example.com/errors/invalid_client".to_string()),
+        ))
+        .unwrap(),
+    );
+}
+
 #[test]
 fn test_secret_redaction() {
     let secret = ClientSecret::new("top_secret".to_string());