Fix tests

Author: joepio

CHANGELOG.md

@@ -23,6 +23,7 @@ See [STATUS.md](server/STATUS.md) to learn more about which features will remain
 - `Store::all_resources` returns `Iterator` instead of `Vec` #522 #487
 - Change authentication order #525
 - Fix cookie subject check #525
+- Refactored Subject URLs to use `AtomicUrl`
 
 ## [v0.33.1] - 2022-09-25
 

lib/src/agents.rs

@@ -52,7 +52,6 @@ impl Agent {
         private_key: &str,
     ) -> AtomicResult<Agent> {
         let keypair = generate_public_key(private_key);
-        println!("server url: {}", store.get_server_url());
         let subject = store
             .get_server_url()
             .url()

lib/src/authentication.rs

@@ -35,7 +35,7 @@ pub fn check_auth_signature(subject: &str, auth_header: &AuthValues) -> AtomicRe
                 .verify(message.as_bytes(), &signature_bytes)
                 .map_err(|_e| {
                     format!(
-                        "Incorrect signature for auth headers. This could be due to an error during signing or serialization of the commit. Compare this to the serialized message in the client: {}",
+                        "Incorrect signature for auth headers. This could be due to an error during signing or serialization of the commit. Compare this to the serialized message in the client: '{}'",
                         message,
                     )
                 })?;

lib/src/commit.rs

@@ -113,7 +113,7 @@ impl Commit {
                 .verify(stringified_commit.as_bytes(), &signature_bytes)
                 .map_err(|_e| {
                     format!(
-                        "Incorrect signature for Commit. This could be due to an error during signing or serialization of the commit. Compare this to the serialized commit in the client: {}",
+                        "Incorrect signature for Commit. This could be due to an error during signing or serialization of the commit. Compare this to the serialized commit in the client: '{}'",
                         stringified_commit,
                     )
                 })?;
@@ -443,7 +443,6 @@ impl Commit {
                     .to_string()
             }
         };
-        println!("commit subject: {}", commit_subject);
         let mut resource = Resource::new_instance(urls::COMMIT, store)?;
         resource.set_subject(commit_subject);
         resource.set_propval_unsafe(

lib/src/db.rs

@@ -262,7 +262,6 @@ impl Storelike for Db {
         update_index: bool,
         overwrite_existing: bool,
     ) -> AtomicResult<()> {
-        println!("add_resource_opts {}", resource.get_subject());
         // This only works if no external functions rely on using add_resource for atom-like operations!
         // However, add_atom uses set_propvals, which skips the validation.
         let existing = self.get_propvals(resource.get_subject()).ok();

server/src/tests.rs

@@ -17,7 +17,9 @@ use clap::StructOpt;
 
 /// Returns the request with signed headers. Also adds a json-ad accept header - overwrite this if you need something else.
 fn build_request_authenticated(path: &str, appstate: &AppState) -> TestRequest {
-    let url = format!("{}{}", appstate.store.get_server_url(), path);
+    // remove last slash
+    let base = appstate.store.get_server_url().to_string();
+    let url = format!("{}{}", base.trim_end_matches('/'), path);
     let headers = atomic_lib::client::get_authentication_headers(
         &url,
         &appstate.store.get_default_agent().unwrap(),
@@ -70,7 +72,6 @@ async fn server_tests() {
     let resp = test::call_service(&app, req.to_request()).await;
     let is_success = resp.status().is_success();
     let body = get_body(resp);
-    println!("{:?}", body);
     assert!(is_success);
     assert!(body.as_str().contains("html"));
 
@@ -102,7 +103,7 @@ async fn server_tests() {
 
     // Should 401 (Unauthorized)
     let req =
-        test::TestRequest::with_uri("properties").insert_header(("Accept", "application/ad+json"));
+        test::TestRequest::with_uri("/properties").insert_header(("Accept", "application/ad+json"));
     let resp = test::call_service(&app, req.to_request()).await;
     assert_eq!(
         resp.status().as_u16(),
@@ -111,7 +112,7 @@ async fn server_tests() {
     );
 
     // Get JSON-AD
-    let req = build_request_authenticated("properties", &appstate);
+    let req = build_request_authenticated("/properties", &appstate);
     let resp = test::call_service(&app, req.to_request()).await;
     let body = get_body(resp);
     println!("DEBUG: {:?}", body);
@@ -122,7 +123,7 @@ async fn server_tests() {
     );
 
     // Get JSON-LD
-    let req = build_request_authenticated("properties", &appstate)
+    let req = build_request_authenticated("/properties", &appstate)
         .insert_header(("Accept", "application/ld+json"));
     let resp = test::call_service(&app, req.to_request()).await;
     assert!(resp.status().is_success(), "setup not returning JSON-LD");
@@ -133,7 +134,7 @@ async fn server_tests() {
     );
 
     // Get turtle
-    let req = build_request_authenticated("properties", &appstate)
+    let req = build_request_authenticated("/properties", &appstate)
         .insert_header(("Accept", "text/turtle"));
     let resp = test::call_service(&app, req.to_request()).await;
     assert!(resp.status().is_success());
@@ -145,7 +146,7 @@ async fn server_tests() {
 
     // Get Search
     // Does not test the contents of the results - the index isn't built at this point
-    let req = build_request_authenticated("search?q=setup", &appstate);
+    let req = build_request_authenticated("/search?q=setup", &appstate);
     let resp = test::call_service(&app, req.to_request()).await;
     assert!(resp.status().is_success());
     let body = get_body(resp);
@@ -156,7 +157,7 @@ async fn server_tests() {
     );
 }
 
-/// Gets the body from the response as a String. Why doen't actix provide this?
+/// Gets the body from the response as a String. Why doesn't actix provide this?
 fn get_body(resp: ServiceResponse) -> String {
     let boxbody = resp.into_body();
     let bytes = boxbody.try_into_bytes().unwrap();