Renovation with 2024 edition

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.81
+FROM rust:1.85
 
 RUN rustup update
 RUN rustup component add clippy

examples/clear_emulator/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "clear_emulator"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 rs-firebase-admin-sdk = { path = "../../lib" }
-tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.48", features = ["macros", "rt-multi-thread"] }

examples/clear_emulator/src/main.rs

@@ -1,4 +1,4 @@
-use rs_firebase_admin_sdk::{auth::FirebaseEmulatorAuthService, client::ApiHttpClient, App};
+use rs_firebase_admin_sdk::{App, auth::FirebaseEmulatorAuthService, client::ApiHttpClient};
 
 async fn clear_emulator<A, C>(auth_emulator_admin: &A)
 where

examples/get_users/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "get_users"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 rs-firebase-admin-sdk = { path = "../../lib" }
-tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.48", features = ["macros", "rt-multi-thread"] }

examples/get_users/src/main.rs

@@ -1,7 +1,8 @@
 use rs_firebase_admin_sdk::{
+    App,
     auth::{FirebaseAuthService, UserList},
     client::ApiHttpClient,
-    credentials_provider, App,
+    credentials_provider,
 };
 
 /// Generic method to print out all live users, fetch 10 at a time

examples/verify_token/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "verify_token"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 rs-firebase-admin-sdk = { path = "../../lib", features = ["tokens"] }
-tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.48", features = ["macros", "rt-multi-thread"] }

examples/verify_token/src/main.rs

@@ -1,4 +1,4 @@
-use rs_firebase_admin_sdk::{auth::token::TokenVerifier, credentials_provider, App};
+use rs_firebase_admin_sdk::{App, auth::token::TokenVerifier, credentials_provider};
 
 async fn verify_token<T: TokenVerifier>(token: &str, verifier: &T) {
     match verifier.verify_token(token).await {

lib/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "rs-firebase-admin-sdk"
-version = "2.4.0"
-rust-version = "1.81"
-edition = "2021"
+version = "3.0.0"
+rust-version = "1.85"
+edition = "2024"
 authors = ["Kostas Petrikas"]
 categories = ["authentication", "api-bindings", "asynchronous"]
 description = "Firebase Admin SDK for Rust"
@@ -19,12 +19,12 @@ rustls-tls = ["reqwest/rustls-tls"]
 tokens = ["dep:openssl"]
 
 [dependencies]
-tokio = { version = "1.43", features = ["sync"], default-features = false }
-error-stack = "0.5"
+tokio = { version = "1.48", features = ["sync"], default-features = false }
+error-stack = "0.6"
 thiserror = "2.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-http = "1.2"
+http = "1.3"
 headers = "0.4"
 reqwest = { version = "0.12", features = ["charset", "json"], default-features = false }
 urlencoding = "2.1"
@@ -35,5 +35,5 @@ base64 = "0.22"
 openssl = { version = "0.10", optional = true }
 
 [dev-dependencies]
-tokio = { version = "1.43", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.48", features = ["macros", "rt-multi-thread"] }
 serial_test = "3.2"

lib/src/auth/claims/mod.rs

@@ -4,7 +4,7 @@ mod test;
 use serde::de::{self, Visitor};
 use serde::ser::Error;
 use serde::{Serialize, Serializer};
-use serde_json::{from_str, to_string, Value};
+use serde_json::{Value, from_str, to_string};
 use std::collections::BTreeMap;
 use std::fmt;
 
@@ -31,7 +31,7 @@ impl From<BTreeMap<String, Value>> for Claims {
 
 struct ClaimsVisitor;
 
-impl<'de> Visitor<'de> for ClaimsVisitor {
+impl Visitor<'_> for ClaimsVisitor {
     type Value = Claims;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

lib/src/auth/claims/test.rs

@@ -1,5 +1,5 @@
 use super::Claims;
-use serde_json::{to_string, Value};
+use serde_json::{Value, to_string};
 
 #[test]
 fn test_claims() {

lib/src/auth/mod.rs

@@ -11,8 +11,8 @@ pub mod oob_code;
 pub mod token;
 
 use crate::api_uri::{ApiUriBuilder, FirebaseAuthEmulatorRestApi, FirebaseAuthRestApi};
-use crate::client::error::ApiClientError;
 use crate::client::ApiHttpClient;
+use crate::client::error::ApiClientError;
 use crate::util::{I128EpochMs, StrEpochMs, StrEpochSec};
 pub use claims::Claims;
 use error_stack::Report;

lib/src/auth/test.rs

@@ -5,9 +5,9 @@ use super::{
     AttributeOp, Claims, FirebaseAuth, FirebaseAuthService, FirebaseEmulatorAuthService, NewUser,
     OobCode, OobCodeAction, OobCodeActionType, UserIdentifiers, UserList, UserUpdate,
 };
+use crate::App;
 use crate::client::ReqwestApiClient;
 use crate::credentials::emulator::EmulatorCredentials;
-use crate::App;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use serial_test::serial;

lib/src/auth/token/crypto/mod.rs

@@ -1,4 +1,4 @@
-use super::jwt::{error::JWTError, JwtSigner};
+use super::jwt::{JwtSigner, error::JWTError};
 use base64::{self, Engine};
 use error_stack::{Report, ResultExt};
 use openssl::{
@@ -9,12 +9,12 @@ use openssl::{
     pkey::{PKey, Private, Public},
     rsa::Rsa,
     sign::{Signer, Verifier},
-    x509::{X509Name, X509},
+    x509::{X509, X509Name},
 };
 use serde::de::{self, Visitor};
 use std::fmt;
 
-impl<'a> JwtSigner for Signer<'a> {
+impl JwtSigner for Signer<'_> {
     fn sign_jwt(&mut self, header: &str, payload: &str) -> Result<String, Report<JWTError>> {
         self.update(header.as_bytes())
             .change_context(JWTError::FailedToEncode)?;
@@ -51,7 +51,7 @@ impl JwtRsaPubKey {
 
 struct JwtRsaPubKeyVisitor;
 
-impl<'de> Visitor<'de> for JwtRsaPubKeyVisitor {
+impl Visitor<'_> for JwtRsaPubKeyVisitor {
     type Value = JwtRsaPubKey;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

lib/src/auth/token/jwt/mod.rs

@@ -8,9 +8,9 @@ use base64::{self, Engine};
 use error::JWTError;
 use error_stack::{Report, ResultExt};
 use serde::{Deserialize, Serialize};
-use serde_json::{from_slice, to_string, Value};
+use serde_json::{Value, from_slice, to_string};
 use std::collections::BTreeMap;
-use time::{serde::timestamp, OffsetDateTime};
+use time::{OffsetDateTime, serde::timestamp};
 
 #[derive(Debug, Deserialize, Serialize, Clone, Eq, PartialEq)]
 pub enum JWTAlgorithm {

lib/src/auth/token/jwt/util.rs

@@ -1,4 +1,4 @@
-use super::{encode_jwt, TokenClaims, TokenHeader};
+use super::{TokenClaims, TokenHeader, encode_jwt};
 use crate::auth::token::crypto::generate_test_cert;
 use openssl::{hash::MessageDigest, sign::Signer, x509::X509};
 

lib/src/auth/token/test.rs

@@ -1,6 +1,6 @@
 use super::cache::{CacheClient, HttpCache, Resource};
 use super::crypto::generate_test_cert;
-use super::jwt::{util::generate_test_token, JWTAlgorithm, JWToken, TokenClaims, TokenHeader};
+use super::jwt::{JWTAlgorithm, JWToken, TokenClaims, TokenHeader, util::generate_test_token};
 use super::{LiveTokenVerifier, TokenVerificationError};
 use error_stack::Report;
 use serde_json::to_string;

lib/src/client/mod.rs

@@ -8,7 +8,7 @@ use bytes::Bytes;
 use error::{ApiClientError, FireBaseAPIErrorResponse};
 use error_stack::{Report, ResultExt};
 use http::Method;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 use std::future::Future;
 use std::iter::Iterator;
 use url_params::UrlParams;

lib/src/credentials/mod.rs

@@ -9,7 +9,7 @@ mod test;
 
 use error::CredentialsError;
 use error_stack::{Report, ResultExt};
-use headers::{authorization::Bearer, Authorization, HeaderMapExt};
+use headers::{Authorization, HeaderMapExt, authorization::Bearer};
 use headers::{Header, HeaderName, HeaderValue};
 use http::header::HeaderMap;
 use std::future::Future;

lib/src/credentials/test.rs

@@ -1,5 +1,5 @@
-use super::{emulator::EmulatorCredentials, Credentials, GoogleUserProject};
-use headers::{authorization::Bearer, Authorization, HeaderMapExt};
+use super::{Credentials, GoogleUserProject, emulator::EmulatorCredentials};
+use headers::{Authorization, HeaderMapExt, authorization::Bearer};
 use http::header::{HeaderMap, HeaderValue};
 
 #[tokio::test]

lib/src/lib.rs

@@ -8,16 +8,16 @@ use auth::FirebaseAuth;
 
 #[cfg(feature = "tokens")]
 use auth::token::{
+    EmulatedTokenVerifier, GOOGLE_COOKIE_PUB_KEY_URI, GOOGLE_PUB_KEY_URI, LiveTokenVerifier,
     cache::{HttpCache, PubKeys},
     error::TokenVerificationError,
-    EmulatedTokenVerifier, LiveTokenVerifier, GOOGLE_COOKIE_PUB_KEY_URI, GOOGLE_PUB_KEY_URI,
 };
 use client::ReqwestApiClient;
 use credentials::emulator::EmulatorCredentials;
-pub use credentials::{error::CredentialsError, Credentials};
+pub use credentials::{Credentials, error::CredentialsError};
 use error_stack::{Report, ResultExt};
-pub use gcp_auth::provider as credentials_provider;
 use gcp_auth::TokenProvider;
+pub use gcp_auth::provider as credentials_provider;
 use std::sync::Arc;
 
 /// Default Firebase Auth admin manager

lib/src/util/serialize.rs

@@ -21,7 +21,7 @@ impl From<StrEpochMs> for OffsetDateTime {
 
 struct StrEpochMsVisitor;
 
-impl<'de> Visitor<'de> for StrEpochMsVisitor {
+impl Visitor<'_> for StrEpochMsVisitor {
     type Value = StrEpochMs;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -69,7 +69,7 @@ impl From<StrEpochSec> for OffsetDateTime {
 
 struct StrEpochSecVisitor;
 
-impl<'de> Visitor<'de> for StrEpochSecVisitor {
+impl Visitor<'_> for StrEpochSecVisitor {
     type Value = StrEpochSec;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
@@ -117,7 +117,7 @@ impl From<I128EpochMs> for OffsetDateTime {
 
 struct I128EpochMsVisitor;
 
-impl<'de> Visitor<'de> for I128EpochMsVisitor {
+impl Visitor<'_> for I128EpochMsVisitor {
     type Value = I128EpochMs;
 
     fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {