diff --git a/callback.php b/callback.php index 476bd71..5cb1d62 100644 --- a/callback.php +++ b/callback.php @@ -5,14 +5,14 @@ $country = $_GET['country']; -switch($country) { - case "CA": $token_endpoint = $ca_token_endpoint; break; - case "US": $token_endpoint = $us_token_endpoint; break; - case "IE": case "GB": $token_endpoint = $uki_token_endpoint; break; - default: $token_endpoint = $uki_token_endpoint; break; +if ( isset( $endpoints['token'][$country] ) ) + $token_endpoint = $endpoints['token'][$country] ; +else { + echo "Country endpoints not defined" ; + exit ; } -$sageone_client = new SageoneClient($client_id, $client_secret, $callback_url, $auth_endpoint, $token_endpoint, $scope); +$sageone_client = new SageoneClient($client_id, $client_secret, $callback_url, $endpoints['auth'], $token_endpoint, $scope); /* Exchange the authorisation code for an access_token */ $response = $sageone_client->getAccessToken($_GET['code']); diff --git a/index.php b/index.php index f100b13..45d2321 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ include 'sageone_client.php'; include 'sageone_constants.php'; -$sageone_client = new SageoneClient($client_id, $client_secret, $callback_url, $auth_endpoint, $token_endpoint, $scope); +$sageone_client = new SageoneClient($client_id, $client_secret, $callback_url, $endpoints['auth'], null, $scope); /* get the redirect url for authorisation */ $redirect_url = $sageone_client->authRedirect(); diff --git a/sageone_constants.php b/sageone_constants.php index 33565c5..04fde49 100644 --- a/sageone_constants.php +++ b/sageone_constants.php @@ -1,16 +1,31 @@ 'https://www.sageone.com/oauth2/auth/central', + 'token' => [ + 'CA' => 'https://mysageone.ca.sageone.com/oauth2/token', + 'DE' => 'https://oauth.eu.sageone.com/token', + 'ES' => 'https://oauth.eu.sageone.com/token', + 'FR' => 'https://oauth.eu.sageone.com/token', + 'GB' => 'https://app.sageone.com/oauth2/token', + 'IE' => 'https://app.sageone.com/oauth2/token', + 'US' => 'https://mysageone.na.sageone.com/oauth2/token' + ], + 'base' => [ + 'CA' => 'https://api.columbus.sage.com/ca/sageone/', + 'DE' => 'https://api.columbus.sage.com/de/sageone/', + 'ES' => 'https://api.columbus.sage.com/es/sageone/', + 'FR' => 'https://api.columbus.sage.com/fr/sageone/', + 'GB' => 'https://api.columbus.sage.com/uki/sageone/', + 'IE' => 'https://api.columbus.sage.com/uki/sageone/', + 'US' => 'https://api.columbus.sage.com/us/sageone/' + ] +]; ?> diff --git a/sageone_response.php b/sageone_response.php index b7a179e..9c4ffa0 100644 --- a/sageone_response.php +++ b/sageone_response.php @@ -1,31 +1,22 @@