Less-zealous redirect_uri normalization

NEWS.md

@@ -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
 

R/oauth-flow-auth-code.R

@@ -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(
@@ -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)
   )

tests/testthat/test-curl.R

@@ -204,11 +204,16 @@ test_that("can read from clipboard", {
   rlang::local_interactive()
 
   clipr::write_clip("curl 'http://example.com' \\\n -H 'A: 1' \\\n -H 'B: 2'")
-  expect_snapshot({
-    curl_translate()
-    # also writes to clip
-    clipr::read_clip()
-  })
+  expect_snapshot(
+    {
+      curl_translate()
+      # also writes to clip
+      clipr::read_clip()
+    },
+    transform = function(x) {
+      grep("\\\\r", x, value = TRUE, invert = TRUE)
+    }
+  )
 })
 
 test_that("encode_string2() produces simple strings", {

tests/testthat/test-oauth-flow-auth-code.R

@@ -88,6 +88,15 @@ test_that("old args are deprecated", {
 
 })
 
+test_that("valid urls aren't changed", {
+  # 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_identical(normalized_uri$uri, original_uri)
+})
+
 # ouath_flow_auth_code_parse ----------------------------------------------
 
 test_that("forwards oauth error", {