Impl From<errors> for RegistrarError

oxide-auth/src/primitives/registrar.rs

@@ -10,8 +10,9 @@ use std::cmp;
 use std::collections::HashMap;
 use std::fmt;
 use std::iter::{Extend, FromIterator};
-use std::sync::{Arc, MutexGuard, RwLockWriteGuard};
 use std::rc::Rc;
+use std::string::FromUtf8Error;
+use std::sync::{Arc, MutexGuard, RwLockWriteGuard};
 
 use argon2::{self, Config};
 use once_cell::sync::Lazy;
@@ -295,6 +296,18 @@ pub struct Argon2 {
     _private: ()
 }
 
+impl From<FromUtf8Error> for RegistrarError {    
+    fn from(_: FromUtf8Error) -> Self {
+        RegistrarError::PrimitiveError
+    }
+}
+
+impl From<argon2::Error> for RegistrarError {
+    fn from(_: argon2::Error) -> Self {
+        RegistrarError::PrimitiveError
+    }
+}
+
 impl PasswordPolicy for Argon2 {
     fn store(&self, client_id: &str, passphrase: &[u8]) -> Vec<u8> {
         let mut config = Config::default();
@@ -312,18 +325,9 @@ impl PasswordPolicy for Argon2 {
     fn check(&self, client_id: &str, passphrase: &[u8], stored: &[u8])
         -> Result<(), RegistrarError>
     {
-        let hash = String::from_utf8(stored.to_vec());        
-        let valid = match hash {
-            Ok(hash) => argon2::verify_encoded_ext(&hash, passphrase, &[], client_id.as_bytes())
-                    .map_err(|_| RegistrarError::PrimitiveError),
-            _ => Err(RegistrarError::PrimitiveError),
-        };
-
-        match valid {
-            Ok(true) => Ok(()),
-            Ok(false) => Err(RegistrarError::Unspecified),
-            Err(err) => Err(err),
-        }
+        let hash = String::from_utf8(stored.to_vec())?;
+        let valid = argon2::verify_encoded_ext(&hash, passphrase, &[], client_id.as_bytes())?;
+        if valid { Ok(()) } else { Err(RegistrarError::Unspecified) }
     }
 }