Merge pull request #313 from nathangoulding/master

fix for token service account

NEWS.md

@@ -36,6 +36,8 @@
 
 * `build_url()` now collapses vector `path` with `/` (#280, @artemklevtsov).
 
+* Ensure that OAuth token `sign()` returns a `request` (#313, @nathangoulding).
+
 # httr 1.0.0
 
 * httr no longer uses the RCurl package. Instead it uses the curl package, 

R/oauth-token.r

@@ -290,7 +290,7 @@ TokenServiceAccount <- R6::R6Class("TokenServiceAccount", inherit = Token2.0, li
     config <- add_headers(
       Authorization = paste('Bearer', self$credentials$access_token)
     )
-    list(url = url, config = config)
+    request_build(method = method, url = url, config)
   },
 
   # Never cache

R/request.R

@@ -103,8 +103,11 @@ request_prepare <- function(req) {
 
   # Sign request, if needed
   token <- req$auth_token
-  if (!is.null(token))
-    req <- c(req, token$sign(req$method, req$url))
+  if (!is.null(token)) {
+    signed_req <- token$sign(req$method, req$url)
+    stopifnot(is.request(signed_req))
+    req <- c(req, signed_req)
+  }
 
   req
 }