chore: update to latest relay_rpc version (#45)

* chore: update to latest relay_rpc version

* fix(ci): rust-lang/rust#113152 (comment)

Cargo.toml

@@ -17,7 +17,7 @@ tower-http = { version = "0.4.0", features = ["trace", "cors"] }
 hyper = "0.14"
 
 # WalletConnect
-relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", rev = "7f08502440842308cde74bb7f4cddc4bbd7d6fbc" }
+relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", rev = "5f4dd3cbf4a67e40c47503706f8e0ae8d8bdd435" }
 
 # Database
 wither = { git = "https://github.com/WalletConnect/wither.git", rev = "6a70e74", features = ["bson-chrono-0_4"] }

src/error.rs

@@ -85,7 +85,7 @@ pub enum Error {
     InternalServerError,
 
     #[error(transparent)]
-    JwtError(#[from] relay_rpc::auth::JwtVerificationError),
+    JwtError(#[from] relay_rpc::jwt::JwtError),
 
     #[error(transparent)]
     AuthError(#[from] relay_rpc::auth::Error),

src/handlers/get_registration.rs

@@ -7,16 +7,20 @@ use {
         state::{AppState, CachedRegistration},
     },
     axum::{extract::State, Json},
-    relay_rpc::auth::Jwt,
+    relay_rpc::{
+        domain::ClientId,
+        jwt::{JwtBasicClaims, VerifyableClaims},
+    },
     std::sync::Arc,
 };
 
 pub async fn handler(
     State(state): State<Arc<AppState>>,
     AuthBearer(token): AuthBearer,
 ) -> Result<Json<RegisterPayload>, error::Error> {
-    let client_id = Jwt(token).decode(&state.auth_aud.clone())?.to_string();
-    let client_id: Arc<str> = Arc::from(client_id);
+    let claims = JwtBasicClaims::try_from_str(&token)?;
+    claims.verify_basic(&state.auth_aud, None)?;
+    let client_id = ClientId::from(claims.iss);
 
     increment_counter!(state.metrics, registration_cache_invalidation);
     state
@@ -31,7 +35,7 @@ pub async fn handler(
 
     state
         .registration_cache
-        .insert(client_id, CachedRegistration {
+        .insert(client_id.into_value(), CachedRegistration {
             tags: registration.tags.clone(),
             relay_url: registration.relay_url.clone(),
         })

src/handlers/register.rs

@@ -8,7 +8,10 @@ use {
         state::{AppState, CachedRegistration},
     },
     axum::{extract::State, Json},
-    relay_rpc::auth::Jwt,
+    relay_rpc::{
+        domain::ClientId,
+        jwt::{JwtBasicClaims, VerifyableClaims},
+    },
     serde::{Deserialize, Serialize},
     std::sync::Arc,
 };
@@ -25,7 +28,9 @@ pub async fn handler(
     AuthBearer(token): AuthBearer,
     Json(body): Json<RegisterPayload>,
 ) -> error::Result<Response> {
-    let client_id = Jwt(token).decode(&state.auth_aud.clone())?;
+    let claims = JwtBasicClaims::try_from_str(&token)?;
+    claims.verify_basic(&state.auth_aud, None)?;
+    let client_id = ClientId::from(claims.iss);
 
     state
         .registration_store

tests/integration.rs

@@ -35,7 +35,7 @@ fn get_client_jwt() -> (String, ClientId) {
     let random_client_id = DecodedClientId(*keypair.public_key().as_bytes());
     let client_id = ClientId::from(random_client_id);
 
-    let jwt = relay_rpc::auth::AuthToken::new(client_id.value().clone())
+    let jwt = relay_rpc::auth::AuthToken::new(client_id.to_string())
         .aud(TEST_RELAY_URL.to_string())
         .as_jwt(&keypair)
         .unwrap()