implement new helper is_active_user_id()

This commit is contained in:
Dietmar Maurer 2021-06-16 09:03:34 +02:00
parent 0decd11efb
commit 252cd3b781
1 changed files with 12 additions and 4 deletions

View File

@ -65,10 +65,8 @@ impl CachedUserInfo {
} }
} }
/// Test if a authentication id is enabled and not expired /// Test if a user_id is enabled and not expired
pub fn is_active_auth_id(&self, auth_id: &Authid) -> bool { pub fn is_active_user_id(&self, userid: &Userid) -> bool {
let userid = auth_id.user();
if let Ok(info) = self.user_cfg.lookup::<User>("user", userid.as_str()) { if let Ok(info) = self.user_cfg.lookup::<User>("user", userid.as_str()) {
if !info.enable.unwrap_or(true) { if !info.enable.unwrap_or(true) {
return false; return false;
@ -78,7 +76,17 @@ impl CachedUserInfo {
return false; return false;
} }
} }
true
} else { } else {
false
}
}
/// Test if a authentication id is enabled and not expired
pub fn is_active_auth_id(&self, auth_id: &Authid) -> bool {
let userid = auth_id.user();
if !self.is_active_user_id(userid) {
return false; return false;
} }