Skip to content

Add expires_in to introspection responses #4241

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

Merged
merged 2 commits into from
Mar 17, 2025
Merged

Add expires_in to introspection responses #4241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86a9ad3
Add `expires_in` to introspection responses
reivilibre Mar 17, 2025
910630c
Use `DurationSeconds`
reivilibre Mar 17, 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
9 changes: 9 additions & 0 deletions crates/handlers/src/oauth2/introspection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ const INACTIVE: IntrospectionResponse = IntrospectionResponse {
username: None,
token_type: None,
exp: None,
expires_in: None,
iat: None,
nbf: None,
sub: None,
Expand Down Expand Up @@ -281,6 +282,9 @@ pub(crate) async fn post(
username,
token_type: Some(OAuthTokenTypeHint::AccessToken),
exp: access_token.expires_at,
expires_in: access_token
.expires_at
.map(|expires_at| expires_at.signed_duration_since(clock.now())),
iat: Some(access_token.created_at),
nbf: Some(access_token.created_at),
sub,
Expand Down Expand Up @@ -341,6 +345,7 @@ pub(crate) async fn post(
username,
token_type: Some(OAuthTokenTypeHint::RefreshToken),
exp: None,
expires_in: None,
iat: Some(refresh_token.created_at),
nbf: Some(refresh_token.created_at),
sub,
Expand Down Expand Up @@ -414,6 +419,9 @@ pub(crate) async fn post(
username: Some(user.username),
token_type: Some(OAuthTokenTypeHint::AccessToken),
exp: access_token.expires_at,
expires_in: access_token
.expires_at
.map(|expires_at| expires_at.signed_duration_since(clock.now())),
iat: Some(access_token.created_at),
nbf: Some(access_token.created_at),
sub: Some(user.sub),
Expand Down Expand Up @@ -487,6 +495,7 @@ pub(crate) async fn post(
username: Some(user.username),
token_type: Some(OAuthTokenTypeHint::RefreshToken),
exp: None,
expires_in: None,
iat: Some(refresh_token.created_at),
nbf: Some(refresh_token.created_at),
sub: Some(user.sub),
Expand Down
5 changes: 5 additions & 0 deletions crates/oauth2-types/src/requests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,11 @@ pub struct IntrospectionResponse {
#[serde_as(as = "Option<TimestampSeconds>")]
pub exp: Option<DateTime<Utc>>,

/// Relative timestamp indicating when the token will expire,
/// in seconds from the current instant.
#[serde_as(as = "Option<DurationSeconds<i64>>")]
pub expires_in: Option<Duration>,

/// Timestamp indicating when the token was issued.
#[serde_as(as = "Option<TimestampSeconds>")]
pub iat: Option<DateTime<Utc>>,
Expand Down
Loading