diff --git a/labadoor-acl/src/lib.rs b/labadoor-acl/src/lib.rs index 32b5854..eb17317 100644 --- a/labadoor-acl/src/lib.rs +++ b/labadoor-acl/src/lib.rs @@ -54,9 +54,9 @@ pub trait ACL { fn del_shortcut(&self, user: Option, resource: Option, shortcut: Option); /// Queries - fn get_username(&self, method: String, identifier: String) -> Result; - fn get_resource(&self, username: String, shortcut: i8) -> Result; - fn is_allowed(&self, username: String, resource: String) -> Result<(), ()>; + fn get_username(&self, method: String, identifier: String) -> Option; + fn get_resource(&self, username: String, shortcut: i8) -> Option; + fn is_allowed(&self, username: String, resource: String) -> Option<()>; fn del_user(&self, user: String) { self.deny_access(Some(user.clone()), None); @@ -83,9 +83,9 @@ pub trait ACL { } fn auth_user(&self, method: String, identifier: String, shortcut: i8) { - if let Ok(username) = self.get_username(method, identifier) { - if let Ok(resource) = self.get_resource(username.clone(), shortcut) { - if self.is_allowed(username.clone(), resource).is_ok() { + if let Some(username) = self.get_username(method, identifier) { + if let Some(resource) = self.get_resource(username.clone(), shortcut) { + if self.is_allowed(username.clone(), resource).is_some() { println!("Open Sesame! {}", username); } }