diff --git a/examples/custom_claims.rs b/examples/custom_claims.rs index 70d4f55..ce09448 100644 --- a/examples/custom_claims.rs +++ b/examples/custom_claims.rs @@ -3,8 +3,7 @@ extern crate serde_derive; extern crate medallion; -use std::default::Default; -use medallion::{Payload, Header, Token}; +use medallion::{Header, Payload, Token}; #[derive(Default, Serialize, Deserialize, PartialEq, Debug)] struct Custom { @@ -24,16 +23,16 @@ fn new_token(user_id: &str, password: &str) -> Option { return None; } - let header: Header<()> = Default::default(); + let header: Header = Header::default(); let payload = Payload { // custom claims will be application specific, they may come from open standards such as // openidconnect where they may be referred to as registered claims claims: Some(Custom { user_id: user_id.into(), rhino: true, - ..Default::default() + ..Custom::default() }), - ..Default::default() + ..Payload::default() }; let token = Token::new(header, payload); diff --git a/examples/custom_headers.rs b/examples/custom_headers.rs index dd7a84e..b8f2468 100644 --- a/examples/custom_headers.rs +++ b/examples/custom_headers.rs @@ -3,8 +3,7 @@ extern crate serde_derive; extern crate medallion; -use std::default::Default; -use medallion::{DefaultPayload, Header, DefaultToken}; +use medallion::{DefaultPayload, DefaultToken, Header}; #[derive(Default, Serialize, Deserialize, PartialEq, Debug)] struct Custom { @@ -27,10 +26,16 @@ fn new_token(sub: &str, password: &str) -> Option { // customer headers generally are about the token itself, like here describing the type of // token, as opposed to claims which are about the authenticated user or some output of // the authentication process - headers: Some(Custom { typ: "JWT".into(), ..Default::default() }), + headers: Some(Custom { + typ: "JWT".into(), + ..Custom::default() + }), ..Default::default() }; - let payload = DefaultPayload { sub: Some(sub.into()), ..Default::default() }; + let payload = DefaultPayload { + sub: Some(sub.into()), + ..DefaultPayload::default() + }; let token = DefaultToken::new(header, payload); token.sign(b"secret_key").ok() diff --git a/examples/hs256.rs b/examples/hs256.rs index 92d1d1d..0748751 100644 --- a/examples/hs256.rs +++ b/examples/hs256.rs @@ -1,7 +1,6 @@ extern crate medallion; -use std::default::Default; -use medallion::{Header, DefaultPayload, DefaultToken}; +use medallion::{DefaultPayload, DefaultToken, Header}; fn new_token(user_id: &str, password: &str) -> Option { // dummy auth, in a real application using something like openidconnect, this would be some @@ -13,11 +12,11 @@ fn new_token(user_id: &str, password: &str) -> Option { } // can satisfy Header's generic parameter with an empty type - let header: Header<()> = Default::default(); + let header: Header = Header::default(); let payload = DefaultPayload { iss: Some("example.com".into()), sub: Some(user_id.into()), - ..Default::default() + ..DefaultPayload::default() }; let token = DefaultToken::new(header, payload); diff --git a/examples/rs256.rs b/examples/rs256.rs index c67f947..92a8743 100644 --- a/examples/rs256.rs +++ b/examples/rs256.rs @@ -1,9 +1,8 @@ extern crate medallion; extern crate openssl; -use std::default::Default; +use medallion::{Algorithm, DefaultPayload, DefaultToken, Header}; use openssl::rsa; -use medallion::{Algorithm, Header, DefaultPayload, DefaultToken}; fn new_token(private_key: &[u8], user_id: &str, password: &str) -> Option { // dummy auth, in a real application using something like openidconnect, this would be some @@ -15,11 +14,14 @@ fn new_token(private_key: &[u8], user_id: &str, password: &str) -> Option = Header { alg: Algorithm::RS256, ..Default::default() }; + let header: Header = Header { + alg: Algorithm::RS256, + ..Header::default() + }; let payload: DefaultPayload = DefaultPayload { iss: Some("example.com".into()), sub: Some(user_id.into()), - ..Default::default() + ..DefaultPayload::default() }; let token = DefaultToken::new(header, payload); @@ -40,7 +42,11 @@ fn main() { // alternatively can read .pem files from fs or fetch from a server or... let keypair = rsa::Rsa::generate(2048).unwrap(); - let token = new_token(&keypair.private_key_to_pem().unwrap(), "Random User", "password").unwrap(); + let token = new_token( + &keypair.private_key_to_pem().unwrap(), + "Random User", + "password", + ).unwrap(); let logged_in_user = login(&keypair.public_key_to_pem().unwrap(), &*token).unwrap();