Skip to content

Less-zealous redirect_uri normalization #666

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

Merged
merged 4 commits into from
Feb 8, 2025
Merged

Less-zealous redirect_uri normalization #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8faea19
Less-zealous redirect_uri normalization
jonthegeek Feb 7, 2025
bfcdf53
More precise transform.
jonthegeek Feb 7, 2025
0fb9288
Revert transform.
jonthegeek Feb 8, 2025
9d51f49
Polish tests
hadley Feb 8, 2025
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* `req_headers_redacted()` supports dynamic dots (#647)
* `resp_stream_sse()` now automatically retrieves the next event if the current event contains no data. The data is now returned as a single string (#650).
* `aws_v4_signature()` now works if url contains query parameters (@jeffreyzuber, #645).
* `req_oauth_auth_code()` no longer adds trailing "/" characters to well-formed `redirect_uri` values (@jonthegeek, #646).

# httr2 1.1.0

Expand Down
4 changes: 2 additions & 2 deletions R/oauth-flow-auth-code.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ normalize_redirect_uri <- function(redirect_uri,
port = deprecated(),
error_call = caller_env()) {

parsed <- url_parse(redirect_uri)
old <- parsed <- url_parse(redirect_uri)

if (lifecycle::is_present(host_name)) {
lifecycle::deprecate_warn(
Expand Down Expand Up @@ -250,7 +250,7 @@ normalize_redirect_uri <- function(redirect_uri,
}

list(
uri = url_build(parsed),
uri = if (identical(old, parsed)) redirect_uri else url_build(parsed),
localhost = localhost,
can_fetch_code = can_fetch_oauth_code(redirect_uri)
)
Expand Down
10 changes: 10 additions & 0 deletions tests/testthat/test-oauth-flow-auth-code.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,15 @@ test_that("old args are deprecated", {

})

test_that("urls left as is if not changes needed", {
# Allow tests to run when is_hosted_session() is TRUE.
local_mocked_bindings(is_hosted_session = function() FALSE)

original_uri <- "http://localhost:8080"
normalized_uri <- normalize_redirect_uri(original_uri)
expect_equal(normalized_uri$uri, original_uri)
})

# ouath_flow_auth_code_parse ----------------------------------------------

test_that("forwards oauth error", {
Expand Down Expand Up @@ -125,6 +134,7 @@ test_that("external auth code sources are detected correctly", {

test_that("auth codes can be retrieved from an external source", {
skip_on_cran()
local_mocked_bindings(sys_sleep = function(...) {})

req <- local_app_request(function(req, res) {
# Error on first, and then respond on second
Expand Down
Loading