Remove max expiration field

oxidecomputer · Nov 28, 2023 · 639b041 · 639b041
1 parent cc59c59
commit 639b041
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 13 deletions.
diff --git a/rfd-api/config.example.toml b/rfd-api/config.example.toml
@@ -23,9 +23,6 @@ database_url = ""
 # Duration that a JWT is valid for
 default_expiration = 3600
 
-# Deprecated: To be removed
-max_expiration = 1209600
-
 # Keys for signing JWTs and generating secrets. Currently GCP Cloud KMS keys and local static keys
 # are supported
 

diff --git a/rfd-api/src/config.rs b/rfd-api/src/config.rs
@@ -74,7 +74,6 @@ impl<'de> Deserialize<'de> for ServerLogFormat {
 #[derive(Debug, Default, Deserialize)]
 pub struct JwtConfig {
     pub default_expiration: i64,
-    pub max_expiration: i64,
 }
 
 #[derive(Debug, Deserialize)]

diff --git a/rfd-api/src/context.rs b/rfd-api/src/context.rs
@@ -119,8 +119,6 @@ pub struct ApiContext {
 
 pub struct JwtContext {
     pub default_expiration: i64,
-    pub max_expiration: i64,
-    // pub signers: Vec<Box<dyn JwtSigner<Claims = Claims>>>,
     pub signers: Vec<JwtSigner>,
     pub jwks: JwkSet,
 }
@@ -233,7 +231,6 @@ impl ApiContext {
             },
             jwt: JwtContext {
                 default_expiration: jwt.default_expiration,
-                max_expiration: jwt.max_expiration,
                 jwks: JwkSet {
                     keys: jwt_signers.iter().map(|k| k.jwk()).cloned().collect(),
                 },
@@ -284,10 +281,6 @@ impl ApiContext {
         self.jwt.default_expiration
     }
 
-    pub fn max_jwt_expiration(&self) -> i64 {
-        self.jwt.max_expiration
-    }
-
     pub async fn jwks(&self) -> &JwkSet {
         &self.jwt.jwks
     }

diff --git a/rfd-api/src/endpoints/login/oauth/code.rs b/rfd-api/src/endpoints/login/oauth/code.rs
@@ -508,8 +508,6 @@ pub async fn authz_code_exchange(
         .map(|s| s.to_string())
         .collect::<Vec<_>>();
 
-    // Generate a new access token for the user with an expiration matching the value given to us
-    // by the remote service
     let token = ctx
         .register_access_token(&api_user, &api_user_provider, scope)
         .await?;