mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
Allow 'url join' to print username without password (#11697)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description Fixes: https://github.com/nushell/nushell/issues/11677 <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> ``` 'https://example.com' | url parse | update scheme ssh | upda te username user | url join # => ssh://user@example.com/ 'https://example.com' | url parse | update scheme ssh | upda te password hackme | url join # => ssh://example.com/ 'https://example.com' | url parse | update scheme ssh | update username user | update password hackme | url join # => ssh://user:hackme@example.com/ ``` # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> --------- Co-authored-by: Richard Westhaver <ellis@rwest.io>
This commit is contained in:
parent
d40019a141
commit
3e0fa8ff85
@ -317,13 +317,11 @@ impl UrlComponents {
|
||||
}
|
||||
|
||||
pub fn to_url(&self, span: Span) -> Result<String, ShellError> {
|
||||
let mut user_and_pwd: String = String::from("");
|
||||
|
||||
if let Some(usr) = &self.username {
|
||||
if let Some(pwd) = &self.password {
|
||||
user_and_pwd = format!("{usr}:{pwd}@");
|
||||
}
|
||||
}
|
||||
let user_and_pwd = match (&self.username, &self.password) {
|
||||
(Some(usr), Some(pwd)) => format!("{usr}:{pwd}@"),
|
||||
(Some(usr), None) => format!("{usr}@"),
|
||||
_ => String::from(""),
|
||||
};
|
||||
|
||||
let scheme_result = match &self.scheme {
|
||||
Some(s) => Ok(s),
|
||||
|
@ -31,7 +31,7 @@ fn url_join_with_only_user() {
|
||||
"#
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "http://localhost");
|
||||
assert_eq!(actual.out, "http://usr@localhost");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
Loading…
Reference in New Issue
Block a user