Skip to content

fxa-client: logging tweaks for access tokens. #7461

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

fxa-client: logging tweaks for access tokens. #7461

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
36 changes: 27 additions & 9 deletions components/fxa-client/src/internal/oauth/access_token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use super::super::{scopes, util, FirefoxAccount};
use super::RefreshToken;
use crate::{error, Error, Result, ScopedKey};
use crate::{debug, error, info, Error, Result, ScopedKey};
use serde_derive::*;
use std::collections::HashSet;
use std::time::{SystemTime, UNIX_EPOCH};
Expand Down Expand Up @@ -37,6 +37,7 @@ impl FirefoxAccount {
///
/// **💾 This method may alter the persisted account state.**
pub fn get_access_token(&mut self, scope: &str, use_cache: bool) -> Result<AccessTokenInfo> {
debug!("get_access_token for scope={scope}, use_cache={use_cache}");
let requested = normalize_scopes(scope);
if requested.is_empty() {
return Err(Error::IllegalState("No scopes requested."));
Expand All @@ -50,6 +51,11 @@ impl FirefoxAccount {
if oauth_info.check_missing_sync_scoped_key().is_ok() {
return Ok(oauth_info.clone());
}
// but it missing should be impossible!?
error_support::report_error!(
"fxaclient-lost-scoped-key",
"have cached token without a key"
);
}
}
}
Expand All @@ -64,6 +70,10 @@ impl FirefoxAccount {
.collect();
if !missing.is_empty() {
// We don't currently have all scopes - try token exchange to upgrade.
info!(
"refresh token doing exchange; have {:?}, missing {missing:?})",
refresh_token.scopes
);
let exchange_resp = self.client.exchange_token_for_scope(
self.state.config(),
&refresh_token.token,
Expand Down Expand Up @@ -92,6 +102,9 @@ impl FirefoxAccount {
.iter()
.all(|s| refresh_token.scopes.contains(*s))
{
info!(
"using refresh token to request new token with scope {requested_scopes:?}"
);
self.client.create_access_token_using_refresh_token(
self.state.config(),
&refresh_token.token,
Expand All @@ -106,14 +119,19 @@ impl FirefoxAccount {
return Err(Error::UnexpectedServerResponse);
}
}
None => match self.state.session_token() {
Some(session_token) => self.client.create_access_token_using_session_token(
self.state.config(),
session_token,
&requested_scopes,
)?,
None => return Err(Error::NoSessionToken),
},
None => {
match self.state.session_token() {
Some(session_token) => {
info!("using session token to request new token with scope {requested_scopes:?}");
self.client.create_access_token_using_session_token(
self.state.config(),
session_token,
&requested_scopes,
)?
}
None => return Err(Error::NoSessionToken),
}
}
};
let since_epoch = SystemTime::now()
.duration_since(UNIX_EPOCH)
Expand Down