refactor: Pass 'String' to token_kid instead of internal type
This commit is contained in:
		
							parent
							
								
									b6eedbfe16
								
							
						
					
					
						commit
						7c99220723
					
				
					 2 changed files with 4 additions and 4 deletions
				
			
		|  | @ -113,7 +113,7 @@ impl JWKS { | ||||||
| 
 | 
 | ||||||
| /// Representation of an undecoded JSON Web Token. See [RFC
 | /// Representation of an undecoded JSON Web Token. See [RFC
 | ||||||
| /// 7519](https://tools.ietf.org/html/rfc7519).
 | /// 7519](https://tools.ietf.org/html/rfc7519).
 | ||||||
| pub struct JWT (String); | struct JWT (String); | ||||||
| 
 | 
 | ||||||
| /// Representation of a decoded and validated JSON Web Token.
 | /// Representation of a decoded and validated JSON Web Token.
 | ||||||
| ///
 | ///
 | ||||||
|  | @ -181,10 +181,10 @@ impl From<serde_json::Error> for ValidationError { | ||||||
| ///
 | ///
 | ||||||
| /// This is only safe if the key set containing the currently allowed
 | /// This is only safe if the key set containing the currently allowed
 | ||||||
| /// key IDs is fetched from a trusted source.
 | /// key IDs is fetched from a trusted source.
 | ||||||
| pub fn token_kid(jwt: &JWT) -> JWTResult<Option<String>> { | pub fn token_kid(token: &str) -> JWTResult<Option<String>> { | ||||||
|     // Fetch the header component of the JWT by splitting it out and
 |     // Fetch the header component of the JWT by splitting it out and
 | ||||||
|     // dismissing the rest.
 |     // dismissing the rest.
 | ||||||
|     let parts: Vec<&str> = jwt.0.splitn(2, '.').collect(); |     let parts: Vec<&str> = token.splitn(2, '.').collect(); | ||||||
|     if parts.len() != 2 { |     if parts.len() != 2 { | ||||||
|         return Err(ValidationError::MalformedJWT); |         return Err(ValidationError::MalformedJWT); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -21,7 +21,7 @@ fn test_decode_find_jwks() { | ||||||
| 
 | 
 | ||||||
| #[test] | #[test] | ||||||
| fn test_token_kid() { | fn test_token_kid() { | ||||||
|     let jwt = JWT("eyJraWQiOiI4ckRxOFB3MEZaY2FvWFdURVZRbzcrVGYyWXpTTDFmQnhOS1BDZWJhYWk0PSIsImFsZyI6IlJTMjU2IiwidHlwIjoiSldUIn0.eyJpc3MiOiJhdXRoLnRlc3QuYXByaWxhLm5vIiwiaWF0IjoxNTM2MDUwNjkzLCJleHAiOjE1MzYwNTQyOTMsInN1YiI6IjQyIiwiZXh0Ijoic21va2V0ZXN0IiwicHJ2IjoiYXJpc3RpIiwic2NwIjoicHJvY2VzcyJ9.gOLsv98109qLkmRK6Dn7WWRHLW7o8W78WZcWvFZoxPLzVO0qvRXXRLYc9h5chpfvcWreLZ4f1cOdvxv31_qnCRSQQPOeQ7r7hj_sPEDzhKjk-q2aoNHaGGJg1vabI--9EFkFsGQfoS7UbMMssS44dgR68XEnKtjn0Vys-Vzbvz_CBSCH6yQhRLik2SU2jR2L7BoFvh4LGZ6EKoQWzm8Z-CHXLGLUs4Hp5aPhF46dGzgAzwlPFW4t9G4DciX1uB4vv1XnfTc5wqJch6ltjKMde1GZwLR757a8dJSBcmGWze3UNE2YH_VLD7NCwH2kkqr3gh8rn7lWKG4AUIYPxsw9CB".into()); |     let jwt = "eyJraWQiOiI4ckRxOFB3MEZaY2FvWFdURVZRbzcrVGYyWXpTTDFmQnhOS1BDZWJhYWk0PSIsImFsZyI6IlJTMjU2IiwidHlwIjoiSldUIn0.eyJpc3MiOiJhdXRoLnRlc3QuYXByaWxhLm5vIiwiaWF0IjoxNTM2MDUwNjkzLCJleHAiOjE1MzYwNTQyOTMsInN1YiI6IjQyIiwiZXh0Ijoic21va2V0ZXN0IiwicHJ2IjoiYXJpc3RpIiwic2NwIjoicHJvY2VzcyJ9.gOLsv98109qLkmRK6Dn7WWRHLW7o8W78WZcWvFZoxPLzVO0qvRXXRLYc9h5chpfvcWreLZ4f1cOdvxv31_qnCRSQQPOeQ7r7hj_sPEDzhKjk-q2aoNHaGGJg1vabI--9EFkFsGQfoS7UbMMssS44dgR68XEnKtjn0Vys-Vzbvz_CBSCH6yQhRLik2SU2jR2L7BoFvh4LGZ6EKoQWzm8Z-CHXLGLUs4Hp5aPhF46dGzgAzwlPFW4t9G4DciX1uB4vv1XnfTc5wqJch6ltjKMde1GZwLR757a8dJSBcmGWze3UNE2YH_VLD7NCwH2kkqr3gh8rn7lWKG4AUIYPxsw9CB"; | ||||||
| 
 | 
 | ||||||
|     let kid = token_kid(&jwt).expect("Failed to extract token KID"); |     let kid = token_kid(&jwt).expect("Failed to extract token KID"); | ||||||
|     assert_eq!(Some("8rDq8Pw0FZcaoXWTEVQo7+Tf2YzSL1fBxNKPCebaai4=".into()), |     assert_eq!(Some("8rDq8Pw0FZcaoXWTEVQo7+Tf2YzSL1fBxNKPCebaai4=".into()), | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue