Skip to content
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

fix(jsonrpc): enable HTTP basic auth in WS client (backport #2434) #2451

Merged
merged 2 commits into from
Feb 27, 2024
Merged

fix(jsonrpc): enable HTTP basic auth in WS client (backport #2434) #2451

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca5a503
fix(jsonrpc): enable HTTP basic auth in WS client (#2434)
MattKetmo Feb 27, 2024
dace02f
fix conflicts
melekes Feb 27, 2024
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
Prev Previous commit
fix conflicts
  • Loading branch information
@melekes
melekes committed Feb 27, 2024
commit dace02fb1b12875847f35abec0cc1dc7401346b8
6 changes: 1 addition & 5 deletions rpc/jsonrpc/client/ws_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ func NewWS(remoteAddr, endpoint string, options ...func(*WSClient)) (*WSClient,
parsedURL.Scheme = protoWS
}

<<<<<<< HEAD
dialFn, err := makeHTTPDialer(remoteAddr)
=======
// extract username and password from URL if any
username := ""
password := ""
Expand All @@ -111,8 +108,7 @@ func NewWS(remoteAddr, endpoint string, options ...func(*WSClient)) (*WSClient,
password, _ = parsedURL.User.Password()
}

dialFn, err := MakeHTTPDialer(remoteAddr)
>>>>>>> 8bf81d423 (fix(jsonrpc): enable HTTP basic auth in WS client (#2434))
dialFn, err := makeHTTPDialer(remoteAddr)
if err != nil {
return nil, err
}
Expand Down
Loading