fix(file): Removed unwrap on user because he is always set

src/controllers/playlist_controller.rs

@@ -31,10 +31,10 @@ tag="playlist"
 )]
 #[post("/playlist")]
 pub async fn add_playlist(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     playlist: web::Json<PlaylistDtoPost>,
 ) -> Result<HttpResponse, CustomError> {
-    let user = requester.unwrap().into_inner();
+    let user = requester.into_inner();
     let playlist = playlist.into_inner();
 
     let res = Playlist::create_new_playlist(playlist, user)?;
@@ -50,11 +50,11 @@ tag="playlist"
 )]
 #[put("/playlist/{playlist_id}")]
 pub async fn update_playlist(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     playlist: web::Json<PlaylistDtoPost>,
     playlist_id: web::Path<String>,
 ) -> Result<HttpResponse, CustomError> {
-    let user = requester.unwrap().into_inner();
+    let user = requester.into_inner();
     let playlist = playlist.into_inner();
 
     let res = Playlist::update_playlist(playlist, playlist_id.clone(), user)?;
@@ -70,9 +70,9 @@ tag="playlist"
 )]
 #[get("/playlist")]
 pub async fn get_all_playlists(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    Playlist::get_playlists(requester.unwrap().into_inner().id)
+    Playlist::get_playlists(requester.into_inner().id)
         .map(|playlists| HttpResponse::Ok().json(playlists))
 }
 
@@ -84,10 +84,10 @@ tag="playlist"
 )]
 #[get("/playlist/{playlist_id}")]
 pub async fn get_playlist_by_id(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     playlist_id: web::Path<String>,
 ) -> Result<HttpResponse, CustomError> {
-    let user_id = requester.clone().unwrap();
+    let user_id = requester;
     let playlist =
         Playlist::get_playlist_by_user_and_id(playlist_id.clone(), user_id.clone().into_inner())?;
     let playlist =
@@ -103,10 +103,10 @@ tag="playlist"
 )]
 #[delete("/playlist/{playlist_id}")]
 pub async fn delete_playlist_by_id(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     playlist_id: web::Path<String>,
 ) -> Result<HttpResponse, CustomError> {
-    let user_id = requester.clone().unwrap().id;
+    let user_id = requester.id;
     Playlist::delete_playlist_by_id(playlist_id.clone(), user_id)?;
     Ok(HttpResponse::Ok().json(()))
 }
@@ -119,10 +119,10 @@ tag="playlist"
 )]
 #[delete("/playlist/{playlist_id}/episode/{episode_id}")]
 pub async fn delete_playlist_item(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     path: web::Path<(String, i32)>,
 ) -> Result<HttpResponse, CustomError> {
-    let user_id = requester.clone().unwrap().id;
+    let user_id = requester.id;
     let unwrapped_path = path.into_inner();
     Playlist::delete_playlist_item(unwrapped_path.0, unwrapped_path.1, user_id).await?;
     Ok(HttpResponse::Ok().json(()))

src/controllers/podcast_controller.rs

@@ -56,9 +56,9 @@ tag="podcasts"
 )]
 #[get("/podcasts/filter")]
 pub async fn get_filter(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    let filter = Filter::get_filter_by_username(requester.unwrap().username.clone()).await?;
+    let filter = Filter::get_filter_by_username(&requester.username).await?;
     Ok(HttpResponse::Ok().json(filter))
 }
 
@@ -72,22 +72,22 @@ tag="podcasts"
 #[get("/podcasts/search")]
 pub async fn search_podcasts(
     query: web::Query<PodcastSearchModel>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
     let query = query.into_inner();
     let _order = query.order.unwrap_or(OrderCriteria::Asc);
     let _latest_pub = query.order_option.unwrap_or(OrderOption::Title);
     let tag = query.tag;
 
     let opt_filter =
-        Filter::get_filter_by_username(requester.clone().unwrap().username.clone()).await?;
+        Filter::get_filter_by_username(&requester.username).await?;
 
     let only_favored = match opt_filter {
         Some(filter) => filter.only_favored,
         None => true,
     };
 
-    let username = requester.unwrap().username.clone();
+    let username = requester.username.clone();
     let filter = Filter::new(
         username.clone(),
         query.title.clone(),
@@ -137,14 +137,14 @@ tag="podcasts"
 #[get("/podcast/{id}")]
 pub async fn find_podcast_by_id(
     id: Path<String>,
-    user: Option<web::ReqData<User>>,
+    user: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
     let id_num = from_str::<i32>(&id).unwrap();
-    let username = user.unwrap().username.clone();
+    let username = &user.username;
 
     let podcast = PodcastService::get_podcast(id_num)?;
-    let tags = Tag::get_tags_of_podcast(id_num, &username)?;
-    let favorite = Favorite::get_favored_podcast_by_username_and_podcast_id(&username, id_num)?;
+    let tags = Tag::get_tags_of_podcast(id_num, username)?;
+    let favorite = Favorite::get_favored_podcast_by_username_and_podcast_id(username, id_num)?;
     let podcast_dto: PodcastDto = (podcast, favorite, tags).into();
     Ok(HttpResponse::Ok().json(podcast_dto))
 }
@@ -158,9 +158,9 @@ tag="podcasts"
 )]
 #[get("/podcasts")]
 pub async fn find_all_podcasts(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    let username = requester.unwrap().username.clone();
+    let username = &requester.username;
 
     let podcasts = PodcastService::get_podcasts(username)?;
 
@@ -177,9 +177,9 @@ tag="podcasts"
 #[get("/podcasts/{type_of}/{podcast}/search")]
 pub async fn find_podcast(
     podcast_col: Path<(i32, String)>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -215,9 +215,9 @@ tag="podcasts"
 pub async fn add_podcast(
     track_id: web::Json<PodcastAddModel>,
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -261,9 +261,9 @@ tag="podcasts"
 pub async fn add_podcast_by_feed(
     rss_feed: web::Json<PodcastRSSAddModel>,
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
     let mut header_map = HeaderMap::new();
@@ -315,9 +315,9 @@ tag="podcasts"
 pub async fn import_podcasts_from_opml(
     opml: Json<OpmlModel>,
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
     let document = OPML::from_str(&opml.content).unwrap();
@@ -347,9 +347,9 @@ tag="podcasts"
 pub async fn add_podcast_from_podindex(
     id: web::Json<PodcastAddModel>,
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -396,9 +396,9 @@ tag="podcasts"
 #[post("/podcast/all")]
 pub async fn refresh_all_podcasts(
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -433,9 +433,9 @@ tag="podcasts"
 pub async fn download_podcast(
     id: Path<String>,
     lobby: Data<ChatServerHandle>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -471,12 +471,12 @@ tag="podcasts"
 #[put("/podcast/favored")]
 pub async fn favorite_podcast(
     update_model: Json<PodcastFavorUpdateModel>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
     PodcastService::update_favor_podcast(
         update_model.id,
         update_model.favored,
-        requester.unwrap().username.clone(),
+        &requester.username,
     )?;
     Ok(HttpResponse::Ok().json("Favorited podcast"))
 }
@@ -489,9 +489,9 @@ tag="podcasts"
 )]
 #[get("/podcasts/favored")]
 pub async fn get_favored_podcasts(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    let podcasts = PodcastService::get_favored_podcasts(requester.unwrap().username.clone())?;
+    let podcasts = PodcastService::get_favored_podcasts(requester.username.clone())?;
     Ok(HttpResponse::Ok().json(podcasts))
 }
 
@@ -505,9 +505,9 @@ tag="podcasts"
 #[put("/podcast/{id}/active")]
 pub async fn update_active_podcast(
     id: Path<String>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -658,9 +658,9 @@ tag="podcasts"
 pub async fn delete_podcast(
     data: web::Json<DeletePodcast>,
     id: Path<i32>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -780,9 +780,9 @@ pub(crate) async fn proxy_podcast(
 pub async fn update_podcast_settings(
     id: Path<i32>,
     settings: Json<PodcastSetting>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -797,9 +797,9 @@ pub async fn update_podcast_settings(
 #[get("/podcasts/{id}/settings")]
 pub async fn get_podcast_settings(
     id: Path<i32>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 

src/controllers/podcast_episode_controller.rs

@@ -45,15 +45,15 @@ tag = "podcast_episodes"
 #[get("/podcast/{id}/episodes")]
 pub async fn find_all_podcast_episodes_of_podcast(
     id: web::Path<String>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     last_podcast_episode: Query<OptionalId>,
 ) -> Result<HttpResponse, CustomError> {
     let last_podcast_episode = last_podcast_episode.into_inner();
     let id_num = from_str(&id).unwrap();
     let res = PodcastEpisodeService::get_podcast_episodes_of_podcast(
         id_num,
         last_podcast_episode.last_podcast_episode,
-        requester.unwrap().into_inner(),
+        requester.into_inner(),
     )?;
     let mapped_podcasts = res
         .into_iter()
@@ -78,9 +78,9 @@ pub struct TimeLinePodcastEpisode {
 
 #[get("/podcast/available/gpodder")]
 pub async fn get_available_podcasts_not_in_webview(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
     let found_episodes = Episode::find_episodes_not_in_webview()?;
@@ -111,11 +111,11 @@ tag = "podcasts"
 )]
 #[get("/podcasts/timeline")]
 pub async fn get_timeline(
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     favored_only: Query<TimelineQueryParams>,
 ) -> Result<HttpResponse, CustomError> {
     let res = TimelineItem::get_timeline(
-        requester.unwrap().username.clone(),
+        requester.username.clone(),
         favored_only.into_inner(),
     )?;
 
@@ -153,9 +153,9 @@ tag = "podcast_episodes"
 #[put("/podcast/{id}/episodes/download")]
 pub async fn download_podcast_episodes_of_podcast(
     id: web::Path<String>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }
 
@@ -184,10 +184,10 @@ tag = "podcast_episodes"
 #[delete("/episodes/{id}/download")]
 pub async fn delete_podcast_episode_locally(
     id: web::Path<String>,
-    requester: Option<web::ReqData<User>>,
+    requester: web::ReqData<User>,
     lobby: Data<ChatServerHandle>,
 ) -> Result<HttpResponse, CustomError> {
-    if !requester.unwrap().is_privileged_user() {
+    if !requester.is_privileged_user() {
         return Err(CustomError::Forbidden);
     }