Skip to content

Commit

Permalink
fix: Ensure that during migration we make the urls have a trailing sl…
Browse files Browse the repository at this point in the history
…ash (#2036)

This is to fix a bug in the UI
  • Loading branch information
Blu-J authored Dec 6, 2022
1 parent ddd00d4 commit 91b2231
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion backend/src/version/v0_3_3.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use async_trait::async_trait;
use emver::VersionRange;
use regex::Regex;
use serde_json::{json, Value};

use super::v0_3_0::V0_3_0_COMPAT;
Expand Down Expand Up @@ -47,7 +48,7 @@ impl VersionT for Version {
if let Value::Object(known_hosts) = known_hosts {
for (_id, value) in known_hosts {
if let Value::String(url) = &value["url"] {
ui["marketplace"]["known-hosts"][url] = json!({});
ui["marketplace"]["known-hosts"][ensure_trailing_slashes(url)] = json!({});
}
}
}
Expand Down Expand Up @@ -101,6 +102,32 @@ impl VersionT for Version {
}
}

fn ensure_trailing_slashes(url: &str) -> String {
lazy_static::lazy_static! {
static ref REG: Regex = Regex::new(r".*/$").unwrap();
}
if REG.is_match(url) {
return url.to_string();
}
format!("{url}/")
}

#[test]
fn test_ensure_trailing_slashed() {
assert_eq!(
&ensure_trailing_slashes("http://start9.com"),
"http://start9.com/"
);
assert_eq!(
&ensure_trailing_slashes("http://start9.com/"),
"http://start9.com/"
);
assert_eq!(
&ensure_trailing_slashes("http://start9.com/a"),
"http://start9.com/a/"
);
}

#[derive(Debug, Clone, Copy)]
pub enum MarketPlaceUrls {
Default,
Expand Down

0 comments on commit 91b2231

Please sign in to comment.