Handle JWT signing error

DefGuard · Jan 24, 2023 · 4dd264a · 4dd264a
1 parent 3503f5c
commit 4dd264a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/avanguard/src/error.rs b/avanguard/src/error.rs
@@ -2,6 +2,7 @@ use actix_web::{
     http::{header::ContentType, StatusCode},
     HttpResponse, ResponseError,
 };
+use openidconnect::JsonWebTokenError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
@@ -12,6 +13,8 @@ pub enum ApiError {
     WalletNotFound,
     #[error("signature incorrect")]
     SignatureIncorrect,
+    #[error("signing error")]
+    SigningError(#[from] JsonWebTokenError),
 }
 
 impl ApiError {
@@ -20,6 +23,7 @@ impl ApiError {
             Self::Sqlx(_) => "DB",
             Self::WalletNotFound => "WalletNotFound",
             Self::SignatureIncorrect => "SignatureIncorrect",
+            Self::SigningError(_) => "SignatureIncorrect",
         }
     }
 
@@ -28,6 +32,7 @@ impl ApiError {
             Self::Sqlx(_) => String::from("Internal error"),
             Self::WalletNotFound => String::from("Wallet not found"),
             Self::SignatureIncorrect => String::from("Signature incorrect"),
+            Self::SigningError(_) => String::from("Signing error"),
         }
     }
 }
@@ -60,6 +65,7 @@ impl ResponseError for ApiError {
             Self::Sqlx(_) => StatusCode::INTERNAL_SERVER_ERROR,
             ApiError::WalletNotFound => StatusCode::UNAUTHORIZED,
             ApiError::SignatureIncorrect => StatusCode::UNAUTHORIZED,
+            ApiError::SigningError(_) => StatusCode::UNAUTHORIZED,
         }
     }
 }

diff --git a/avanguard/src/http.rs b/avanguard/src/http.rs
@@ -149,9 +149,7 @@ pub async fn web3auth_end(
                 None,
                 &signature.nonce,
                 &app_state.config.client_id,
-            )
-            // TODO: handle JWT error
-            .unwrap();
+            )?;
             wallet.challenge_signature = Some(signature.signature.clone());
             wallet.save(&app_state.pool).await?;
             Ok(Json(JwtToken {