Merge branch 'main' of github.com:onlime/bexio-api-client

Author: onlime

CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 
-## [0.5.x (unreleased)](https://github.com/onlime/bexio-api-client/compare/0.5.0...main)
+## [0.6.x (unreleased)](https://github.com/onlime/bexio-api-client/compare/0.6.1...main)
+
+## [0.6.1 (2024-10-09)](https://github.com/onlime/bexio-api-client/compare/0.6.0...0.6.1)
+
+- Fix for `jumbojett/openid-connect-php` v1.0: Only set accessToken if already loaded in `Bexio\Client` instance.
+
+## [0.6.0 (2024-10-08)](https://github.com/onlime/bexio-api-client/compare/0.5.0...0.6.0)
+
+- Updated `jumbojett/openid-connect-php` to v1.0
+- Updated Bexio OpenID Connect provider URL to `https://auth.bexio.com/realms/bexio`
 
 ## [0.5.0 (2023-09-27)](https://github.com/onlime/bexio-api-client/compare/0.4.1...0.5.0)
 

composer.json

@@ -22,11 +22,11 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "jumbojett/openid-connect-php": "^0.9.10",
-        "guzzlehttp/guzzle": "^7.8"
+        "jumbojett/openid-connect-php": "^1.0",
+        "guzzlehttp/guzzle": "^7.9"
     },
     "require-dev": {
-        "laravel/pint": "^1.13"
+        "laravel/pint": "^1.18"
     },
     "suggest": {
         "onlime/laravel-bexio-api-client": "To use Laravel HTTP Client instead of Guzzle"

src/Bexio/AbstractClient.php

@@ -7,7 +7,7 @@
 
 abstract class AbstractClient
 {
-    const PROVIDER_URL = 'https://idp.bexio.com';
+    const PROVIDER_URL = 'https://auth.bexio.com/realms/bexio';
 
     const API_URL = 'https://api.bexio.com';
 
@@ -104,7 +104,7 @@ public function getOpenIDConnectClient(): OpenIDConnectClient
             $this->clientSecret
         );
         $oidc->addScope($this->scopes);
-        $oidc->setAccessToken($this->accessToken);
+        $this->accessToken && $oidc->setAccessToken($this->accessToken);
         return $oidc;
     }
 

src/Bexio/Bexio.php

@@ -6,6 +6,5 @@ class Bexio
 {
     public function __construct(
         protected AbstractClient $client
-    ) {
-    }
+    ) {}
 }

src/Bexio/Client.php

@@ -56,7 +56,7 @@ protected function request(
         }
 
         try {
-            $response = (new GuzzleClient())->request($method, $this->getFullApiUrl($path), $options);
+            $response = (new GuzzleClient)->request($method, $this->getFullApiUrl($path), $options);
         } catch (ClientException $e) {
             // transform Guzzle ClientException into some more readable form, so that body content does not get truncated
             $body = json_decode($e->getResponse()->getBody()->getContents());

src/Bexio/Exception/BexioClientException.php

@@ -4,6 +4,4 @@
 
 use Exception;
 
-class BexioClientException extends Exception
-{
-}
+class BexioClientException extends Exception {}