mirror of
https://github.com/wearepixel/laravel-quickbooks.git
synced 2026-11-14 14:01:46 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32266f6dd5 |
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "wearepixel/laravel-quickbooks",
|
"name": "wearepixel/laravel-quickbooks",
|
||||||
"version": "2.0.1",
|
"version": "2.0.2",
|
||||||
"description": "Laravel Client for QuickBooks.",
|
"description": "Laravel Client for QuickBooks.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"quickbooks",
|
"quickbooks",
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
"illuminate/routing": "^10.0|^11.0|^12.0",
|
"illuminate/routing": "^10.0|^11.0|^12.0",
|
||||||
"illuminate/support": "^10.0|^11.0|^12.0",
|
"illuminate/support": "^10.0|^11.0|^12.0",
|
||||||
"nesbot/carbon": "^2.62.1|^3.0",
|
"nesbot/carbon": "^2.62.1|^3.0",
|
||||||
"quickbooks/v3-php-sdk": "^5.4.6"
|
"quickbooks/v3-php-sdk": "^6.3.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"laravel/pint": "^1.2",
|
"laravel/pint": "^1.2",
|
||||||
|
|||||||
+3
-9
@@ -181,12 +181,6 @@ public function hasValidRefreshToken(): bool
|
|||||||
* 2) Have valid refresh token, so renew access token & then use
|
* 2) Have valid refresh token, so renew access token & then use
|
||||||
* 3) No existing token, so need to link account
|
* 3) No existing token, so need to link account
|
||||||
*
|
*
|
||||||
* useJson() is applied in every case: the SDK's default XML deserializer reflects
|
|
||||||
* declared properties on its Data classes and throws when QuickBooks adds a new
|
|
||||||
* response field the installed SDK version doesn't know about yet. The JSON
|
|
||||||
* deserializer builds instances from the class's own properties and silently
|
|
||||||
* ignores unrecognised keys instead, so it tolerates QuickBooks-side schema drift.
|
|
||||||
*
|
|
||||||
* @throws SdkException
|
* @throws SdkException
|
||||||
* @throws ServiceException
|
* @throws ServiceException
|
||||||
*/
|
*/
|
||||||
@@ -209,7 +203,7 @@ protected function makeDataService(): DataService
|
|||||||
'QBORealmID' => $this->token->realm_id,
|
'QBORealmID' => $this->token->realm_id,
|
||||||
'refreshTokenKey' => $this->token->refresh_token,
|
'refreshTokenKey' => $this->token->refresh_token,
|
||||||
]),
|
]),
|
||||||
)->useJson();
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Have refresh, so update access & allow app to run
|
// Have refresh, so update access & allow app to run
|
||||||
@@ -220,7 +214,7 @@ protected function makeDataService(): DataService
|
|||||||
'QBORealmID' => $this->token->realm_id,
|
'QBORealmID' => $this->token->realm_id,
|
||||||
'refreshTokenKey' => $this->token->refresh_token,
|
'refreshTokenKey' => $this->token->refresh_token,
|
||||||
]),
|
]),
|
||||||
)->useJson();
|
);
|
||||||
|
|
||||||
$oauth_token = $data_service->getOAuth2LoginHelper()->refreshToken();
|
$oauth_token = $data_service->getOAuth2LoginHelper()->refreshToken();
|
||||||
|
|
||||||
@@ -232,7 +226,7 @@ protected function makeDataService(): DataService
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create new...
|
// Create new...
|
||||||
return DataService::Configure($this->parseDataConfigs())->useJson();
|
return DataService::Configure($this->parseDataConfigs());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use QuickBooksOnline\API\Core\Http\Serialization\SerializationFormat;
|
|
||||||
use QuickBooksOnline\API\DataService\DataService;
|
use QuickBooksOnline\API\DataService\DataService;
|
||||||
use QuickBooksOnline\API\Exception\ServiceException;
|
use QuickBooksOnline\API\Exception\ServiceException;
|
||||||
use Wearepixel\QuickBooks\Client;
|
use Wearepixel\QuickBooks\Client;
|
||||||
@@ -131,27 +130,6 @@
|
|||||||
it('returns a report service using the data service')
|
it('returns a report service using the data service')
|
||||||
->skip('Once we figure out how to test around the static DataService::Configure');
|
->skip('Once we figure out how to test around the static DataService::Configure');
|
||||||
|
|
||||||
it('configures the data service to use JSON serialization so unrecognised QuickBooks response fields do not throw', function () {
|
|
||||||
$this->token_mock
|
|
||||||
->shouldReceive('getAttribute')
|
|
||||||
->twice()
|
|
||||||
->with('hasValidAccessToken')
|
|
||||||
->andReturnFalse();
|
|
||||||
|
|
||||||
$this->token_mock
|
|
||||||
->shouldReceive('getAttribute')
|
|
||||||
->once()
|
|
||||||
->with('hasValidRefreshToken')
|
|
||||||
->andReturnFalse();
|
|
||||||
|
|
||||||
$format = $this->client
|
|
||||||
->getDataService()
|
|
||||||
->getServiceContext()
|
|
||||||
->IppConfiguration->Message->Request->SerializationFormat;
|
|
||||||
|
|
||||||
expect($format)->toBe(SerializationFormat::Json);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('has logging off by default')
|
it('has logging off by default')
|
||||||
->skip('Have to figure out how to test this with the new code in 5.x');
|
->skip('Have to figure out how to test this with the new code in 5.x');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user