mirror of
https://github.com/YGGverse/Yoda.git
synced 2026-04-01 09:05:27 +00:00
close members
This commit is contained in:
parent
054c30b238
commit
f495453c84
2 changed files with 27 additions and 29 deletions
|
|
@ -63,9 +63,10 @@ impl Item {
|
|||
// Extract certificate details from PEM string
|
||||
Ok(ref pem) => match TlsCertificate::from_pem(pem) {
|
||||
// Collect certificate scopes for item
|
||||
Ok(ref certificate) => match scope(profile, profile_identity_id) {
|
||||
// Ready to build `Item` GObject
|
||||
Ok(ref scope) => Ok(Object::builder()
|
||||
Ok(ref certificate) => {
|
||||
let scope = &profile.identity.auth.scope(profile_identity_id);
|
||||
|
||||
Ok(Object::builder()
|
||||
.property("value", profile_identity_id)
|
||||
.property("title", title::new_for_profile_identity_id(certificate))
|
||||
.property(
|
||||
|
|
@ -84,9 +85,8 @@ impl Item {
|
|||
auth_url,
|
||||
),
|
||||
)
|
||||
.build()),
|
||||
Err(_) => todo!(),
|
||||
},
|
||||
.build())
|
||||
}
|
||||
Err(e) => Err(Error::TlsCertificate(e)),
|
||||
},
|
||||
Err(_) => todo!(),
|
||||
|
|
@ -106,7 +106,7 @@ impl Item {
|
|||
Ok(ref pem) => match TlsCertificate::from_pem(pem) {
|
||||
Ok(ref certificate) => {
|
||||
// Get current scope
|
||||
let scope = &scope(profile, profile_identity_id)?;
|
||||
let scope = &profile.identity.auth.scope(profile_identity_id);
|
||||
|
||||
// Update properties
|
||||
self.set_title(title::new_for_profile_identity_id(certificate));
|
||||
|
|
@ -153,22 +153,3 @@ impl Item {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Tools
|
||||
|
||||
/// Collect certificate scope vector from `Profile` database for `profile_identity_id`
|
||||
fn scope(profile: &Rc<Profile>, profile_identity_id: i64) -> Result<Vec<String>, Error> {
|
||||
match profile.identity.auth.database.records_scope(None) {
|
||||
Ok(result) => {
|
||||
let mut scope = Vec::new();
|
||||
for auth in result
|
||||
.iter()
|
||||
.filter(|this| this.profile_identity_id == profile_identity_id)
|
||||
{
|
||||
scope.push(auth.scope.clone())
|
||||
}
|
||||
Ok(scope)
|
||||
}
|
||||
Err(_) => todo!(),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue