Refine error message from middleware and fix test

alan-turing-institute · Oct 6, 2023 · 197a21f · 197a21f
1 parent d9262ba
commit 197a21f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/trustchain-http/src/middleware.rs b/trustchain-http/src/middleware.rs
@@ -54,7 +54,9 @@ fn validate_did_str(did: &str) -> Result<(), (StatusCode, Json<serde_json::Value
     if let Err(err) = ION::validate_did_suffix(&ion_did_suffix) {
         return Err((
             StatusCode::BAD_REQUEST,
-            Json(json!({"error": err.to_string()})),
+            Json(
+                json!({"error": format!("DID: {did} does not have a valid ION suffix with error: {err}")}),
+            ),
         ));
     };
 

diff --git a/trustchain-http/src/resolver.rs b/trustchain-http/src/resolver.rs
@@ -205,11 +205,11 @@ mod tests {
         let invalid_uri =
             "/did/did:ion:test:invalid_did__AsM3tgCut3OiBY4ekHTf__invalid_did".to_string();
         let response = client.get(&invalid_uri).send().await;
-        assert_eq!(response.status(), StatusCode::INTERNAL_SERVER_ERROR);
+        assert_eq!(response.status(), StatusCode::BAD_REQUEST);
 
         assert_eq!(
             response.text().await,
-            r#"{"error":"Trustchain Resolver error: DID: did:ion:test:invalid_did__AsM3tgCut3OiBY4ekHTf__invalid_did does not exist."}"#
+            r#"{"error":"DID: did:ion:test:invalid_did__AsM3tgCut3OiBY4ekHTf__invalid_did does not have a valid ION suffix with error: Decode Base64"}"#
         )
     }