core/protocol: use thiserror, use common authorization error struct

src/core/protocol/commands/passwd_user.rs

@@ -1,7 +1,8 @@
 use serde::{Deserialize, Serialize};
+use thiserror::Error;
 
 use crate::core::{
-    protocol::request_validation::{NameValidationError, OwnerValidationError},
+    protocol::request_validation::AuthorizationError,
     types::{DbOrUser, MySQLUser},
 };
 
@@ -9,11 +10,15 @@ pub type SetUserPasswordRequest = (MySQLUser, String);
 
 pub type SetUserPasswordResponse = Result<(), SetPasswordError>;
 
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Error, Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub enum SetPasswordError {
-    SanitizationError(NameValidationError),
-    OwnershipError(OwnerValidationError),
+    #[error("Authorization error: {0}")]
+    AuthorizationError(#[from] AuthorizationError),
+
+    #[error("User does not exist")]
     UserDoesNotExist,
+
+    #[error("MySQL error: {0}")]
     MySqlError(String),
 }
 
@@ -32,10 +37,7 @@ pub fn print_set_password_output_status(output: &SetUserPasswordResponse, userna
 impl SetPasswordError {
     pub fn to_error_message(&self, username: &MySQLUser) -> String {
         match self {
-            SetPasswordError::SanitizationError(err) => {
-                err.to_error_message(DbOrUser::User(username.clone()))
-            }
-            SetPasswordError::OwnershipError(err) => {
+            SetPasswordError::AuthorizationError(err) => {
                 err.to_error_message(DbOrUser::User(username.clone()))
             }
             SetPasswordError::UserDoesNotExist => {
@@ -50,12 +52,7 @@ impl SetPasswordError {
     #[allow(dead_code)]
     pub fn error_type(&self) -> String {
         match self {
-            SetPasswordError::SanitizationError(err) => {
-                format!("sanitization-error/{}", err.error_type())
-            }
-            SetPasswordError::OwnershipError(err) => {
-                format!("ownership-error/{}", err.error_type())
-            }
+            SetPasswordError::AuthorizationError(err) => err.error_type(),
             SetPasswordError::UserDoesNotExist => "user-does-not-exist".to_string(),
             SetPasswordError::MySqlError(_) => "mysql-error".to_string(),
         }