my_john_deere_api 2.5.0 → 3.0.0

data/test/lib/my_john_deere_api/request/individual/contribution_product_test.rb

@@ -10,7 +10,6 @@ describe 'MyJohnDeereApi::Request::Individual::ContributionProduct' do
   describe '#initialize(client, contribution_product_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts contribution_product_id as id' do
@@ -19,8 +18,8 @@ describe 'MyJohnDeereApi::Request::Individual::ContributionProduct' do
   end
 
   describe '#resource' do
-    it 'returns /contributionProducts/<product_id>' do
-      assert_equal "/contributionProducts/#{contribution_product_id}", object.resource
+    it 'returns /platform/contributionProducts/<product_id>' do
+      assert_equal "/platform/contributionProducts/#{contribution_product_id}", object.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/individual/field_test.rb

@@ -10,7 +10,6 @@ describe 'MyJohnDeereApi::Request::Individual::Field' do
   describe '#initialize(client, organization_id, field_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts organization_id as organization_id' do
@@ -23,8 +22,8 @@ describe 'MyJohnDeereApi::Request::Individual::Field' do
   end
 
   describe '#resource' do
-    it 'returns /organizations/<organization_id>/fields/<field_id>' do
-      assert_equal "/organizations/#{organization_id}/fields/#{field_id}", object.resource
+    it 'returns /platform/organizations/<organization_id>/fields/<field_id>' do
+      assert_equal "/platform/organizations/#{organization_id}/fields/#{field_id}", object.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/individual/organization_test.rb

@@ -10,7 +10,6 @@ describe 'MyJohnDeereApi::Request::Individual::Organization' do
   describe '#initialize(client, asset_id)' do
     it 'accepts a client' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
     end
 
     it 'accepts organization_id as id' do
@@ -19,8 +18,8 @@ describe 'MyJohnDeereApi::Request::Individual::Organization' do
   end
 
   describe '#resource' do
-    it 'returns /organizations/<organization_id>' do
-      assert_equal "/organizations/#{organization_id}", object.resource
+    it 'returns /platform/organizations/<organization_id>' do
+      assert_equal "/platform/organizations/#{organization_id}", object.resource
     end
   end
 

data/test/lib/my_john_deere_api/request/update/asset_test.rb

@@ -1,6 +1,8 @@
 require 'support/helper'
 
 describe 'MyJohnDeereApi::Request::Update::Asset' do
+  include JD::ResponseHelpers
+
   let(:klass) { JD::Request::Update::Asset }
   let(:object) { klass.new(client, item, attributes) }
   let(:item) { JD::Model::Asset.new(client, record) }
@@ -29,7 +31,6 @@ describe 'MyJohnDeereApi::Request::Update::Asset' do
   describe '#initialize(client, item, attributes)' do
     it 'accepts a client, item and attributes' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
       assert_equal item, object.item
       assert_equal item.attributes.merge(attributes), object.attributes
     end
@@ -42,21 +43,8 @@ describe 'MyJohnDeereApi::Request::Update::Asset' do
   end
 
   describe '#resource' do
-    it 'is /assets/<asset_id>' do
-      assert_equal "/assets/#{asset_id}", object.send(:resource)
-    end
-  end
-
-  describe '#headers' do
-    it 'sets the accept and content-type headers' do
-      object = klass.new(client, item, attributes)
-      headers = object.send(:headers)
-
-      expected = 'application/vnd.deere.axiom.v3+json'
-
-      assert_kind_of Hash, headers
-      assert_equal expected, headers['Accept']
-      assert_equal expected, headers['Content-Type']
+    it 'is /platform/assets/<asset_id>' do
+      assert_equal "/platform/assets/#{asset_id}", object.send(:resource)
     end
   end
 
@@ -93,7 +81,7 @@ describe 'MyJohnDeereApi::Request::Update::Asset' do
     it 'makes the request' do
       VCR.use_cassette('put_asset') { object.request }
 
-      assert_kind_of Net::HTTPNoContent, object.response
+      assert_no_content object.response
     end
   end
 end

data/test/lib/my_john_deere_api/request/update/base_test.rb

@@ -22,7 +22,6 @@ describe 'MyJohnDeereApi::Request::Update::Base' do
   describe '#initialize(client, item, attributes)' do
     it 'accepts a client, item and attributes' do
       assert_equal client, object.client
-      assert_equal accessor, object.accessor
       assert_equal item, object.item
     end
 
@@ -44,17 +43,4 @@ describe 'MyJohnDeereApi::Request::Update::Base' do
       end
     end
   end
-
-  describe '#headers' do
-    it 'sets the accept and content-type headers' do
-      object = klass.new(client, item, attributes)
-      headers = object.send(:headers)
-
-      expected = 'application/vnd.deere.axiom.v3+json'
-
-      assert_kind_of Hash, headers
-      assert_equal expected, headers['Accept']
-      assert_equal expected, headers['Content-Type']
-    end
-  end
 end

data/test/support/helper.rb

@@ -7,14 +7,15 @@ require 'my_john_deere_api'
 require 'mocha/minitest'
 
 require 'support/vcr_setup'
+require 'support/response_helpers'
+require 'support/link_helpers'
 
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
 # shortcut for long module name
 JD = MyJohnDeereApi
 
-TOKEN_PATTERN = /^[0-9a-z\-]+$/
-SECRET_PATTERN = /^[0-9A-Za-z\-+=\/]+$/
+TOKEN_PATTERN = /^[0-9a-zA-Z\-_\.]+$/
 
 CONFIG = VcrSetup.new
 
@@ -42,12 +43,16 @@ class Minitest::Spec
     @_client ||= CONFIG.client
   end
 
+  def token_hash
+    @_token_hash ||= CONFIG.token_hash
+  end
+
   def accessor
     @_accessor ||= VCR.use_cassette('catalog') { client.accessor }
   end
 
   def base_url
-    @base_url ||= accessor.consumer.site
+    @base_url ||= accessor.client.site
   end
 
   def api_key
@@ -62,8 +67,12 @@ class Minitest::Spec
     CONFIG.access_token
   end
 
-  def access_secret
-    CONFIG.access_secret
+  def new_access_token
+    CONFIG.new_access_token
+  end
+
+  def refresh_token
+    CONFIG.refresh_token
   end
 
   def contribution_product_id

data/test/support/link_helpers.rb

@@ -0,0 +1,14 @@
+module MyJohnDeereApi
+  module LinkHelpers
+    def link_for(label)
+      record['links'].detect{|link| link['rel'] == label}['uri'].gsub('https://sandboxapi.deere.com', '')
+    end
+
+    def assert_link_for(object, attribute)
+      attribute_underscore = attribute.to_s
+      attribute_camelcase = attribute_underscore.gsub(%r{_(.)}){$1.upcase}
+
+      assert_equal link_for(attribute_camelcase), object.links[attribute_underscore]
+    end
+  end
+end

data/test/support/response_helpers.rb

@@ -0,0 +1,18 @@
+module MyJohnDeereApi
+  module ResponseHelpers
+    def assert_created(response)
+      assert_response(response, 201, 'Created')
+    end
+
+    def assert_no_content(response)
+      assert_response(response, 204, 'No Content')
+    end
+
+    def assert_response(response, code, message)
+      faraday_response = response.response
+
+      assert_equal code, faraday_response.status
+      assert_equal message, faraday_response.reason_phrase
+    end
+  end
+end

data/test/support/vcr/catalog.yml

@@ -2,88 +2,95 @@
 http_interactions:
 - request:
     method: get
-    uri: https://sandboxapi.deere.com/platform/
+    uri: https://sandboxapi.deere.com/platform
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v1.3.0
       Accept:
       - application/vnd.deere.axiom.v3+json
+      Authorization:
+      - Bearer AccessToken0123456789abcdefghijklmnopqrstuvwxyz
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - OAuth gem v0.5.4
-      Authorization:
-      - OAuth oauth_consumer_key="johndeere-0000000000000000000000000000000000000000",
-        oauth_nonce="000000000000000000000000000000000000000000", oauth_signature="0000000000000000000000000000",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1581334172", oauth_version="1.0"
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Mon, 10 Feb 2020 17:28:57 GMT
+      - Wed, 17 Mar 2021 21:38:22 GMT
       Content-Type:
       - application/vnd.deere.axiom.v3+json;charset=UTF-8
-      X-Deere-Handling-Server:
-      - ip-10-214-45-104
       X-Frame-Options:
-      - SAMEORIGIN
-      X-Deere-Elapsed-Ms:
-      - '9'
+      - DENY
       Cache-Control:
       - no-store
+      Strict-Transport-Security:
+      - max-age=31536000 ; includeSubDomains
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
       Content-Language:
-      - en-US
+      - en
       Transfer-Encoding:
       - chunked
     body:
       encoding: ASCII-8BIT
-      string: '{"@type":"ApiCatalog","links":[{"@type":"Link","rel":"oauthRequestToken","uri":"https://sandboxapi.deere.com/platform/oauth/request_token"},{"@type":"Link","rel":"oauthAuthorizeRequestToken","uri":"https://my.deere.com/consentToUseOfData?oauth_token={token}"},{"@type":"Link","rel":"oauthAccessToken","uri":"https://sandboxapi.deere.com/platform/oauth/access_token"},{"@type":"Link","rel":"agencies","uri":"https://sandboxapi.deere.com/platform/agencies"}]}'
+      string: '{"@type":"ApiCatalog","links":[{"@type":"Link","rel":"oauthRequestToken","uri":"https://sandboxapi.deere.com/platform/oauth/request_token"},{"@type":"Link","rel":"oauthAuthorizeRequestToken","uri":"https://operationscenter.deere.com/consentToUseOfData?oauth_token={token}"},{"@type":"Link","rel":"oauthAccessToken","uri":"https://sandboxapi.deere.com/platform/oauth/access_token"},{"@type":"Link","rel":"currentUser","uri":"https://sandboxapi.deere.com/platform/users/@currentUser"},{"@type":"Link","rel":"organizations","uri":"https://sandboxapi.deere.com/platform/organizations"},{"@type":"Link","rel":"currentToken","uri":"https://sandboxapi.deere.com/platform/oauthTokens/@currentToken"},{"@type":"Link","rel":"contributionProducts","uri":"https://sandboxapi.deere.com/platform/contributionProducts"},{"@type":"Link","rel":"contributionDefinitions","uri":"https://sandboxapi.deere.com/platform/contributionDefinitions"},{"@type":"Link","rel":"assetCatalog","uri":"https://sandboxapi.deere.com/platform/assetCatalog"},{"@type":"Link","rel":"agencies","uri":"https://sandboxapi.deere.com/platform/agencies"}]}'
     http_version: 
-  recorded_at: Mon, 10 Feb 2020 17:28:57 GMT
+  recorded_at: Wed, 17 Mar 2021 21:38:22 GMT
 - request:
     method: get
-    uri: https://sandboxapi.deere.com/platform/
+    uri: https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/.well-known/oauth-authorization-server
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v1.3.0
       Accept:
       - application/vnd.deere.axiom.v3+json
+      Authorization:
+      - Bearer AccessToken0123456789abcdefghijklmnopqrstuvwxyz
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - OAuth gem v0.5.4
-      Authorization:
-      - OAuth oauth_consumer_key="johndeere-0000000000000000000000000000000000000000",
-        oauth_nonce="000000000000000000000000000000000000000000", oauth_signature="0000000000000000000000000000",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1581334172", oauth_version="1.0"
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Mon, 10 Feb 2020 17:28:57 GMT
+      - Wed, 17 Mar 2021 21:38:22 GMT
+      Server:
+      - nginx
       Content-Type:
-      - application/vnd.deere.axiom.v3+json;charset=UTF-8
-      X-Deere-Handling-Server:
-      - ip-10-214-44-36
-      X-Frame-Options:
-      - SAMEORIGIN
-      X-Deere-Elapsed-Ms:
-      - '16'
+      - application/json
+      X-Xss-Protection:
+      - '0'
+      P3p:
+      - CP="HONK"
+      Expect-Ct:
+      - report-uri="https://oktaexpectct.report-uri.com/r/t/ct/reportOnly", max-age=0
       Cache-Control:
-      - no-store
-      Content-Language:
-      - en-US
+      - max-age=86400, must-revalidate
+      Expires:
+      - Thu, 18 Mar 2021 21:37:54 GMT
+      X-Content-Type-Options:
+      - nosniff
+      Strict-Transport-Security:
+      - max-age=315360000; includeSubDomains
+      X-Okta-Request-Id:
+      - YFJ2zq-5EtNqLxyo29u@LgAABaM
       Transfer-Encoding:
       - chunked
     body:
-      encoding: ASCII-8BIT
-      string: '{"@type":"ApiCatalog","links":[{"@type":"Link","rel":"oauthRequestToken","uri":"https://sandboxapi.deere.com/platform/oauth/request_token"},{"@type":"Link","rel":"oauthAuthorizeRequestToken","uri":"https://my.deere.com/consentToUseOfData?oauth_token={token}"},{"@type":"Link","rel":"oauthAccessToken","uri":"https://sandboxapi.deere.com/platform/oauth/access_token"},{"@type":"Link","rel":"agencies","uri":"https://sandboxapi.deere.com/platform/agencies"}]}'
+      encoding: UTF-8
+      string: '{"issuer":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7","authorization_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/authorize","token_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/token","registration_endpoint":"https://signin.johndeere.com/oauth2/v1/clients","jwks_uri":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/keys","response_types_supported":["code","token","id_token","code
+        id_token","code token","id_token token","code id_token token"],"response_modes_supported":["query","fragment","form_post","okta_post_message"],"grant_types_supported":["authorization_code","implicit","refresh_token","password","client_credentials"],"subject_types_supported":["public"],"scopes_supported":["ag1","ag2","ag3","eq1","eq2","files","jobs","org1","org2","openid","profile","email","address","phone","offline_access"],"token_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"claims_supported":["ver","jti","iss","aud","iat","exp","cid","uid","scp","sub"],"code_challenge_methods_supported":["S256"],"introspection_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/introspect","introspection_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"revocation_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/revoke","revocation_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"end_session_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/logout","request_parameter_supported":true,"request_object_signing_alg_values_supported":["HS256","HS384","HS512","RS256","RS384","RS512","ES256","ES384","ES512"]}'
     http_version: 
-  recorded_at: Mon, 10 Feb 2020 17:28:57 GMT
+  recorded_at: Wed, 17 Mar 2021 21:38:22 GMT
 recorded_with: VCR 5.0.0

data/test/support/vcr/get_access_token.yml

@@ -2,40 +2,113 @@
 http_interactions:
 - request:
     method: get
-    uri: https://sandboxapi.deere.com/platform/oauth/access_token
+    uri: https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/.well-known/oauth-authorization-server
     body:
       encoding: US-ASCII
       string: ''
     headers:
+      User-Agent:
+      - Faraday v1.3.0
+      Accept:
+      - application/vnd.deere.axiom.v3+json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 17 Mar 2021 22:09:06 GMT
+      Server:
+      - nginx
+      Content-Type:
+      - application/json
+      X-Xss-Protection:
+      - '0'
+      P3p:
+      - CP="HONK"
+      Expect-Ct:
+      - report-uri="https://oktaexpectct.report-uri.com/r/t/ct/reportOnly", max-age=0
+      Cache-Control:
+      - max-age=86400, must-revalidate
+      Expires:
+      - Thu, 18 Mar 2021 22:08:22 GMT
+      X-Content-Type-Options:
+      - nosniff
+      Strict-Transport-Security:
+      - max-age=315360000; includeSubDomains
+      X-Okta-Request-Id:
+      - YFJ@AmsIRy8KxUkhAvDVHwAABL8
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: UTF-8
+      string: '{"issuer":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7","authorization_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/authorize","token_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/token","registration_endpoint":"https://signin.johndeere.com/oauth2/v1/clients","jwks_uri":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/keys","response_types_supported":["code","token","id_token","code
+        id_token","code token","id_token token","code id_token token"],"response_modes_supported":["query","fragment","form_post","okta_post_message"],"grant_types_supported":["authorization_code","implicit","refresh_token","password","client_credentials"],"subject_types_supported":["public"],"scopes_supported":["ag1","ag2","ag3","eq1","eq2","files","jobs","org1","org2","openid","profile","email","address","phone","offline_access"],"token_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"claims_supported":["ver","jti","iss","aud","iat","exp","cid","uid","scp","sub"],"code_challenge_methods_supported":["S256"],"introspection_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/introspect","introspection_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"revocation_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/revoke","revocation_endpoint_auth_methods_supported":["client_secret_basic","client_secret_post","client_secret_jwt","private_key_jwt","none"],"end_session_endpoint":"https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/logout","request_parameter_supported":true,"request_object_signing_alg_values_supported":["HS256","HS384","HS512","RS256","RS384","RS512","ES256","ES384","ES512"]}'
+    http_version: 
+  recorded_at: Wed, 17 Mar 2021 22:09:06 GMT
+- request:
+    method: post
+    uri: https://signin.johndeere.com/oauth2/aus78tnlaysMraFhC1t7/v1/token
+    body:
+      encoding: UTF-8
+      string: client_id=johndeere-0000000000000000000000000000000000000000&client_secret=0000000000000000000000000000000000000000000000000000000000000000&code=VERIFY&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost
+    headers:
+      User-Agent:
+      - Faraday v1.3.0
+      Content-Type:
+      - application/x-www-form-urlencoded
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
       - "*/*"
-      User-Agent:
-      - OAuth gem v0.5.4
-      Authorization:
-      - OAuth oauth_consumer_key="johndeere-0000000000000000000000000000000000000000",
-        oauth_nonce="000000000000000000000000000000000000000000", oauth_signature="0000000000000000000000000000",
-        oauth_signature_method="HMAC-SHA1", oauth_timestamp="1581334172", oauth_token="00000000-0000-0000-0000-000000000000",
-        oauth_verifier="VERIFY", oauth_version="1.0"
   response:
     status:
       code: 200
       message: OK
     headers:
       Date:
-      - Mon, 10 Feb 2020 17:29:12 GMT
+      - Wed, 17 Mar 2021 22:09:23 GMT
+      Server:
+      - nginx
       Content-Type:
-      - text/plain;charset=UTF-8
-      X-Deere-Handling-Server:
-      - ip-10-214-44-36
-      Vary:
-      - Accept-Encoding
+      - application/json
+      X-Okta-Request-Id:
+      - YFJ@E@UPsOFGB0k2w031WQAABe4
+      X-Xss-Protection:
+      - '0'
+      P3p:
+      - CP="HONK"
+      X-Rate-Limit-Limit:
+      - '2000'
+      X-Rate-Limit-Remaining:
+      - '1679'
+      X-Rate-Limit-Reset:
+      - '1581334172'
+      Cache-Control:
+      - no-cache, no-store
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
+      Expect-Ct:
+      - report-uri="https://oktaexpectct.report-uri.com/r/t/ct/reportOnly", max-age=0
+      X-Content-Type-Options:
+      - nosniff
+      Strict-Transport-Security:
+      - max-age=315360000; includeSubDomains
+      X-Robots-Tag:
+      - none
+      Set-Cookie:
+      - JSESSIONID=4252AEA3F9DE9BA07D2163E73E6DA175; Path=/; Secure; HttpOnly
+      - sid=""; Expires=Thu, 01-Jan-1970 00:00:10 GMT; Path=/
       Transfer-Encoding:
       - chunked
     body:
-      encoding: ASCII-8BIT
-      string: oauth_token=00000000-0000-0000-0000-000000000000&oauth_token_secret=000000000000000000000000000000000000000000
+      encoding: UTF-8
+      string: '{"token_type":"Bearer","expires_in":43200,"access_token":"AccessToken0123456789abcdefghijklmnopqrstuvwxyz","scope":"ag2
+        ag1 offline_access ag3","refresh_token":"RefreshToken0123456789abcdefghijklmnopqrstuvwxyz"}'
     http_version: 
-  recorded_at: Mon, 10 Feb 2020 17:29:12 GMT
+  recorded_at: Wed, 17 Mar 2021 22:09:23 GMT
 recorded_with: VCR 5.0.0