Skip to content

Fix/trakt refresh #821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: development
Choose a base branch
from
Open

Fix/trakt refresh #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9cdf2fd
chore: loadable and APIResponse helper impls and fns
elpiel May 16, 2025
88e5dd2
feat(core): api - RefreshTraktToken request
elpiel May 16, 2025
765f2c1
feat(core): ctx - trakt token refresh
elpiel May 16, 2025
9df16a9
Merge branch 'development' into fix/trakt-refresh
elpiel May 19, 2025
5b3bfd7
fix: api - refresh token request is not POST with body and AuthKey
elpiel May 19, 2025
ec56a3e
feat(stremio-core-csharp): Ctx - add trakt_refreshed field
elpiel May 19, 2025
28e8979
chore(core): loadable - remove duplicate impl for Result
elpiel May 19, 2025
1d687c9
fix: fmt & clippy warnings
elpiel May 19, 2025
e3ea0a3
fix: import lint
elpiel May 20, 2025
a01f45b
Merge branch 'fix/new-lints' into fix/trakt-refresh
elpiel May 20, 2025
342df1b
feat: trakt refresh - add last_updated and custom struct for field
elpiel May 21, 2025
5c10a98
fix lint
dexter21767-dev May 23, 2025
6aaa6c3
fix: fmt
elpiel May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 39 additions & 9 deletions src/models/ctx/ctx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::{
constants::LIBRARY_COLLECTION_NAME,
models::{
common::{DescriptorLoadable, Loadable, ResourceLoadable},
common::{eq_update, DescriptorLoadable, Loadable, ResourceLoadable},
ctx::{
update_events, update_library, update_notifications, update_profile,
update_search_history, update_streaming_server_urls, update_streams,
Expand All @@ -15,19 +15,21 @@ use crate::{
types::{
api::{
fetch_api, APIRequest, APIResult, AuthRequest, AuthResponse, CollectionResponse,
DatastoreCommand, DatastoreRequest, LibraryItemsResponse, SuccessResponse,
DatastoreCommand, DatastoreRequest, LibraryItemsResponse, RefreshTraktToken,
SuccessResponse,
},
events::{DismissedEventsBucket, Events},
library::LibraryBucket,
notifications::NotificationsBucket,
profile::{Auth, AuthKey, Profile},
profile::{Auth, AuthKey, Profile, User},
resource::MetaItem,
search_history::SearchHistoryBucket,
server_urls::ServerUrlsBucket,
streams::StreamsBucket,
},
};

use chrono::{DateTime, Utc};
#[cfg(test)]
use derivative::Derivative;
use enclose::enclose;
Expand Down Expand Up @@ -75,6 +77,15 @@ pub struct Ctx {
pub notification_catalogs: Vec<ResourceLoadable<Vec<MetaItem>>>,

pub events: Events,
#[serde(skip)]
pub refresh_trakt: Option<RefreshTrakt>,
}

#[derive(Serialize, Clone, Debug, PartialEq, Eq)]
pub struct RefreshTrakt {
pub request: RefreshTraktToken,
pub last_requested: DateTime<Utc>,
pub response: Loadable<User, CtxError>,
}

impl Ctx {
Expand Down Expand Up @@ -103,6 +114,7 @@ impl Ctx {
modal: Loadable::Loading,
notification: Loadable::Loading,
},
refresh_trakt: None,
}
}
}
Expand All @@ -125,8 +137,13 @@ impl<E: Env + 'static> Update<E> for Ctx {
}
_ => Effects::none().unchanged(),
};
let profile_effects =
update_profile::<E>(&mut self.profile, &mut self.streams, &self.status, msg);
let profile_effects = update_profile::<E>(
&mut self.profile,
&mut self.streams,
&mut self.refresh_trakt,
&self.status,
msg,
);
let library_effects =
update_library::<E>(&mut self.library, &self.profile, &self.status, msg);
let streams_effects = update_streams::<E>(&mut self.streams, &self.status, msg);
Expand All @@ -145,6 +162,8 @@ impl<E: Env + 'static> Update<E> for Ctx {
&self.status,
msg,
);
let refresh_trakt_effects = eq_update(&mut self.refresh_trakt, None);

let notifications_effects = update_notifications::<E>(
&mut self.notifications,
&mut self.notification_catalogs,
Expand All @@ -164,11 +183,17 @@ impl<E: Env + 'static> Update<E> for Ctx {
.join(search_history_effects)
.join(events_effects)
.join(trakt_addon_effects)
.join(refresh_trakt_effects)
.join(notifications_effects)
}
Msg::Internal(Internal::CtxAuthResult(auth_request, result)) => {
let profile_effects =
update_profile::<E>(&mut self.profile, &mut self.streams, &self.status, msg);
let profile_effects = update_profile::<E>(
&mut self.profile,
&mut self.streams,
&mut self.refresh_trakt,
&self.status,
msg,
);
let library_effects =
update_library::<E>(&mut self.library, &self.profile, &self.status, msg);
let trakt_addon_effects = update_trakt_addon::<E>(
Expand Down Expand Up @@ -267,8 +292,13 @@ impl<E: Env + 'static> Update<E> for Ctx {
.join(ctx_effects)
}
_ => {
let profile_effects =
update_profile::<E>(&mut self.profile, &mut self.streams, &self.status, msg);
let profile_effects = update_profile::<E>(
&mut self.profile,
&mut self.streams,
&mut self.refresh_trakt,
&self.status,
msg,
);
let library_effects =
update_library::<E>(&mut self.library, &self.profile, &self.status, msg);
let streams_effects = update_streams::<E>(&mut self.streams, &self.status, msg);
Expand Down
170 changes: 161 additions & 9 deletions src/models/ctx/update_profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,27 @@ use enclose::enclose;
use futures::{future, FutureExt, TryFutureExt};

use crate::constants::{OFFICIAL_ADDONS, PROFILE_STORAGE_KEY};
use crate::models::ctx::{CtxError, CtxStatus, OtherError};
use crate::models::common::eq_update;
use crate::models::{
common::Loadable,
ctx::{CtxError, CtxStatus, OtherError},
};
use crate::runtime::msg::{Action, ActionCtx, CtxAuthResponse, Event, Internal, Msg};
use crate::runtime::{Effect, EffectFuture, Effects, Env, EnvFutureExt};
use crate::runtime::{Effect, EffectFuture, Effects, Env, EnvError, EnvFutureExt};
use crate::types::addon::Descriptor;
use crate::types::api::{
fetch_api, APIError, APIRequest, APIResult, CollectionResponse, SuccessResponse,
fetch_api, APIError, APIRequest, APIResult, CollectionResponse, RefreshTraktToken,
SuccessResponse,
};
use crate::types::profile::{Auth, AuthKey, Password, Profile, Settings, User};
use crate::types::streams::StreamsBucket;

use super::RefreshTrakt;

pub fn update_profile<E: Env + 'static>(
profile: &mut Profile,
streams: &mut StreamsBucket,
refresh_trakt: &mut Option<RefreshTrakt>,
status: &CtxStatus,
msg: &Msg,
) -> Effects {
Expand Down Expand Up @@ -48,8 +56,8 @@ pub fn update_profile<E: Env + 'static>(
}))
.unchanged(),
},
Msg::Action(Action::Ctx(ActionCtx::PullUserFromAPI)) => match profile.auth_key() {
Some(auth_key) => Effects::one(pull_user_from_api::<E>(auth_key)).unchanged(),
Msg::Action(Action::Ctx(ActionCtx::PullUserFromAPI)) => match profile.auth.as_ref() {
Some(auth) => Effects::one(pull_user_from_api::<E>(&auth.key)).unchanged(),
_ => Effects::msg(Msg::Event(Event::Error {
error: CtxError::from(OtherError::UserNotLoggedIn),
source: Box::new(Event::UserPulledFromAPI { uid: profile.uid() }),
Expand Down Expand Up @@ -364,12 +372,73 @@ pub fn update_profile<E: Env + 'static>(
Msg::Internal(Internal::UserAPIResult(APIRequest::GetUser { auth_key }, result))
if profile.auth_key() == Some(auth_key) =>
{
let uid = profile.uid();
match result {
Ok(user) => match &mut profile.auth {
Some(auth) if auth.user != *user => {
user.clone_into(&mut auth.user);
Effects::msg(Msg::Event(Event::UserPulledFromAPI { uid: profile.uid() }))
.join(Effects::msg(Msg::Internal(Internal::ProfileChanged)))
Some(auth) => {
let profile_effects = if auth.user != *user {
user.clone_into(&mut auth.user);

Effects::msg(Msg::Event(Event::UserPulledFromAPI { uid: uid.clone() }))
.join(Effects::msg(Msg::Internal(Internal::ProfileChanged)))
} else {
Effects::msg(Msg::Event(Event::UserPulledFromAPI { uid: uid.clone() }))
.unchanged()
};

let refresh_trakt_effects = match user.trakt.as_ref() {
Some(trakt_info)
if trakt_info.created_at + trakt_info.expires_in < E::now() =>
{
// in case of success, trakt token won't be expired so checking for only error + 24h have passed is sufficient

match &*refresh_trakt {
Some(RefreshTrakt {
last_requested,
response: loadable,
..
}) if loadable.is_err()
&& E::now() - *last_requested
> chrono::TimeDelta::hours(24) =>
{
let (new_request, refresh_effect) =
refresh_trakt_token_api::<E>(auth_key.clone());
let api_request_effects =
Effects::one(refresh_effect).unchanged();

eq_update(
refresh_trakt,
Some(RefreshTrakt {
request: new_request,
last_requested: E::now(),
response: Loadable::Loading,
}),
)
.join(api_request_effects)
}
None => {
let (request, refresh_effect) =
refresh_trakt_token_api::<E>(auth_key.clone());
let api_request_effects =
Effects::one(refresh_effect).unchanged();

eq_update(
refresh_trakt,
Some(RefreshTrakt {
request: request.to_owned(),
last_requested: E::now(),
response: Loadable::Loading,
}),
)
.join(api_request_effects)
}
_ => Effects::none().unchanged(),
}
}
_ => Effects::none().unchanged(),
};

profile_effects.join(refresh_trakt_effects)
}
_ => Effects::msg(Msg::Event(Event::UserPulledFromAPI { uid: profile.uid() }))
.unchanged(),
Expand All @@ -390,6 +459,66 @@ pub fn update_profile<E: Env + 'static>(
}
}
}
Msg::Internal(Internal::UserRefreshTraktTokenAPIResult(request, result)) => {
match profile.auth.as_ref() {
Some(auth) if auth.key == request.auth_key => {
let profile_user_effects = match result {
Ok(new_user) => {
let mut new_profile = profile.clone();
new_profile.auth = new_profile.auth.map(|mut auth| {
auth.user = new_user.clone();
auth
});

let token_refreshed_effects =
Effects::msg(Msg::Event(Event::TraktTokenRefreshed {
uid: profile.uid(),
}))
.unchanged();

let profile_effects = eq_update(profile, new_profile);

profile_effects
.join(token_refreshed_effects)
.join(Effects::msg(Msg::Internal(Internal::ProfileChanged)))
}
Err(err) => {
let event = Event::TraktTokenRefreshed { uid: profile.uid() };
// todo: implement Error and Display for the CtxError and all underlying errors
tracing::error!(
"Refreshing trakt token failed for {:?} : {err:?}",
profile.uid(),
);

Effects::msg(Msg::Event(Event::Error {
error: CtxError::Env(EnvError::Other(
"Failed to refresh trakt token, please re-authenticate.".into(),
)),
source: Box::new(event),
}))
}
};
// use the same last requested or use the now()
// the request that resulted in this result should have set the last_requested field
let last_requested = refresh_trakt
.as_ref()
.map(|refresh_trakt| refresh_trakt.last_requested.to_owned())
.unwrap_or_else(E::now);

let refresh_trakt_effects = eq_update(
refresh_trakt,
Some(RefreshTrakt {
request: request.to_owned(),
last_requested,
response: result.to_owned().into(),
}),
);

profile_user_effects.join(refresh_trakt_effects)
}
_ => Effects::none().unchanged(),
}
}
Msg::Internal(Internal::DeleteAccountAPIResult(
APIRequest::DeleteAccount { auth_key, .. },
result,
Expand Down Expand Up @@ -434,6 +563,29 @@ fn push_addons_to_api<E: Env + 'static>(addons: Vec<Descriptor>, auth_key: &Auth
.into()
}

fn refresh_trakt_token_api<E: Env + 'static>(auth_key: AuthKey) -> (RefreshTraktToken, Effect) {
let request = RefreshTraktToken { auth_key };

let request2 = request.clone();
let request_effect = EffectFuture::Concurrent(
async move {
let result = fetch_api::<E, _, _, _>(&request2)
.await
.map_err(CtxError::from)
.and_then(|api_result| api_result.into_result().map_err(CtxError::from));

Msg::Internal(Internal::UserRefreshTraktTokenAPIResult(
request2.clone(),
result,
))
}
.boxed_env(),
)
.into();

(request, request_effect)
}

fn pull_user_from_api<E: Env + 'static>(auth_key: &AuthKey) -> Effect {
let request = APIRequest::GetUser {
auth_key: auth_key.to_owned(),
Expand Down
Loading