From e4aad7c1eac6316f61040c20cdaadf873b26a43c Mon Sep 17 00:00:00 2001 From: Bryant Luk Date: Thu, 18 Aug 2016 14:10:28 -0500 Subject: [PATCH] Revert OpenID Connect endsession change --- lib/PayPal/Api/OpenIdSession.php | 4 ++-- lib/PayPal/Core/PayPalConstants.php | 4 ++-- tests/PayPal/Test/Api/OpenIdSessionTest.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PayPal/Api/OpenIdSession.php b/lib/PayPal/Api/OpenIdSession.php index 30e27d8..2411a93 100644 --- a/lib/PayPal/Api/OpenIdSession.php +++ b/lib/PayPal/Api/OpenIdSession.php @@ -53,7 +53,7 @@ class OpenIdSession if ($state) { $params['state'] = $state; } - return sprintf("%s/authorize?%s", self::getBaseUrl($config), http_build_query($params)); + return sprintf("%s/signin/authorize?%s", self::getBaseUrl($config), http_build_query($params)); } @@ -80,7 +80,7 @@ class OpenIdSession 'redirect_uri' => $redirectUri, 'logout' => 'true' ); - return sprintf("%s/endsession?%s", self::getBaseUrl($config), http_build_query($params)); + return sprintf("%s/webapps/auth/protocol/openidconnect/v1/endsession?%s", self::getBaseUrl($config), http_build_query($params)); } /** diff --git a/lib/PayPal/Core/PayPalConstants.php b/lib/PayPal/Core/PayPalConstants.php index 3d7f6fe..3e98183 100644 --- a/lib/PayPal/Core/PayPalConstants.php +++ b/lib/PayPal/Core/PayPalConstants.php @@ -20,8 +20,8 @@ class PayPalConstants const APPROVAL_URL = 'approval_url'; const REST_SANDBOX_ENDPOINT = "https://api.sandbox.paypal.com/"; - const OPENID_REDIRECT_SANDBOX_URL = "https://www.sandbox.paypal.com/signin"; + const OPENID_REDIRECT_SANDBOX_URL = "https://www.sandbox.paypal.com"; const REST_LIVE_ENDPOINT = "https://api.paypal.com/"; - const OPENID_REDIRECT_LIVE_URL = "https://www.paypal.com/signin"; + const OPENID_REDIRECT_LIVE_URL = "https://www.paypal.com"; } diff --git a/tests/PayPal/Test/Api/OpenIdSessionTest.php b/tests/PayPal/Test/Api/OpenIdSessionTest.php index 68976d8..0a5a98d 100644 --- a/tests/PayPal/Test/Api/OpenIdSessionTest.php +++ b/tests/PayPal/Test/Api/OpenIdSessionTest.php @@ -85,7 +85,7 @@ class OpenIdSessionTest extends \PHPUnit_Framework_TestCase $redirectUri = 'http://mywebsite.com'; $idToken = 'abc'; - $expectedBaseUrl = "https://www.paypal.com/signin/endsession"; + $expectedBaseUrl = "https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/endsession"; $this->assertEquals($expectedBaseUrl . "?id_token=$idToken&redirect_uri=" . urlencode($redirectUri) . "&logout=true", OpenIdSession::getLogoutUrl($redirectUri, $idToken, $this->context), "Failed case - custom config");