code quality

Author: aeltorio

src/visualization/jwt/claims.rs

@@ -147,7 +147,7 @@ pub struct IdTokenClaims {
     /// Whether the user's email is verified
     #[serde(skip_serializing_if = "Option::is_none")]
     pub email_verified: Option<bool>,
-    
+
     /// Additional custom claims
     #[serde(flatten)]
     pub additional_claims: HashMap<String, String>,

src/visualization/jwt/mod.rs

@@ -47,10 +47,10 @@
 
 // Internal modules that are not public
 mod claims;
-mod token_entry;
-mod token_map;
 mod issuer;
 mod responses;
+mod token_entry;
+mod token_map;
 
 // Existing modules that remain public
 /// JWT extensions for OpenID Connect support

src/visualization/jwt/responses.rs

@@ -6,9 +6,9 @@
 //!
 //! This module contains the response structures for OAuth token requests.
 
+use chrono::Utc;
 use oxide_auth::primitives::issuer::IssuedToken;
 use serde::{Deserialize, Serialize};
-use chrono::Utc;
 
 /// Custom OAuth token response structure with OpenID Connect support
 ///
@@ -57,7 +57,7 @@ impl OidcTokenResponse {
             scope,
         }
     }
-    
+
     /// Create a new OIDC token response with specified parameters
     pub fn new(
         access_token: String,

src/visualization/jwt/token_entry.rs

@@ -9,8 +9,8 @@
 
 use chrono::{DateTime, Utc};
 use oxide_auth::primitives::grant::Grant;
-use std::collections::HashMap;
 use serde_json::Value;
+use std::collections::HashMap;
 
 use super::claims::IdTokenClaims;
 
@@ -54,7 +54,7 @@ pub struct TokenEntry {
     /// The time at which this token will expire and no longer be valid for use.
     /// Both access and refresh tokens share the same expiration time in this implementation.
     pub expiry: DateTime<Utc>,
-    
+
     /// ID token claims stored for reference
     pub id_token_claims: Option<IdTokenClaims>,
 }
@@ -78,12 +78,12 @@ impl TokenEntry {
             id_token_claims,
         }
     }
-    
+
     /// Check if the token has expired
     pub fn is_expired(&self) -> bool {
         self.expiry < Utc::now()
     }
-    
+
     /// Get remaining validity time in seconds
     pub fn valid_for_seconds(&self) -> i64 {
         let now = Utc::now();
@@ -93,17 +93,17 @@ impl TokenEntry {
             (self.expiry - now).num_seconds()
         }
     }
-    
+
     /// Get the user ID (subject) from the grant
     pub fn user_id(&self) -> &str {
         &self.grant.owner_id
     }
-    
+
     /// Get the client ID from the grant
     pub fn client_id(&self) -> &str {
         &self.grant.client_id
     }
-    
+
     /// Get the scope as a space-separated string
     pub fn scope(&self) -> String {
         self.grant.scope.to_string()

src/visualization/jwt/token_map.rs

@@ -6,14 +6,14 @@
 //!
 //! This module contains the core implementation of the JWT token store.
 
-use std::collections::HashMap;
-use std::sync::Arc;
 use chrono::{DateTime, Duration, TimeZone, Utc};
 use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Header, Validation};
 use oxide_auth::primitives::generator::{RandomGenerator, TagGrant};
 use oxide_auth::primitives::grant::{Extensions, Grant, Value};
 use oxide_auth::primitives::issuer::{IssuedToken, Issuer, RefreshedToken, TokenType};
 use serde_json::Value as JsonValue;
+use std::collections::HashMap;
+use std::sync::Arc;
 use url::Url;
 
 use super::claims::{IdTokenClaims, JwtClaims};
@@ -279,22 +279,31 @@ impl JwtTokenMap {
         let sid = sid.or_else(|| Some(format!("session-{}", self.usage_counter)));
         // Convert nonce to a string if it exists
         let nonce = nonce.map(|n| n.to_string());
-        
+
         // Create the ID token claims
         let mut additional_claims = HashMap::new();
-        
+
         // Add any extra claims that weren't explicitly handled
         for (key, value) in &self.claims {
-            if !matches!(key.as_str(), 
-                "user_name" | "name" | "preferred_username" | "nickname" | 
-                "picture" | "email" | "email_verified" | "sid" | 
-                "user_id" | "user_permissions") {
+            if !matches!(
+                key.as_str(),
+                "user_name"
+                    | "name"
+                    | "preferred_username"
+                    | "nickname"
+                    | "picture"
+                    | "email"
+                    | "email_verified"
+                    | "sid"
+                    | "user_id"
+                    | "user_permissions"
+            ) {
                 if let Value::Public(Some(val)) = value {
                     additional_claims.insert(key.clone(), val.clone());
                 }
             }
         }
-        
+
         // Create the ID token claims
         Some(IdTokenClaims {
             sub: grant.owner_id.clone(),
@@ -398,15 +407,15 @@ impl Issuer for JwtTokenMap {
         } else {
             None // No ID token if 'openid' scope is not requested
         };
-        
+
         // Store the token
         let token_entry = Arc::new(TokenEntry::new(
-            access_token.clone(), 
-            id_token.clone(), 
-            refresh_token.clone(), 
-            grant.clone(), 
-            grant.until, 
-            id_token_claims
+            access_token.clone(),
+            id_token.clone(),
+            refresh_token.clone(),
+            grant.clone(),
+            grant.until,
+            id_token_claims,
         ));
 
         // Add to maps

src/visualization/server.rs

@@ -442,10 +442,9 @@ pub async fn build_rocket(figment: Figment) -> Rocket<Build> {
                     base64::engine::general_purpose::STANDARD.decode(&oxide_state.rs256_public_key)
                 {
                     // Create a new JWT issuer with RS256 keys
-                    if let Ok(jwt_issuer) = super::jwt::JwtIssuer::with_rs256_pem(
-                        &decoded_private,
-                        &decoded_public,
-                    ) {
+                    if let Ok(jwt_issuer) =
+                        super::jwt::JwtIssuer::with_rs256_pem(&decoded_private, &decoded_public)
+                    {
                         oxide_state.issuer = std::sync::Arc::new(std::sync::Mutex::new(jwt_issuer));
                     }
                 }