refactor: added error handling for unsafe unwraps

mario-nt · mario-nt · commit 3e7fb4fc5dad · 2024-08-13T16:37:03.000+02:00
diff --git a/src/services/proxy.rs b/src/services/proxy.rs
@@ -43,13 +43,15 @@ impl Service {
     ///
     /// The function panics if the optional user id has no value
     pub async fn get_image_by_url(&self, url: &str, maybe_user_id: Option<UserId>) -> Result<Bytes, Error> {
+        let Some(user_id) = maybe_user_id else {
+            return Err(Error::Unauthenticated);
+        };
+
         self.authorization_service
             .authorize(ACTION::GetImageByUrl, maybe_user_id)
             .await
             .map_err(|_| Error::Unauthenticated)?;
 
-        self.image_cache_service
-            .get_image_by_url(url, maybe_user_id.expect("There is no user id needed to perform the action"))
-            .await
+        self.image_cache_service.get_image_by_url(url, user_id).await
     }
 }
diff --git a/src/services/torrent.rs b/src/services/torrent.rs
@@ -135,6 +135,10 @@ impl Index {
         add_torrent_req: AddTorrentRequest,
         maybe_user_id: Option<UserId>,
     ) -> Result<AddTorrentResponse, ServiceError> {
+        let Some(user_id) = maybe_user_id else {
+            return Err(ServiceError::UnauthorizedActionForGuests);
+        };
+
         self.authorization_service
             .authorize(ACTION::AddTorrent, maybe_user_id)
             .await?;
@@ -150,12 +154,7 @@ impl Index {
 
         let torrent_id = self
             .torrent_repository
-            .add(
-                &original_info_hash,
-                &torrent,
-                &metadata,
-                maybe_user_id.expect("There is no user id needed to perform the action"),
-            )
+            .add(&original_info_hash, &torrent, &metadata, user_id)
             .await?;
 
         // Synchronous secondary tasks
diff --git a/src/services/user.rs b/src/services/user.rs
@@ -235,20 +235,21 @@ impl ProfileService {
         maybe_user_id: Option<UserId>,
         change_password_form: &ChangePasswordForm,
     ) -> Result<(), ServiceError> {
+        let Some(user_id) = maybe_user_id else {
+            return Err(ServiceError::UnauthorizedActionForGuests);
+        };
+
         self.authorization_service
             .authorize(ACTION::ChangePassword, maybe_user_id)
             .await?;
 
-        info!(
-            "changing user password for user ID: {}",
-            maybe_user_id.expect("There is no user id needed to perform the action")
-        );
+        info!("changing user password for user ID: {}", user_id);
 
         let settings = self.configuration.settings.read().await;
 
         let user_authentication = self
             .user_authentication_repository
-            .get_user_authentication_from_id(&maybe_user_id.expect("There is no user id needed to perform the action"))
+            .get_user_authentication_from_id(&user_id)
             .await?;
 
         verify_password(change_password_form.current_password.as_bytes(), &user_authentication)?;
@@ -267,10 +268,7 @@ impl ProfileService {
         let password_hash = hash_password(&change_password_form.password)?;
 
         self.user_authentication_repository
-            .change_password(
-                maybe_user_id.expect("There is no user id needed to perform the action"),
-                &password_hash,
-            )
+            .change_password(user_id, &password_hash)
             .await?;
 
         Ok(())
@@ -310,13 +308,14 @@ impl BanService {
     ///
     /// The function panics if the optional user id has no value
     pub async fn ban_user(&self, username_to_be_banned: &str, maybe_user_id: Option<UserId>) -> Result<(), ServiceError> {
-        debug!(
-            "user with ID {} banning username: {username_to_be_banned}",
-            maybe_user_id.expect("There is no user id needed to perform the action")
-        );
+        let Some(user_id) = maybe_user_id else {
+            return Err(ServiceError::UnauthorizedActionForGuests);
+        };
 
         self.authorization_service.authorize(ACTION::BanUser, maybe_user_id).await?;
 
+        debug!("user with ID {} banning username: {username_to_be_banned}", user_id);
+
         let user_profile = self
             .user_profile_repository
             .get_user_profile_from_username(username_to_be_banned)
diff --git a/src/web/api/server/v1/contexts/user/handlers.rs b/src/web/api/server/v1/contexts/user/handlers.rs
@@ -145,10 +145,7 @@ pub async fn change_password_handler(
         .await
     {
         Ok(()) => Json(OkResponseData {
-            data: format!(
-                "Password changed for user with ID: {}",
-                maybe_user_id.expect("There is no user id needed to perform the action")
-            ),
+            data: format!("Password changed for user with ID: {}", maybe_user_id.unwrap()),
         })
         .into_response(),
         Err(error) => error.into_response(),
