xero-ruby 2.3.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f648d74ef948d879de90b2d57b4b0bd55c832d36f69c7f07153f586d5e683e75
-  data.tar.gz: 803eed8ac855883c79a35acf9964d6832a2979116f40b615f0f894207e11ce51
+  metadata.gz: cd45eb905d350e9480a972d1754a51c9e6a385859e9217edb55e1fada869432d
+  data.tar.gz: ca93756ba4a748d60f86912c863f664393d71c9c0d14e6bf71442b756d594ed3
 SHA512:
-  metadata.gz: dd9a46f2efe203d78b2debb8cac5ae22d894e053651f049c848c606a61bd9d039117f1a028f2658d0d336daf7e5474511b9103e7b14c67c32fa3d251110bc7e7
-  data.tar.gz: 830d1e3cbad89ad8dad5c9201f30e8fb9ea3fc89c62a8aa06790d60b16bec96b39e3feef0809a879e007cb9f18fdb9de81b573da4fa33475201b6d01bd6a263b
+  metadata.gz: 6a140a7c1182d243bed2465bc9e4c3849f630adbf01cd8bb23109fd91597cb6340562c18aeb429ec492681acf7c4b507c9e0d62595d90bbd3f0a581fcf25cbad
+  data.tar.gz: 0244720a3942dd5ac14ab2d6a3bab3b7a3833b0b1e2a18d176fe73d89acbe47c1c8740078eb917f12980d88b2c4708be7121715db9b1ef80cd143ea7a503c107

data/README.md

@@ -29,6 +29,8 @@ We have two apps showing SDK usage.
 * https://github.com/XeroAPI/xero-ruby-oauth2-starter (**Sinatra** - session based / getting started)
 * https://github.com/XeroAPI/xero-ruby-oauth2-app (**Rails** - token management / full examples)
 
+![sample-app](https://i.imgur.com/OOEn55G.png)
+
 ## Looking for OAuth 1.0a support?
 Check out the [Xeroizer](https://github.com/waynerobinson/xeroizer) gem (maintained by community).
 
@@ -59,7 +61,8 @@ creds = {
   client_id: ENV['CLIENT_ID'],
   client_secret: ENV['CLIENT_SECRET'],
   redirect_uri: ENV['REDIRECT_URI'],
-  scopes: ENV['SCOPES']
+  scopes: ENV['SCOPES'],
+  state: "this-can-be-a-custom-state-parameter" # optional
 }
 xero_client ||= XeroRuby::ApiClient.new(credentials: creds)
 ```
@@ -84,6 +87,9 @@ In your callback route catch, calling `get_token_set_from_callback` will exchang
 token_set = xero_client.get_token_set_from_callback(params)
 
 # save token_set JSON in a datastore in relation to the user authentication
+
+puts params['state']
+=> "this-can-be-a-custom-state-parameter"
 ```
 
 ## Making API calls once you have a token_set

data/lib/xero-ruby.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -112,6 +112,7 @@ require 'xero-ruby/models/payroll_nz/accounts'
 require 'xero-ruby/models/payroll_nz/address'
 require 'xero-ruby/models/payroll_nz/bank_account'
 require 'xero-ruby/models/payroll_nz/benefit'
+require 'xero-ruby/models/payroll_nz/calendar_type'
 require 'xero-ruby/models/payroll_nz/deduction'
 require 'xero-ruby/models/payroll_nz/deduction_line'
 require 'xero-ruby/models/payroll_nz/deduction_object'
@@ -331,10 +332,12 @@ require 'xero-ruby/models/accounting/accounts_receivable'
 require 'xero-ruby/models/accounting/action'
 require 'xero-ruby/models/accounting/actions'
 require 'xero-ruby/models/accounting/address'
+require 'xero-ruby/models/accounting/address_for_organisation'
 require 'xero-ruby/models/accounting/allocation'
 require 'xero-ruby/models/accounting/allocations'
 require 'xero-ruby/models/accounting/attachment'
 require 'xero-ruby/models/accounting/attachments'
+require 'xero-ruby/models/accounting/balance_details'
 require 'xero-ruby/models/accounting/balances'
 require 'xero-ruby/models/accounting/bank_transaction'
 require 'xero-ruby/models/accounting/bank_transactions'
@@ -354,6 +357,8 @@ require 'xero-ruby/models/accounting/contact_group'
 require 'xero-ruby/models/accounting/contact_groups'
 require 'xero-ruby/models/accounting/contact_person'
 require 'xero-ruby/models/accounting/contacts'
+require 'xero-ruby/models/accounting/conversion_balances'
+require 'xero-ruby/models/accounting/conversion_date'
 require 'xero-ruby/models/accounting/country_code'
 require 'xero-ruby/models/accounting/credit_note'
 require 'xero-ruby/models/accounting/credit_notes'
@@ -369,6 +374,10 @@ require 'xero-ruby/models/accounting/expense_claims'
 require 'xero-ruby/models/accounting/external_link'
 require 'xero-ruby/models/accounting/history_record'
 require 'xero-ruby/models/accounting/history_records'
+require 'xero-ruby/models/accounting/import_summary'
+require 'xero-ruby/models/accounting/import_summary_accounts'
+require 'xero-ruby/models/accounting/import_summary_object'
+require 'xero-ruby/models/accounting/import_summary_organisation'
 require 'xero-ruby/models/accounting/invoice'
 require 'xero-ruby/models/accounting/invoice_reminder'
 require 'xero-ruby/models/accounting/invoice_reminders'
@@ -426,6 +435,7 @@ require 'xero-ruby/models/accounting/request_empty'
 require 'xero-ruby/models/accounting/row_type'
 require 'xero-ruby/models/accounting/sales_tracking_category'
 require 'xero-ruby/models/accounting/schedule'
+require 'xero-ruby/models/accounting/setup'
 require 'xero-ruby/models/accounting/tax_component'
 require 'xero-ruby/models/accounting/tax_rate'
 require 'xero-ruby/models/accounting/tax_rates'

data/lib/xero-ruby/api/accounting_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -13879,7 +13879,7 @@ module XeroRuby
     # Allows you to retrieve report for BalanceSheet
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :date The date of the Balance Sheet report
+    # @option opts [Date] :date The date of the Balance Sheet report
     # @option opts [Integer] :periods The number of periods for the Balance Sheet report
     # @option opts [String] :timeframe The period size to compare to (MONTH, QUARTER, YEAR)
     # @option opts [String] :tracking_option_id1 The tracking option 1 for the Balance Sheet report
@@ -13895,7 +13895,7 @@ module XeroRuby
     # Allows you to retrieve report for BalanceSheet
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :date The date of the Balance Sheet report
+    # @option opts [Date] :date The date of the Balance Sheet report
     # @option opts [Integer] :periods The number of periods for the Balance Sheet report
     # @option opts [String] :timeframe The period size to compare to (MONTH, QUARTER, YEAR)
     # @option opts [String] :tracking_option_id1 The tracking option 1 for the Balance Sheet report
@@ -14817,6 +14817,82 @@ module XeroRuby
       return data, status_code, headers
     end
 
+    # Allows you to set the chart of accounts, the conversion date and conversion balances
+    # @param xero_tenant_id [String] Xero identifier for Tenant
+    # @param setup [Setup] Object including an accounts array, a conversion balances array and a conversion date object in body of request
+    # @param [Hash] opts the optional parameters
+    # @return [ImportSummaryObject]
+    def post_setup(xero_tenant_id, setup, opts = {})
+      data, _status_code, _headers = post_setup_with_http_info(xero_tenant_id, setup, opts)
+      data
+    end
+
+    # Allows you to set the chart of accounts, the conversion date and conversion balances
+    # @param xero_tenant_id [String] Xero identifier for Tenant
+    # @param setup [Setup] Object including an accounts array, a conversion balances array and a conversion date object in body of request
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(ImportSummaryObject, Integer, Hash)>] ImportSummaryObject data, response status code and response headers
+    def post_setup_with_http_info(xero_tenant_id, setup, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: AccountingApi.post_setup ...'
+      end
+      # verify the required parameter 'xero_tenant_id' is set
+      if @api_client.config.client_side_validation && xero_tenant_id.nil?
+        fail ArgumentError, "Missing the required parameter 'xero_tenant_id' when calling AccountingApi.post_setup"
+      end
+      # verify the required parameter 'setup' is set
+      if @api_client.config.client_side_validation && setup.nil?
+        fail ArgumentError, "Missing the required parameter 'setup' when calling AccountingApi.post_setup"
+      end
+      # resource path
+      local_var_path = '/Setup'
+
+      # camelize keys of incoming `where` opts
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      
+      # XeroAPI's `IDs` convention openapi-generator does not snake_case properly.. manual over-riding `i_ds` malformations:
+      query_params[:'IDs'] = @api_client.build_collection_param(opts[:'ids'], :csv) if !opts[:'ids'].nil?
+      query_params[:'ContactIDs'] = @api_client.build_collection_param(opts[:'contact_ids'], :csv) if !opts[:'contact_ids'].nil?
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      header_params[:'xero-tenant-id'] = xero_tenant_id
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:body] || @api_client.object_to_http_body(setup) 
+
+      # return_type
+      return_type = opts[:return_type] || 'ImportSummaryObject' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['OAuth2']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, "AccountingApi", new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: AccountingApi#post_setup\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Allows you to update a chart of accounts
     # @param xero_tenant_id [String] Xero identifier for Tenant
     # @param account_id [String] Unique identifier for retrieving single object

data/lib/xero-ruby/api/asset_api.rb

@@ -3,7 +3,7 @@
 
 #This is the Xero Assets API
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/api/files_api.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/api/payroll_au_api.rb

@@ -3,7 +3,7 @@
 
 #This is the Xero Payroll API for orgs in Australia region.
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/api/payroll_nz_api.rb

@@ -3,7 +3,7 @@
 
 #This is the Xero Payroll API for orgs in the NZ region.
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/api/payroll_uk_api.rb

@@ -3,7 +3,7 @@
 
 #This is the Xero Payroll API for orgs in the UK region.
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/api/project_api.rb

@@ -3,7 +3,7 @@
 
 #This is the Xero Projects API
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -600,6 +600,7 @@ module XeroRuby
     # @option opts [Integer] :page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     # @option opts [Integer] :page_size Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
     # @option opts [String] :task_ids taskIdsSearch for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds={taskId},{taskId}
+    # @option opts [ChargeType] :charge_type 
     # @return [Tasks]
     def get_tasks(xero_tenant_id, project_id, opts = {})
       data, _status_code, _headers = get_tasks_with_http_info(xero_tenant_id, project_id, opts)
@@ -614,6 +615,7 @@ module XeroRuby
     # @option opts [Integer] :page Set to 1 by default. The requested number of the page in paged response - Must be a number greater than 0.
     # @option opts [Integer] :page_size Optional, it is set to 50 by default. The number of items to return per page in a paged response - Must be a number between 1 and 500.
     # @option opts [String] :task_ids taskIdsSearch for all tasks that match a comma separated list of taskIds, i.e. GET https://.../tasks?taskIds={taskId},{taskId}
+    # @option opts [ChargeType] :charge_type 
     # @return [Array<(Tasks, Integer, Hash)>] Tasks data, response status code and response headers
     def get_tasks_with_http_info(xero_tenant_id, project_id, opts = {})
       if @api_client.config.debugging
@@ -638,6 +640,7 @@ module XeroRuby
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       query_params[:'pageSize'] = opts[:'page_size'] if !opts[:'page_size'].nil?
       query_params[:'taskIds'] = opts[:'task_ids'] if !opts[:'task_ids'].nil?
+      query_params[:'chargeType'] = opts[:'charge_type'] if !opts[:'charge_type'].nil?
       
       # XeroAPI's `IDs` convention openapi-generator does not snake_case properly.. manual over-riding `i_ds` malformations:
       query_params[:'IDs'] = @api_client.build_collection_param(opts[:'ids'], :csv) if !opts[:'ids'].nil?

data/lib/xero-ruby/api_client.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -34,6 +34,7 @@ module XeroRuby
       @client_secret = credentials[:client_secret]
       @redirect_uri = credentials[:redirect_uri]
       @scopes = credentials[:scopes]
+      @state = credentials[:state]
       @config = config
       @user_agent = "xero-ruby-#{VERSION}"
       @default_headers = {
@@ -43,7 +44,7 @@ module XeroRuby
     end
 
     def authorization_url
-      url = "#{@config.login_url}?response_type=code&client_id=#{@client_id}&redirect_uri=#{@redirect_uri}&scope=#{@scopes}"
+      url = "#{@config.login_url}?response_type=code&client_id=#{@client_id}&redirect_uri=#{@redirect_uri}&scope=#{@scopes}&state=#{@state}"
       return url
     end
 
@@ -125,6 +126,7 @@ module XeroRuby
         req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         req.body = URI.encode_www_form(data)
       end
+      return_error(response) unless response.success?
       body = JSON.parse(response.body)
       set_token_set(body)
       return body
@@ -132,20 +134,15 @@ module XeroRuby
 
     # Connection heplers
     def connections
-      response = Faraday.get('https://api.xero.com/connections') do |req|
-        req.headers['Authorization'] = "Bearer #{access_token}" 
-        req.headers['Content-Type'] = 'application/json'
-      end
-      body = JSON.parse(response.body)
-      return body
+      opts = { :header_params => {'Content-Type': 'application/json'}, :auth_names => ['OAuth2'] }
+      response = call_api(:GET, 'https://api.xero.com/connections/', nil, opts)
+      response[0]
     end
 
     def disconnect(connection_id)
-      Faraday.delete("https://api.xero.com/connections/#{connection_id}") do |req|
-        req.headers['Authorization'] = "Bearer #{access_token}"
-        req.headers['Content-Type'] = 'application/json'
-      end
-      return connections
+      opts = { :header_params => {'Content-Type': 'application/json'}, :auth_names => ['OAuth2'] }
+      call_api(:DELETE, "https://api.xero.com/connections/#{connection_id}", nil, opts)
+      connections
     end
 
     # Call an API with given options.
@@ -179,18 +176,7 @@ module XeroRuby
           @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
         end
 
-        unless response.success?
-          if response.status == 0
-            # Errors from libcurl will be made visible here
-            fail ApiError.new(:code => 0,
-                              :message => response.return_message)
-          else
-            fail ApiError.new(:code => response.status,
-                              :response_headers => response.headers,
-                              :response_body => response.body),
-                 response.reason_phrase
-          end
-        end
+        return_error(response) unless response.success?
       rescue Faraday::TimeoutError
         fail ApiError.new('Connection timed out')
       end
@@ -198,12 +184,27 @@ module XeroRuby
       if opts[:return_type]
         prepare_file(response) if opts[:return_type] == 'File'
         data = deserialize(response, opts[:return_type], api_client)
+      elsif !response.body.empty?
+        data = JSON.parse(response.body)
       else
         data = nil
       end
       return data, response.status, response.headers
     end
 
+    def return_error(response)
+      if response.status == 0
+        # Errors from libcurl will be made visible here
+        fail ApiError.new(:code => 0,
+                          :message => response.return_message)
+      else
+        fail ApiError.new(:code => response.status,
+                          :response_headers => response.headers,
+                          :response_body => response.body),
+              response.reason_phrase
+      end
+    end
+
     # Builds the HTTP request
     #
     # @param [String] http_method HTTP method/verb (e.g. POST)
@@ -416,9 +417,13 @@ module XeroRuby
     end
 
     def build_request_url(path)
-      # Add leading and trailing slashes to path
-      path = "/#{path}".gsub(/\/+/, '/')
-      @config.base_url + path
+      if @config.base_url
+        # Add leading and trailing slashes to path
+        path = "/#{path}".gsub(/\/+/, '/')
+        @config.base_url + path
+      else
+        path
+      end
     end
 
     # Update hearder and query params based on authentication settings.

data/lib/xero-ruby/api_error.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -21,8 +21,8 @@ module XeroRuby
     #   ApiError.new(:code => 404, :message => "Not Found")
     def initialize(arg = nil)
       if arg.is_a? Hash
-        if arg.key?(:message) || arg.key?('message')
-          super(arg[:message] || arg['message'])
+        if arg.key?(:message) || arg.key?('message') || arg.key?(:Message) || arg.key?('Message')
+          super(arg[:message] || arg['message'] || arg.key?(:Message) || arg.key?('Message'))
         else
           super arg
         end
@@ -31,6 +31,7 @@ module XeroRuby
           instance_variable_set "@#{k}", v
         end
       else
+        @message = arg
         super arg
       end
     end

data/lib/xero-ruby/configuration.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/models/accounting/account.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.4.0
+The version of the OpenAPI document: 2.8.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -91,6 +91,7 @@ module XeroRuby::Accounting
     CISLABOURINCOME = "CISLABOURINCOME".freeze
     CISLIABILITY = "CISLIABILITY".freeze
     CISMATERIALS = "CISMATERIALS".freeze
+    # duplicate definitions generated: https://github.com/XeroAPI/xero-ruby/issues/53#issuecomment-668893305
     # EMPTY = "".freeze
     
     # Shown if set