From 25736bb79d605c4ecc5044e384d5717e669a7c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Wed, 2 Jun 2021 17:10:06 +0300 Subject: [PATCH 1/4] +client for access token context --- amo_authorization.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/amo_authorization.php b/amo_authorization.php index 08fd993..4dbea21 100644 --- a/amo_authorization.php +++ b/amo_authorization.php @@ -52,6 +52,12 @@ echo 'Already expired? ' . ($accessToken->hasExpired() ? 'expired' : 'not expired') . "
"; echo ''; + $client = new GuzzleHttp\Client(['base_uri' => 'http://id.dev.amo.tm/oauth2/validate']); + $headers = [ 'Authorization' => 'Bearer ' . $accessToken->getToken(), 'Accept' => 'application/json', ]; + $response = $client->request('GET', 'validate', [ 'headers' => $headers ]); + + echo $response->getBody(); + } catch (\League\OAuth2\Client\Provider\Exception\IdentityProviderException $e) { // Failed to get the access token or user details. From c9f0fc352b272b4637004ebb6a5fd157323f1545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Wed, 2 Jun 2021 18:09:15 +0300 Subject: [PATCH 2/4] ewq --- amo_authorization.php | 1 + 1 file changed, 1 insertion(+) diff --git a/amo_authorization.php b/amo_authorization.php index 4dbea21..671d36a 100644 --- a/amo_authorization.php +++ b/amo_authorization.php @@ -10,6 +10,7 @@ use League\OAuth2\Client\Provider\GenericProvider; require_once 'vendor/autoload.php'; +require 'vendor/autoload.php'; $appURL = "https://{$_SERVER['SERVER_NAME']}"; $clientId = $_ENV['CLIENT_ID'] ?? null; From dbe26adf3ec5f323e8829f74202a176c4fd40fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Wed, 2 Jun 2021 19:30:00 +0300 Subject: [PATCH 3/4] +client for access token context --- amo_authorization.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/amo_authorization.php b/amo_authorization.php index 671d36a..4c3b563 100644 --- a/amo_authorization.php +++ b/amo_authorization.php @@ -33,11 +33,9 @@ ]); if (!isset($_GET['code'])) { - exit('Invalid code'); } else { - try { // Try to get an access token using the authorization code grant. @@ -53,7 +51,7 @@ echo 'Already expired? ' . ($accessToken->hasExpired() ? 'expired' : 'not expired') . "
"; echo ''; - $client = new GuzzleHttp\Client(['base_uri' => 'http://id.dev.amo.tm/oauth2/validate']); + $client = new GuzzleHttp\Client(['base_uri' => 'https://id.amo.tm/oauth2/validate']); $headers = [ 'Authorization' => 'Bearer ' . $accessToken->getToken(), 'Accept' => 'application/json', ]; $response = $client->request('GET', 'validate', [ 'headers' => $headers ]); From e5e169c22916c3bec9d236cb3ef4382d5baffe2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?= Date: Wed, 2 Jun 2021 19:41:22 +0300 Subject: [PATCH 4/4] json looks fine --- amo_authorization.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amo_authorization.php b/amo_authorization.php index 4c3b563..5567514 100644 --- a/amo_authorization.php +++ b/amo_authorization.php @@ -55,7 +55,10 @@ $headers = [ 'Authorization' => 'Bearer ' . $accessToken->getToken(), 'Accept' => 'application/json', ]; $response = $client->request('GET', 'validate', [ 'headers' => $headers ]); - echo $response->getBody(); + $resp = json_decode($response->getBody()); + echo 'user uuid: ' . $resp->{'user_uuid'} . "
"; + echo 'company uuid: ' . $resp->{'company_uuid'} . "
"; + echo 'client uuid: ' . $resp->{'client_uuid'} . "
"; } catch (\League\OAuth2\Client\Provider\Exception\IdentityProviderException $e) {