mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

clippy feedback

Browse Source
This commit is contained in:
pixelrazor 2023-04-10 16:35:46 -06:00
parent c22042c2c1
commit 30e5805d5c
No known key found for this signature in database
GPG Key ID: A12822871A9955E2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/tests/common/auth.rs
View File

@ -10,8 +10,8 @@ pub fn get_token(client: &Client) -> String {
.header(reqwest::header::CONTENT_TYPE, "application/json") .header(reqwest::header::CONTENT_TYPE, "application/json")
.body( .body(
serde_json::to_string(&lldap_auth::login::ClientSimpleLoginRequest { serde_json::to_string(&lldap_auth::login::ClientSimpleLoginRequest {
username: username, username,
password: password, password,
}) })
.expect("Failed to encode the username/password as json to log in"), .expect("Failed to encode the username/password as json to log in"),
) )

8
server/tests/common/env.rs
View File

@ -5,7 +5,7 @@ pub const DB_KEY: &str = "LLDAP_DATABASE_URL";
pub fn database_url() -> String { pub fn database_url() -> String {
let url = var(DB_KEY).ok(); let url = var(DB_KEY).ok();
let url = url.unwrap_or("sqlite://e2e_test.db?mode=rwc".to_string()); let url = url.unwrap_or("sqlite://e2e_test.db?mode=rwc".to_string());
url.to_string() url
} }
pub fn ldap_url() -> String { pub fn ldap_url() -> String {
@ -27,17 +27,17 @@ pub fn http_url() -> String {
pub fn admin_dn() -> String { pub fn admin_dn() -> String {
let user = var("LLDAP_LDAP_USER_DN").ok(); let user = var("LLDAP_LDAP_USER_DN").ok();
let user = user.unwrap_or("admin".to_string()); let user = user.unwrap_or("admin".to_string());
user.to_string() user
} }
pub fn admin_password() -> String { pub fn admin_password() -> String {
let pass = var("LLDAP_LDAP_USER_PASS").ok(); let pass = var("LLDAP_LDAP_USER_PASS").ok();
let pass = pass.unwrap_or("password".to_string()); let pass = pass.unwrap_or("password".to_string());
pass.to_string() pass
} }
pub fn base_dn() -> String { pub fn base_dn() -> String {
let dn = var("LLDAP_LDAP_BASE_DN").ok(); let dn = var("LLDAP_LDAP_BASE_DN").ok();
let dn = dn.unwrap_or("dc=example,dc=com".to_string()); let dn = dn.unwrap_or("dc=example,dc=com".to_string());
dn.to_string() dn
} }

10
server/tests/common/fixture.rs
View File

@ -110,18 +110,18 @@ impl LLDAPFixture {
self.users.insert(user.clone()); self.users.insert(user.clone());
} }
fn add_group(&mut self, group: &String) { fn add_group(&mut self, group: &str) {
let id = post::<CreateGroup>( let id = post::<CreateGroup>(
&self.client, &self.client,
&self.token, &self.token,
create_group::Variables { create_group::Variables {
name: group.clone(), name: group.to_owned(),
}, },
) )
.expect("failed to add group") .expect("failed to add group")
.create_group .create_group
.id; .id;
self.groups.insert(group.clone(), id); self.groups.insert(group.to_owned(), id);
} }
fn delete_user(&mut self, user: &String) { fn delete_user(&mut self, user: &String) {
@ -147,13 +147,13 @@ impl LLDAPFixture {
self.groups.remove(group); self.groups.remove(group);
} }
fn add_user_to_group(&mut self, user: &String, group: &String) { fn add_user_to_group(&mut self, user: &str, group: &String) {
let group_id = self.groups.get(group).unwrap(); let group_id = self.groups.get(group).unwrap();
post::<AddUserToGroup>( post::<AddUserToGroup>(
&self.client, &self.client,
&self.token, &self.token,
add_user_to_group::Variables { add_user_to_group::Variables {
user: user.clone(), user: user.to_owned(),
group: *group_id, group: *group_id,
}, },
) )