Merge pull request #74 from jcoby/patch-1

WoogieNoogie · WoogieNoogie · commit 08d687ded2b6 · 2014-12-03T09:05:43.000-07:00
Fix OAuth2 when custom arg_separator.output is defined
diff --git a/src/Ctct/Auth/CtctOAuth2.php b/src/Ctct/Auth/CtctOAuth2.php
@@ -47,7 +47,7 @@ public function getAuthorizationUrl($server = true, $state = null)
         }
 
         $url = Config::get('auth.base_url') . Config::get('auth.authorization_endpoint');
-        return $url . '?' . http_build_query($params);
+        return $url . '?' . http_build_query($params, '', '&');
     }
 
     /**
@@ -66,7 +66,7 @@ public function getAccessToken($code)
             'redirect_uri' => $this->redirectUri
         );
 
-        $url = Config::get('auth.base_url') . Config::get('auth.token_endpoint') . '?' . http_build_query($params);
+        $url = Config::get('auth.base_url') . Config::get('auth.token_endpoint') . '?' . http_build_query($params, '', '&');
 
         $response = $this->restClient->post($url);
         $responseBody = json_decode($response->body, true);

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function getAuthorizationUrl($server = true, $state = null)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`$url = Config::get('auth.base_url') . Config::get('auth.authorization_endpoint');`
`50`		`- return $url . '?' . http_build_query($params);`
	`50`	`+ return $url . '?' . http_build_query($params, '', '&');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -66,7 +66,7 @@ public function getAccessToken($code)`
`66`	`66`	`'redirect_uri' => $this->redirectUri`
`67`	`67`	`);`
`68`	`68`
`69`		`- $url = Config::get('auth.base_url') . Config::get('auth.token_endpoint') . '?' . http_build_query($params);`
	`69`	`+ $url = Config::get('auth.base_url') . Config::get('auth.token_endpoint') . '?' . http_build_query($params, '', '&');`
`70`	`70`
`71`	`71`	`$response = $this->restClient->post($url);`
`72`	`72`	`$responseBody = json_decode($response->body, true);`