Skip to content

Commit

Permalink
refactor: rename ExpiringKey::id to ExpiringKey:key
Browse files Browse the repository at this point in the history
  • Loading branch information
@josecelano
josecelano committed Mar 5, 2023
1 parent c7015fa commit 7b690a4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/apis/resources/auth_key.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl From<AuthKey> for auth::ExpiringKey {
};

auth::ExpiringKey {
id: auth_key_resource.key.parse::<Key>().unwrap(),
key: auth_key_resource.key.parse::<Key>().unwrap(),
valid_until,
}
}
Expand All @@ -28,7 +28,7 @@ impl From<AuthKey> for auth::ExpiringKey {
impl From<auth::ExpiringKey> for AuthKey {
fn from(auth_key: auth::ExpiringKey) -> Self {
AuthKey {
key: auth_key.id.to_string(),
key: auth_key.key.to_string(),
valid_until: Some(auth_key.valid_until.as_secs()),
}
}
Expand All @@ -54,7 +54,7 @@ mod tests {
assert_eq!(
auth::ExpiringKey::from(auth_key_resource),
auth::ExpiringKey {
id: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".parse::<Key>().unwrap(), // cspell:disable-line
key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".parse::<Key>().unwrap(), // cspell:disable-line
valid_until: Current::add(&Duration::new(duration_in_secs, 0)).unwrap()
}
);
Expand All @@ -65,7 +65,7 @@ mod tests {
let duration_in_secs = 60;

let auth_key = auth::ExpiringKey {
id: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".parse::<Key>().unwrap(), // cspell:disable-line
key: "IaWDneuFNZi8IB4MPA3qW1CD0M30EZSM".parse::<Key>().unwrap(), // cspell:disable-line
valid_until: Current::add(&Duration::new(duration_in_secs, 0)).unwrap(),
};

Expand Down
6 changes: 3 additions & 3 deletions src/databases/mysql.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl Database for Mysql {
let keys = conn.query_map(
"SELECT `key`, valid_until FROM `keys`",
|(key, valid_until): (String, i64)| auth::ExpiringKey {
id: key.parse::<Key>().unwrap(),
key: key.parse::<Key>().unwrap(),
valid_until: Duration::from_secs(valid_until.unsigned_abs()),
},
)?;
Expand Down Expand Up @@ -192,15 +192,15 @@ impl Database for Mysql {
let key = query?;

Ok(key.map(|(key, expiry)| auth::ExpiringKey {
id: key.parse::<Key>().unwrap(),
key: key.parse::<Key>().unwrap(),
valid_until: Duration::from_secs(expiry.unsigned_abs()),
}))
}

async fn add_key_to_keys(&self, auth_key: &auth::ExpiringKey) -> Result<usize, Error> {
let mut conn = self.pool.get().map_err(|e| (e, DRIVER))?;

let key = auth_key.id.to_string();
let key = auth_key.key.to_string();
let valid_until = auth_key.valid_until.as_secs().to_string();

conn.exec_drop(
Expand Down
6 changes: 3 additions & 3 deletions src/databases/sqlite.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ impl Database for Sqlite {
let valid_until: i64 = row.get(1)?;

Ok(auth::ExpiringKey {
id: key.parse::<Key>().unwrap(),
key: key.parse::<Key>().unwrap(),
valid_until: DurationSinceUnixEpoch::from_secs(valid_until.unsigned_abs()),
})
})?;
Expand Down Expand Up @@ -213,7 +213,7 @@ impl Database for Sqlite {
let expiry: i64 = f.get(1).unwrap();
let id: String = f.get(0).unwrap();
auth::ExpiringKey {
id: id.parse::<Key>().unwrap(),
key: id.parse::<Key>().unwrap(),
valid_until: DurationSinceUnixEpoch::from_secs(expiry.unsigned_abs()),
}
}))
Expand All @@ -224,7 +224,7 @@ impl Database for Sqlite {

let insert = conn.execute(
"INSERT INTO keys (key, valid_until) VALUES (?1, ?2)",
[auth_key.id.to_string(), auth_key.valid_until.as_secs().to_string()],
[auth_key.key.to_string(), auth_key.valid_until.as_secs().to_string()],
)?;

if insert == 0 {
Expand Down
8 changes: 4 additions & 4 deletions src/tracker/auth.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn generate(lifetime: Duration) -> ExpiringKey {
debug!("Generated key: {}, valid for: {:?} seconds", random_id, lifetime);

ExpiringKey {
id: random_id.parse::<Key>().unwrap(),
key: random_id.parse::<Key>().unwrap(),
valid_until: Current::add(&lifetime).unwrap(),
}
}
Expand All @@ -53,7 +53,7 @@ pub fn verify(auth_key: &ExpiringKey) -> Result<(), Error> {

#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
pub struct ExpiringKey {
pub id: Key,
pub key: Key,
pub valid_until: DurationSinceUnixEpoch,
}

Expand All @@ -62,7 +62,7 @@ impl std::fmt::Display for ExpiringKey {
write!(
f,
"key: `{}`, valid until `{}`",
self.id,
self.key,
DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp(
i64::try_from(self.valid_until.as_secs()).expect("Overflow of i64 seconds, very future!"),
Expand All @@ -77,7 +77,7 @@ impl std::fmt::Display for ExpiringKey {
impl ExpiringKey {
#[must_use]
pub fn id(&self) -> Key {
self.id.clone()
self.key.clone()
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/tracker/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ impl Tracker {
pub async fn generate_auth_key(&self, lifetime: Duration) -> Result<auth::ExpiringKey, databases::error::Error> {
let auth_key = auth::generate(lifetime);
self.database.add_key_to_keys(&auth_key).await?;
self.keys.write().await.insert(auth_key.id.clone(), auth_key.clone());
self.keys.write().await.insert(auth_key.key.clone(), auth_key.clone());
Ok(auth_key)
}

Expand Down Expand Up @@ -233,7 +233,7 @@ impl Tracker {
keys.clear();

for key in keys_from_database {
keys.insert(key.id.clone(), key);
keys.insert(key.key.clone(), key);
}

Ok(())
Expand Down
8 changes: 4 additions & 4 deletions tests/tracker_api.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ mod tracker_apis {
.unwrap();

let response = Client::new(api_server.get_connection_info())
.delete_auth_key(&auth_key.id.to_string())
.delete_auth_key(&auth_key.key.to_string())
.await;

assert_ok(response).await;
Expand Down Expand Up @@ -777,7 +777,7 @@ mod tracker_apis {
force_database_error(&api_server.tracker);

let response = Client::new(api_server.get_connection_info())
.delete_auth_key(&auth_key.id.to_string())
.delete_auth_key(&auth_key.key.to_string())
.await;

assert_failed_to_delete_key(response).await;
Expand All @@ -797,7 +797,7 @@ mod tracker_apis {
.unwrap();

let response = Client::new(connection_with_invalid_token(&api_server.get_bind_address()))
.delete_auth_key(&auth_key.id.to_string())
.delete_auth_key(&auth_key.key.to_string())
.await;

assert_token_not_valid(response).await;
Expand All @@ -810,7 +810,7 @@ mod tracker_apis {
.unwrap();

let response = Client::new(connection_with_no_token(&api_server.get_bind_address()))
.delete_auth_key(&auth_key.id.to_string())
.delete_auth_key(&auth_key.key.to_string())
.await;

assert_unauthorized(response).await;
Expand Down

0 comments on commit 7b690a4

Please sign in to comment.