Skip to content

fix: don't change teams when JWT expires #158

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
socksy wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: don't change teams when JWT expires #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions crates/config/src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,11 @@ impl Session {
jwt: session_response.token.jwt.clone(),
};

// Remember the current active team's JWT if there is one
let active_team_jwt = self.active_team.as_ref().map(|team| team.token.jwt.clone());
// Remember current active team after refresh
let active_team_aid = self
.active_team
.as_ref()
.and_then(|team| extract_aid_from_jwt(&team.token.jwt));

// Update teams
self.teams = session_response
Expand All @@ -238,15 +241,14 @@ impl Session {
})
.collect();

// Try to restore the active team based on the JWT
let jwt_match_found = if let Some(jwt) = active_team_jwt {
self.set_active_team_by_jwt(&jwt)
} else {
false
};
// Try to restore the active team by account ID (JWT changes after refresh)
let found_active_team = active_team_aid
.as_ref()
.map(|aid| self.set_active_team_by_aid(aid))
.unwrap_or(false);

// If no active team was set by JWT, fall back to a personal team
if !jwt_match_found && self.active_team.is_none() {
// Fall back to personal team if previous active team not found
if !found_active_team {
// Find a team with team_type="personal"
if let Some(personal_team) = self.teams.iter().find(|team| team.team_type == "personal")
{
Expand Down
Loading