fmt, clippy and tests

Author: DrVilepis

src/api/account.rs

@@ -15,8 +15,7 @@ pub async fn change_settings(
     settings: Json<Settings>,
 ) -> Result<impl IntoResponse, TimeError> {
     if let Some(public_profile) = settings.public_profile {
-        db.change_visibility(user.id, public_profile)
-            .await?;
+        db.change_visibility(user.id, public_profile).await?;
     };
 
     Ok(StatusCode::OK)

src/api/leaderboards.rs

@@ -4,7 +4,9 @@ use http::StatusCode;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    database::DatabaseWrapper, error::TimeError, models::{UserId, UserIdentity},
+    database::DatabaseWrapper,
+    error::TimeError,
+    models::{UserId, UserIdentity},
 };
 
 #[derive(Deserialize, Serialize)]
@@ -126,10 +128,7 @@ pub async fn leave_leaderboard(
         return Err(TimeError::LastAdmin);
     }
 
-    if db
-        .remove_user_from_leaderboard(lid, user.id)
-        .await?
-    {
+    if db.remove_user_from_leaderboard(lid, user.id).await? {
         Ok(StatusCode::OK)
     } else {
         Err(TimeError::NotMember)

src/models.rs

@@ -250,11 +250,6 @@ pub struct FriendWithTimeAndStatus {
     pub status: Option<CurrentActivity>,
 }
 
-#[derive(Serialize, Deserialize, Debug, Default, Clone, Eq, PartialEq, Hash)]
-pub struct SecuredAccessTokenResponse {
-    pub token: String,
-}
-
 #[derive(Deserialize, Serialize, Debug, Hash, Eq, PartialEq, Clone)]
 pub struct HeartBeat {
     #[serde(deserialize_with = "project_deserialize")]

src/state.rs

@@ -4,8 +4,7 @@ use axum::extract::FromRef;
 use lettre::{AsyncSmtpTransport, Tokio1Executor};
 
 use crate::{
-    api::activity::HeartBeatMemoryStore,
-    PasswordResetState, RegisterLimiter, TestaustimeState,
+    api::activity::HeartBeatMemoryStore, PasswordResetState, RegisterLimiter, TestaustimeState,
 };
 
 impl FromRef<TestaustimeState> for Arc<HeartBeatMemoryStore> {

src/tests/account.rs

@@ -1,7 +1,7 @@
 use serde_json::json;
 
 use super::{macros::*, *};
-use crate::models::{NewUserIdentity, SecuredAccessTokenResponse};
+use crate::models::NewUserIdentity;
 
 #[tokio::test]
 async fn public_accounts() {
@@ -28,15 +28,8 @@ async fn public_accounts() {
         "Data should be private for private accounts"
     );
 
-    let resp = request!(app, POST, "/auth/securedaccess", body);
-    assert!(
-        resp.status().is_success(),
-        "Getting secured access token failed"
-    );
-    let sat: SecuredAccessTokenResponse = body_to_json(resp).await;
-
     let change = json!({"public_profile": true});
-    let resp = request_auth!(app, POST, "/account/settings", sat.token, change);
+    let resp = request_auth!(app, POST, "/account/settings", user.auth_token, change);
 
     assert!(resp.status().is_success(), "Changing settings failed");
 

src/tests/activity.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 use serde_json::json;
 
 use super::{macros::*, *};
-use crate::models::{CurrentActivity, HeartBeat, NewUserIdentity, SecuredAccessTokenResponse};
+use crate::models::{CurrentActivity, HeartBeat, NewUserIdentity};
 
 #[tokio::test]
 async fn updating_activity_works() {
@@ -157,15 +157,8 @@ async fn hidden_project() {
     let resp = request_auth!(app, POST, "/activity/flush", user.auth_token);
     assert!(resp.status().is_success(), "Flushing should work");
 
-    let resp = request!(app, POST, "/auth/securedaccess", body);
-    assert!(
-        resp.status().is_success(),
-        "Getting secured access token failed"
-    );
-    let sat: SecuredAccessTokenResponse = body_to_json(resp).await;
-
     let change = json!({"public_profile": true});
-    let resp = request_auth!(app, POST, "/account/settings", sat.token, change);
+    let resp = request_auth!(app, POST, "/account/settings", user.auth_token, change);
 
     assert!(resp.status().is_success(), "Making profile public failed");
 

src/tests/auth.rs

@@ -1,7 +1,7 @@
 use serde_json::json;
 
 use super::{macros::*, *};
-use crate::models::{NewUserIdentity, SecuredAccessTokenResponse, SelfUser};
+use crate::models::{NewUserIdentity, SelfUser};
 
 #[tokio::test]
 async fn register_and_delete() {
@@ -48,14 +48,6 @@ async fn login_change_username_and_password() {
         "Auth tokens should be equal"
     );
 
-    let resp = request!(app, POST, "/auth/securedaccess", body);
-    assert!(
-        resp.status().is_success(),
-        "Getting secured access token failed"
-    );
-
-    let sat: SecuredAccessTokenResponse = body_to_json(resp).await;
-
     let change_request = json!({
         "new": "testuser3"
     });
@@ -76,7 +68,7 @@ async fn login_change_username_and_password() {
         app,
         POST,
         "/auth/change-username",
-        sat.token,
+        user.auth_token,
         change_request
     );
     assert!(resp.status().is_success(), "Username change failed");

src/tests/leaderboards.rs

@@ -3,7 +3,7 @@ use serde_json::json;
 use super::{macros::*, *};
 use crate::{
     api::leaderboards::{LeaderboardInvite, LeaderboardName},
-    models::{NewUserIdentity, PrivateLeaderboard, SecuredAccessTokenResponse},
+    models::{NewUserIdentity, PrivateLeaderboard},
 };
 
 #[tokio::test]
@@ -66,14 +66,7 @@ async fn creation_joining_and_deletion() {
         "Leaderboard member count should be 2"
     );
 
-    let resp = request!(app, POST, "/auth/securedaccess", owner_body);
-    assert!(
-        resp.status().is_success(),
-        "Getting secured access token failed"
-    );
-    let sat: SecuredAccessTokenResponse = body_to_json(resp).await;
-
-    let resp = request_auth!(app, DELETE, "/leaderboards/board", sat.token);
+    let resp = request_auth!(app, DELETE, "/leaderboards/board", owner.auth_token);
     assert!(resp.status().is_success(), "Leaderboards deletion failed");
 
     let resp = request_auth!(app, GET, "/leaderboards/board", member.auth_token);