Authentication with AUTH_URL_TOKEN bug fix

matejskubic · matejskubic · commit b38d80388aba · 2012-11-02T11:47:05.000+01:00
If user authenticates with AUTH_URL_TOKEN and request parameter are not empty access_token must be appended by `&amp;` (and not `?`)
diff --git a/lib/Github/HttpClient/Listener/AuthListener.php b/lib/Github/HttpClient/Listener/AuthListener.php
@@ -86,7 +86,7 @@ public function preSend(RequestInterface $request)
                 }
 
                 $url  = $request->getUrl();
-                $url .= '?'.utf8_encode(http_build_query(array('access_token' => $this->options['tokenOrLogin']), '', '&'));
+                $url .= (false === strpos($url, '?') ? '?' : '&').utf8_encode(http_build_query(array('access_token' => $this->options['tokenOrLogin']), '', '&'));
 
                 $request->fromUrl(new Url($url));
                 break;

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function preSend(RequestInterface $request)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`$url = $request->getUrl();`
`89`		`- $url .= '?'.utf8_encode(http_build_query(array('access_token' => $this->options['tokenOrLogin']), '', '&'));`
	`89`	`+ $url .= (false === strpos($url, '?') ? '?' : '&').utf8_encode(http_build_query(array('access_token' => $this->options['tokenOrLogin']), '', '&'));`
`90`	`90`
`91`	`91`	`$request->fromUrl(new Url($url));`
`92`	`92`	`break;`