Skip to content

fix: preserve URL path prefix when constructing WebSocket urls #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
steveprentice wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve URL path prefix when constructing WebSocket urls #407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions crates/y-sweet/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,12 @@ async fn auth_doc(
let mut url = url_prefix.clone();
let scheme = if url.scheme() == "https" { "wss" } else { "ws" };
url.set_scheme(scheme).unwrap();
url = url.join(&format!("/d/{doc_id}/ws")).unwrap();

// Preserve the existing path and append the WebSocket path
let mut path = url.path().trim_end_matches('/').to_string();
path.push_str(&format!("/d/{doc_id}/ws"));
url.set_path(&path);

url.to_string()
} else {
format!("ws://{host}/d/{doc_id}/ws")
Expand Down Expand Up @@ -833,7 +838,7 @@ mod test {

#[tokio::test]
async fn test_auth_doc_with_prefix() {
let prefix: Url = "https://foo.bar".parse().unwrap();
let prefix: Url = "https://foo.bar:8443/prefix".parse().unwrap();
let server_state = Server::new(
None,
Duration::from_secs(60),
Expand All @@ -860,8 +865,11 @@ mod test {
.await
.unwrap();

let expected_url = format!("wss://foo.bar/d/{doc_id}/ws");
let expected_url = format!("wss://foo.bar:8443/prefix/d/{doc_id}/ws");
let expected_base_url = format!("https://foo.bar:8443/prefix/d/{doc_id}");

assert_eq!(token.url, expected_url);
assert_eq!(token.base_url, Some(expected_base_url));
assert_eq!(token.doc_id, doc_id);
assert!(token.token.is_none());
}
Expand Down