From 4e27c01556bc6d9adb7765001eb9e6adcfb2b71d Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 16 Jun 2022 11:31:54 -0400 Subject: [PATCH 1/2] Remove unused php-jwt dependency --- composer.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a59f6da..019bf37 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,7 @@ ], "require": { "php": ">=5.6.0", - "league/oauth2-client": "2.6.*", - "firebase/php-jwt": "5.2.*" + "league/oauth2-client": "2.6.*" }, "require-dev": { "mockery/mockery": "~0.9", @@ -40,4 +39,4 @@ } }, "minimum-stability": "dev" -} +} \ No newline at end of file From 74a6d18f397621c0cddd6f06ef841316475295d0 Mon Sep 17 00:00:00 2001 From: aaron Date: Thu, 16 Jun 2022 11:32:36 -0400 Subject: [PATCH 2/2] get some of the failing test passing, we are still getting errors as a result of mocking our guzzle client --- test/src/Provider/OmronTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/src/Provider/OmronTest.php b/test/src/Provider/OmronTest.php index 1406e77..2795398 100644 --- a/test/src/Provider/OmronTest.php +++ b/test/src/Provider/OmronTest.php @@ -58,18 +58,18 @@ public function testAuthorizationUrl() public function testScopes() { - $scopes = ['user.info', 'user.metrics', 'user.activity']; + $scopes = ['openid', 'offline_access', 'bloodpressure']; $url = $this->provider->getAuthorizationUrl(); $uri = parse_url($url); - $this->assertContains(urlencode(implode(',', $scopes)), $url); + $this->assertContains(implode('%20', $scopes), $url); } public function testGetAuthorizationUrl() { $url = $this->provider->getAuthorizationUrl(); $uri = parse_url($url); - $this->assertEquals('/oauth2_user/authorize2', $uri['path']); + $this->assertEquals('/connect/authorize', $uri['path']); } public function testGetBaseAccessTokenUrl() @@ -77,7 +77,7 @@ public function testGetBaseAccessTokenUrl() $params = []; $url = $this->provider->getBaseAccessTokenUrl($params); $uri = parse_url($url); - $this->assertEquals('/oauth2/token', $uri['path']); + $this->assertEquals('/connect/token', $uri['path']); } public function testGetResourceOwnerDetailsUrl()