Skip to content

Commit de21a72

Browse files
chore(deps): update jsonwebtoken requirement from 9 to 10 (#1217)
* chore(deps): update jsonwebtoken requirement from 9 to 10 Updates the requirements on [jsonwebtoken](https://github.com/Keats/jsonwebtoken) to permit the latest version. - [Changelog](https://github.com/Keats/jsonwebtoken/blob/master/CHANGELOG.md) - [Commits](Keats/jsonwebtoken@v9.0.0...v9.3.1) --- updated-dependencies: - dependency-name: jsonwebtoken dependency-version: 9.3.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * fix * wip * typo * clone * examples * doc --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Chrislearn Young <[email protected]>
1 parent 6ba4079 commit de21a72

File tree

27 files changed

+54
-131
lines changed

27 files changed

+54
-131
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ hyper-rustls = { version = "0.27", default-features = false }
7676
hyper-util = { version = "0.1", default-features = true }
7777
indexmap = "2"
7878
inventory = "0.3"
79-
jsonwebtoken = "9"
79+
jsonwebtoken = "10"
8080
mime = "0.3"
8181
mime-infer = "4"
8282
moka = "0.12"

crates/jwt-auth/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ring = ["hyper-rustls?/ring"]
2828
[dependencies]
2929
base64 = { workspace = true }
3030
bytes = { workspace = true, optional = true }
31-
jsonwebtoken = { workspace = true }
31+
jsonwebtoken = { workspace = true, features = ["rust_crypto"]}
3232
http-body-util = { workspace = true, optional = true }
3333
hyper-rustls = { workspace = true, optional = true, features = ["native-tokio", "http1", "tls12", "logging"] }
3434
hyper-util = { workspace = true, optional = true, features = ["client-legacy", "http1", "http2", "tokio"] }

crates/jwt-auth/src/decoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub trait JwtAuthDecoder {
3939
depot: &mut Depot,
4040
) -> impl Future<Output = Result<TokenData<C>, Self::Error>> + Send
4141
where
42-
C: for<'de> Deserialize<'de>;
42+
C: for<'de> Deserialize<'de> + Clone;
4343
}
4444

4545
/// A decoder that uses a constant key for JWT token validation.
@@ -177,7 +177,7 @@ impl JwtAuthDecoder for ConstDecoder {
177177

178178
async fn decode<C>(&self, token: &str, _depot: &mut Depot) -> Result<TokenData<C>, Self::Error>
179179
where
180-
C: for<'de> Deserialize<'de>,
180+
C: for<'de> Deserialize<'de> + Clone,
181181
{
182182
decode::<C>(token, &self.decoding_key, &self.validation)
183183
}

crates/jwt-auth/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//!
2424
//! const SECRET_KEY: &str = "YOUR_SECRET_KEY"; // In production, use a secure key management solution
2525
//!
26-
//! #[derive(Debug, Serialize, Deserialize)]
26+
//! #[derive(Serialize, Deserialize, Clone, Debug)]
2727
//! pub struct JwtClaims {
2828
//! username: String,
2929
//! exp: i64,
@@ -372,7 +372,7 @@ where
372372
#[async_trait]
373373
impl<C, D> Handler for JwtAuth<C, D>
374374
where
375-
C: DeserializeOwned + Send + Sync + 'static,
375+
C: DeserializeOwned + Clone + Send + Sync + 'static,
376376
D: JwtAuthDecoder + Send + Sync + 'static,
377377
{
378378
async fn handle(
@@ -420,7 +420,7 @@ mod tests {
420420

421421
use super::*;
422422

423-
#[derive(Debug, Serialize, Deserialize)]
423+
#[derive(Serialize, Deserialize, Clone, Debug)]
424424
struct JwtClaims {
425425
user: String,
426426
exp: i64,

crates/jwt-auth/src/oidc/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ impl JwtAuthDecoder for OidcDecoder {
5555
/// Validates a JWT, Returning the claims serialized into type of T
5656
async fn decode<C>(&self, token: &str, _depot: &mut Depot) -> Result<TokenData<C>, Self::Error>
5757
where
58-
C: DeserializeOwned,
58+
C: DeserializeOwned + Clone,
5959
{
6060
// Early return error conditions before acquiring a read lock
6161
let header = jsonwebtoken::decode_header(token)?;
@@ -356,7 +356,7 @@ impl DecodingInfo {
356356

357357
fn decode<T>(&self, token: &str) -> Result<TokenData<T>, JwtAuthError>
358358
where
359-
T: for<'de> serde::de::Deserialize<'de>,
359+
T: for<'de> serde::de::Deserialize<'de> + Clone,
360360
{
361361
match jsonwebtoken::decode::<T>(token, &self.key, &self.validation) {
362362
Ok(data) => Ok(data),

crates/oapi/src/openapi/schema/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ impl FromIterator<BasicType> for SchemaType {
395395
impl SchemaType {
396396
/// Instantiate new [`SchemaType`] of given [`BasicType`]
397397
///
398-
/// Method accepets one argument `type` to create [`SchemaType`] for.
398+
/// Method accepts one argument `type` to create [`SchemaType`] for.
399399
///
400400
/// # Examples
401401
///
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lectus neque, aliquet ut scelerisque in, blandit et dui. Fusce at elit a dolor cursus interdum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean euismod placerat eros, vitae rutrum nisi lacinia eu. In malesuada neque id sollicitudin malesuada. Cras quis lobortis risus, fringilla pretium leo. Maecenas semper mauris libero, in blandit libero consectetur ut. Fusce feugiat porttitor dolor. Aliquam commodo volutpat neque, facilisis congue ex blandit sit amet. Integer sodales erat non sem ullamcorper consectetur. Sed sodales lectus luctus purus pellentesque interdum. Vestibulum fermentum odio vitae massa tristique, et sodales ante ullamcorper. Duis ultrices imperdiet viverra.
2-
3-
Vivamus at neque orci. Sed gravida tortor vitae turpis tristique, at rutrum elit eleifend. Morbi quis eleifend nisl. Sed pretium eros quis viverra porttitor. Nulla consequat vitae nisl euismod iaculis. Vivamus tincidunt quam ac tellus accumsan consectetur. Curabitur aliquam sed urna quis bibendum. Curabitur congue, sem sit amet congue iaculis, tellus ex aliquam nisi, ut consequat arcu magna eget nibh. Pellentesque lobortis efficitur nunc, vel posuere ante accumsan a.
4-
5-
Nam mollis tellus erat, non sodales urna fermentum at. Aliquam in sagittis sapien. Suspendisse rhoncus vitae est et convallis. Mauris fermentum tincidunt nisi, quis dapibus velit viverra quis. Quisque tristique, elit cursus fringilla fermentum, metus eros sollicitudin lectus, a viverra nunc elit id orci. Fusce accumsan rhoncus malesuada. Donec in nisl eget quam commodo varius. Sed varius arcu eros, sit amet ultrices odio aliquet nec. Etiam dignissim eleifend nisl, ut pharetra enim interdum et. Maecenas pellentesque leo urna, eu ultricies nulla sollicitudin vel. Duis placerat purus neque, nec viverra dui congue non. Aenean faucibus in nisi at faucibus. Nullam ornare id ipsum eget ornare. Mauris rutrum ultricies massa, nec blandit nunc faucibus in. Maecenas sollicitudin malesuada nisl, vel lacinia nunc sodales cursus.
6-
7-
Cras et ligula ut nibh bibendum aliquet. Mauris efficitur, erat eget molestie fermentum, felis elit molestie tellus, vitae maximus eros diam non quam. Nam sagittis ullamcorper interdum. Nunc nisl lacus, elementum ac posuere eget, interdum nec neque. Suspendisse ac felis pretium, molestie odio vel, lobortis risus. Proin iaculis gravida nibh, id ultrices nulla mollis sit amet. Vestibulum suscipit dui eget felis pretium laoreet. Sed tristique enim ac risus eleifend dapibus. Sed scelerisque, tellus vitae dignissim malesuada, dui dolor interdum nisl, eget porttitor nisl lacus interdum velit. Nullam lobortis erat at est congue, a condimentum arcu finibus. In tempor massa a augue malesuada, nec semper augue posuere. Nulla ut maximus elit.
8-
9-
Phasellus eu elit neque. Etiam id molestie lectus, quis semper libero. Nulla ultricies purus nec pretium imperdiet. Donec vestibulum interdum sem, suscipit pharetra augue tincidunt nec. Sed ut semper libero, non placerat lectus. Pellentesque non feugiat nisi, eget lacinia nisi. Vivamus dapibus rutrum sollicitudin. Vivamus commodo ac sem nec accumsan. Etiam et tincidunt nulla. Pellentesque tempus odio eget ligula maximus, eget vulputate libero aliquet. Aenean laoreet dolor sit amet nibh egestas ullamcorper. Phasellus malesuada, ante quis suscipit tempor, libero lacus mattis diam, at venenatis libero eros non elit. Donec faucibus lac
1+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam lectus neque,
2+
aliquet ut scelerisque in, blandit et dui. Fusce at elit a dolor cursus interdum.
3+
4+
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
5+
himenaeos. Aenean euismod placerat eros, vitae rutrum nisi lacinia eu. In
6+
malesuada neque id sollicitudin malesuada. Cras quis lobortis risus, fringilla
7+
pretium leo. Maecenas semper mauris libero, in blandit libero consectetur ut.
8+
Fusce feugiat porttitor dolor. Aliquam commodo volutpat neque, facilisis congue
9+
ex blandit sit amet. Integer sodales erat non sem ullamcorper consectetur.

examples/csrf-cookie-store/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub async fn home(res: &mut Response) {
1010
<html>
1111
<head><meta charset="UTF-8"><title>Csrf CookieStore</title></head>
1212
<body>
13-
<h2>Csrf Exampe: CookieStore</h2>
13+
<h2>Csrf Example: CookieStore</h2>
1414
<ul>
1515
<li><a href="/bcrypt/">Bcrypt</a></li>
1616
<li><a href="/hmac/">Hmac</a></li>
@@ -110,7 +110,7 @@ fn get_page_html(csrf_token: &str, msg: &str) -> String {
110110
<html>
111111
<head><meta charset="UTF-8"><title>Csrf Example</title></head>
112112
<body>
113-
<h2>Csrf Exampe: CookieStore</h2>
113+
<h2>Csrf Example: CookieStore</h2>
114114
<ul>
115115
<li><a href="/bcrypt/">Bcrypt</a></li>
116116
<li><a href="/hmac/">Hmac</a></li>

examples/csrf-session-store/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub async fn home(res: &mut Response) {
1010
<html>
1111
<head><meta charset="UTF-8"><title>Csrf SessionStore</title></head>
1212
<body>
13-
<h2>Csrf Exampe: SessionStore</h2>
13+
<h2>Csrf Example: SessionStore</h2>
1414
<ul>
1515
<li><a href="/bcrypt/">Bcrypt</a></li>
1616
<li><a href="/hmac/">Hmac</a></li>
@@ -119,7 +119,7 @@ fn get_page_html(csrf_token: &str, msg: &str) -> String {
119119
<html>
120120
<head><meta charset="UTF-8"><title>Csrf SessionStore</title></head>
121121
<body>
122-
<h2>Csrf Exampe: SessionStore</h2>
122+
<h2>Csrf Example: SessionStore</h2>
123123
<ul>
124124
<li><a href="/bcrypt/">Bcrypt</a></li>
125125
<li><a href="/hmac/">Hmac</a></li>

examples/jwt-auth/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use time::{Duration, OffsetDateTime};
77

88
const SECRET_KEY: &str = "YOUR SECRET_KEY";
99

10-
#[derive(Debug, Serialize, Deserialize)]
10+
#[derive(Serialize, Deserialize, Clone, Debug)]
1111
pub struct JwtClaims {
1212
username: String,
1313
exp: i64,

0 commit comments

Comments
 (0)