implements authentication/token retrieval/keyring

kordophone/src/model/jwt.rs

@@ -26,11 +26,31 @@ enum ExpValue {
 #[derive(Deserialize, Serialize, Debug, Clone)]
 #[allow(dead_code)]
 struct JwtPayload {
-    exp: serde_json::Value,
+    #[serde(deserialize_with = "deserialize_exp")]
+    exp: i64,
     iss: Option<String>,
     user: Option<String>,
 }
 
+fn deserialize_exp<'de, D>(deserializer: D) -> Result<i64, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    use serde::de::Error;
+    
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum ExpValue {
+        String(String),
+        Number(i64),
+    }
+    
+    match ExpValue::deserialize(deserializer)? {
+        ExpValue::String(s) => s.parse().map_err(D::Error::custom),
+        ExpValue::Number(n) => Ok(n),
+    }
+}
+
 #[derive(Deserialize, Serialize, Debug, Clone)]
 #[allow(dead_code)]
 pub struct JwtToken {
@@ -62,13 +82,7 @@ impl JwtToken {
         let payload: JwtPayload = serde_json::from_slice(&payload)?;
 
         // Parse jwt expiration date
-        // Annoyingly, because of my own fault, this could be either an integer or string.
-        let exp: i64 = payload.exp.as_i64().unwrap_or_else(|| {
-            let exp: String = payload.exp.as_str().unwrap().to_string();
-            exp.parse().unwrap()
-        });
-
-        let timestamp = DateTime::from_timestamp(exp, 0).unwrap().naive_utc();
+        let timestamp = DateTime::from_timestamp(payload.exp, 0).unwrap().naive_utc();
         let expiration_date = DateTime::from_naive_utc_and_offset(timestamp, Utc);
 
         Ok(JwtToken {
@@ -84,9 +98,19 @@ impl JwtToken {
         // STUPID: My mock server uses a different encoding than the real server, so we have to
         // try both encodings here.
 
-        Self::decode_token_using_engine(token, general_purpose::STANDARD).or(
+        log::debug!("Attempting to decode JWT token: {}", token);
+        
+        let result = Self::decode_token_using_engine(token, general_purpose::STANDARD).or(
             Self::decode_token_using_engine(token, general_purpose::URL_SAFE_NO_PAD),
-        )
+        );
+
+        if let Err(ref e) = result {
+            log::error!("Failed to decode JWT token: {}", e);
+            log::error!("Token length: {}", token.len());
+            log::error!("Token parts: {:?}", token.split('.').collect::<Vec<_>>());
+        }
+
+        result
     }
 
     pub fn dummy() -> Self {
@@ -96,7 +120,7 @@ impl JwtToken {
                 typ: "JWT".to_string(),
             },
             payload: JwtPayload {
-                exp: serde_json::Value::Null,
+                exp: 0,
                 iss: None,
                 user: None,
             },