Merge pull request #29 from XeroAPI/sid-development

Build of OAS 2.4.0

Author: SidneyAllen

setup.py

@@ -48,5 +48,5 @@ def read_file(filename):
     keywords="xero python sdk API oAuth",
     name="xero_python",
     packages=find_packages(include=["xero_python", "xero_python.*"]),
-    version="1.0.12",
+    version="1.0.13",
 )

tests/conftest.py

@@ -127,6 +127,23 @@ def oauth2_token(
         "token_type": "Bearer",
     }
 
+@pytest.fixture()
+def oauth2_token_without_id_token(
+    xero_access_token,
+    xero_refresh_token,
+    xero_scope,
+    xero_expires_in,
+    xero_expires_at,
+):
+    return {
+        "access_token": xero_access_token,
+        "expires_at": xero_expires_at,
+        "expires_in": xero_expires_in,
+        "refresh_token": xero_refresh_token,
+        "scope": xero_scope,
+        "token_type": "Bearer",
+    }
+
 
 @pytest.fixture()
 def oauth2_refresh_token(oauth2_token, xero_refresh_token):

tests/test_api_client/test_oauth2.py

@@ -205,6 +205,22 @@ def test_auth2_call_refresh_token_api(oauth2_refresh_token):
     assert call_kwargs == {}
     assert new_token is token
 
+def test_auth2_call_refresh_token_api_without_id_token(oauth2_token_without_id_token):
+    # Given valid refresh token and client credentials without using OpenID scope (id_token absent)
+    oauth2_token = OAuth2Token()
+    oauth2_token.update_token(**oauth2_token_without_id_token)
+    token = {}
+    token_api = FakeClass()
+    token_api.refresh_token = FakeMethod(return_value=token)
+    # When refresh token API endpoint called
+    new_token = oauth2_token.call_refresh_token_api(token_api)
+    # Then new oauth2 token received
+    assert len(token_api.refresh_token.calls) == 1
+    call_args, call_kwargs = token_api.refresh_token.calls[0]
+    assert call_args == (oauth2_token.refresh_token, oauth2_token.scope)
+    assert call_kwargs == {}
+    assert new_token is token
+
 
 def test_token_api_refresh_token(
     xero_client_id, xero_client_secret, xero_scope, vcr, vcr_cassette_name

xero_python/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """Xero Developer API"""
 __email__ = "[email protected]"
-__version__ = "1.0.12"
+__version__ = "1.0.13"

xero_python/accounting/__init__.py

@@ -7,7 +7,7 @@
 
     No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)  # noqa: E501
 
-    OpenAPI spec version: 2.3.4
+    OpenAPI spec version: 2.4.0
     Contact: [email protected]
     Generated by: https://openapi-generator.tech
 """
@@ -23,6 +23,8 @@
 from xero_python.accounting.models.accounts import Accounts
 from xero_python.accounting.models.accounts_payable import AccountsPayable
 from xero_python.accounting.models.accounts_receivable import AccountsReceivable
+from xero_python.accounting.models.action import Action
+from xero_python.accounting.models.actions import Actions
 from xero_python.accounting.models.address import Address
 from xero_python.accounting.models.allocation import Allocation
 from xero_python.accounting.models.allocations import Allocations

xero_python/accounting/api/accounting_api.py

@@ -0,0 +1,11 @@
+# Action
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **str** | Name of the actions for this organisation | [optional] 
+**status** | **str** | Status of the action for this organisation | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

xero_python/accounting/docs/AccountingApi.md

@@ -0,0 +1,10 @@
+# Actions
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**actions** | [**list[Action]**](Action.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

xero_python/accounting/docs/Action.md

@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **amount_paid** | **float** | The amount still to pay for an expense claim | [optional] 
 **payment_due_date** | **date** | The date when the expense claim is due to be paid YYYY-MM-DD | [optional] 
 **reporting_date** | **date** | The date the expense claim will be reported in Xero YYYY-MM-DD | [optional] 
-**receipt_id** | **str** | The Xero identifier for the Receipt e.g.  e59a2c7f-1306-4078-a0f3-73537afcbba9 | [optional] 
+**receipt_id** | **str** | The Xero identifier for the Receipt e.g. e59a2c7f-1306-4078-a0f3-73537afcbba9 | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)