diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4140753..d48b6378 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# CHANGELOG
+## Next Release
+
+- Routes `AmazonShippingAccount` create/update requests to the new `/register_oauth` endpoint
+
## v9.5.0 (2024-10-24)
- Adds `tracking_codes` as a parameter of the `all` method on the TrackerService
diff --git a/easypost/constant.py b/easypost/constant.py
index 9659e779..066a239a 100644
--- a/easypost/constant.py
+++ b/easypost/constant.py
@@ -36,6 +36,9 @@
"FedexAccount",
"FedexSmartpostAccount",
]
+_CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH = [
+ "AmazonShippingAccount",
+]
_UPS_OAUTH_CARRIER_ACCOUNT_TYPES = [
"UpsAccount",
"UpsMailInnovationsAccount",
diff --git a/easypost/services/carrier_account_service.py b/easypost/services/carrier_account_service.py
index 53d3cead..720dd747 100644
--- a/easypost/services/carrier_account_service.py
+++ b/easypost/services/carrier_account_service.py
@@ -6,6 +6,7 @@
)
from easypost.constant import (
+ _CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH,
_CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_WORKFLOWS,
_UPS_OAUTH_CARRIER_ACCOUNT_TYPES,
MISSING_PARAMETER_ERROR,
@@ -35,6 +36,8 @@ def create(self, **params) -> CarrierAccount:
url = self._select_carrier_account_creation_endpoint(carrier_account_type=carrier_account_type)
if carrier_account_type in _UPS_OAUTH_CARRIER_ACCOUNT_TYPES:
wrapped_params = {"ups_oauth_registrations": params}
+ elif carrier_account_type in _CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH:
+ wrapped_params = {"carrier_account_oauth_registrations": params}
else:
wrapped_params = {self._snakecase_name(self._model_class): params}
@@ -56,6 +59,13 @@ def update(self, id: str, **params) -> CarrierAccount:
if carrier_account.get("type") in _UPS_OAUTH_CARRIER_ACCOUNT_TYPES:
class_name = "UpsOauthRegistrations"
+ elif carrier_account.get("type") in _CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH:
+ response = Requestor(self._client).request(
+ method=RequestMethod.PATCH,
+ url=f"/carrier_accounts/register_oauth/{id}",
+ params={"carrier_account_oauth_registrations": params},
+ )
+ return convert_to_easypost_object(response=response)
else:
class_name = self._model_class
@@ -77,5 +87,7 @@ def _select_carrier_account_creation_endpoint(self, carrier_account_type: Option
return "/carrier_accounts/register"
elif carrier_account_type in _UPS_OAUTH_CARRIER_ACCOUNT_TYPES:
return "/ups_oauth_registrations"
+ elif carrier_account_type in _CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH:
+ return "/carrier_accounts/register_oauth"
return "/carrier_accounts"
diff --git a/tests/cassettes/test_carrier_account_create_amazon_shipping.yaml b/tests/cassettes/test_carrier_account_create_amazon_shipping.yaml
new file mode 100644
index 00000000..3a3ca1e6
--- /dev/null
+++ b/tests/cassettes/test_carrier_account_create_amazon_shipping.yaml
@@ -0,0 +1,137 @@
+interactions:
+- request:
+ body: '{"carrier_account_oauth_registrations": {"type": "AmazonShippingAccount",
+ "selling_partner_id": 123456, "description": "Test Amazon Shipping Account",
+ "reference": "Test reference id"}}'
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ Content-Length:
+ - '185'
+ Content-Type:
+ - application/json
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: POST
+ uri: https://api.easypost.com/v2/carrier_accounts/register_oauth
+ response:
+ body:
+ string: '{"id": "ca_42645bd4efec44d19990311923247889", "object": "CarrierAccount",
+ "type": "AmazonShippingAccount", "clone": false, "created_at": "2024-10-21T17:29:15Z",
+ "updated_at": "2024-10-21T17:29:15Z", "description": "Test Amazon Shipping
+ Account", "reference": "Test reference id", "billing_type": "carrier", "readable":
+ "Amazon Shipping", "logo": null, "fields": [], "credentials": {}, "test_credentials":
+ {}}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '1477'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - 5b98ae6c67168f6be786a35a006ad145
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb36nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb4nuq b6e1b5034c
+ - extlb1nuq 99aac35317
+ x-runtime:
+ - '0.111175'
+ x-version-label:
+ - easypost-202410211500-2da9256a8e-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 201
+ message: Created
+- request:
+ body: null
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ Content-Length:
+ - '0'
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: DELETE
+ uri: https://api.easypost.com/v2/carrier_accounts/ca_42645bd4efec44d19990311923247889
+ response:
+ body:
+ string: '{}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '2'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - 5b98ae6c67168f6be786a35a006ad17a
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb36nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb3nuq b6e1b5034c
+ - extlb1nuq 99aac35317
+ x-runtime:
+ - '0.061416'
+ x-version-label:
+ - easypost-202410211500-2da9256a8e-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 200
+ message: OK
+version: 1
diff --git a/tests/cassettes/test_carrier_account_update_amazon_shipping.yaml b/tests/cassettes/test_carrier_account_update_amazon_shipping.yaml
new file mode 100644
index 00000000..f7ba2959
--- /dev/null
+++ b/tests/cassettes/test_carrier_account_update_amazon_shipping.yaml
@@ -0,0 +1,271 @@
+interactions:
+- request:
+ body: '{"carrier_account_oauth_registrations": {"type": "AmazonShippingAccount"}}'
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ Content-Length:
+ - '74'
+ Content-Type:
+ - application/json
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: POST
+ uri: https://api.easypost.com/v2/carrier_accounts/register_oauth
+ response:
+ body:
+ string: '{"id": "ca_e875ee2e98ac4c0c8d1d8f5b43aac959", "object": "CarrierAccount",
+ "type": "AmazonShippingAccount", "clone": false, "created_at": "2024-12-16T22:02:20Z",
+ "updated_at": "2024-12-16T22:02:20Z", "description": null, "reference": null,
+ "billing_type": "carrier", "readable": "Amazon Shipping", "logo": null, "fields":
+ [], "credentials": {}, "test_credentials": {}}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '1420'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - ead55e6f6760a36ce786c93e005b6c1f
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb35nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb4nuq 51d74985a2
+ - extlb2nuq 99aac35317
+ x-runtime:
+ - '0.081789'
+ x-version-label:
+ - easypost-202412120021-b747238cc5-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 201
+ message: Created
+- request:
+ body: null
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: GET
+ uri: https://api.easypost.com/v2/carrier_accounts/ca_e875ee2e98ac4c0c8d1d8f5b43aac959
+ response:
+ body:
+ string: '{"id": "ca_e875ee2e98ac4c0c8d1d8f5b43aac959", "object": "CarrierAccount",
+ "type": "AmazonShippingAccount", "clone": false, "created_at": "2024-12-16T22:02:20Z",
+ "updated_at": "2024-12-16T22:02:20Z", "description": null, "reference": null,
+ "billing_type": "carrier", "readable": "Amazon Shipping", "logo": null, "fields":
+ [], "credentials": {}, "test_credentials": {}}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '1420'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-canary:
+ - direct
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - ead55e6f6760a36ce786c93e005b6c7c
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb32nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb4nuq 51d74985a2
+ - extlb2nuq 99aac35317
+ x-runtime:
+ - '0.038244'
+ x-version-label:
+ - easypost-202412120021-b747238cc5-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 200
+ message: OK
+- request:
+ body: '{"carrier_account_oauth_registrations": {"description": "test description",
+ "reference": "test reference"}}'
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ Content-Length:
+ - '107'
+ Content-Type:
+ - application/json
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: PATCH
+ uri: https://api.easypost.com/v2/carrier_accounts/register_oauth/ca_e875ee2e98ac4c0c8d1d8f5b43aac959
+ response:
+ body:
+ string: '{"id": "ca_e875ee2e98ac4c0c8d1d8f5b43aac959", "object": "CarrierAccount",
+ "type": "AmazonShippingAccount", "clone": false, "created_at": "2024-12-16T22:02:20Z",
+ "updated_at": "2024-12-16T22:02:21Z", "description": null, "reference": null,
+ "billing_type": "carrier", "readable": "Amazon Shipping", "logo": null, "fields":
+ [], "credentials": {}, "test_credentials": {}}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '1452'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - ead55e6f6760a36de786c93e005b6cc6
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb39nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb4nuq 51d74985a2
+ - extlb2nuq 99aac35317
+ x-runtime:
+ - '0.062129'
+ x-version-label:
+ - easypost-202412120021-b747238cc5-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 200
+ message: OK
+- request:
+ body: null
+ headers:
+ Accept:
+ - '*/*'
+ Accept-Encoding:
+ - gzip, deflate
+ Connection:
+ - keep-alive
+ Content-Length:
+ - '0'
+ authorization:
+ - <REDACTED>
+ user-agent:
+ - <REDACTED>
+ method: DELETE
+ uri: https://api.easypost.com/v2/carrier_accounts/ca_e875ee2e98ac4c0c8d1d8f5b43aac959
+ response:
+ body:
+ string: '{}'
+ headers:
+ cache-control:
+ - private, no-cache, no-store
+ content-length:
+ - '2'
+ content-type:
+ - application/json; charset=utf-8
+ expires:
+ - '0'
+ pragma:
+ - no-cache
+ referrer-policy:
+ - strict-origin-when-cross-origin
+ strict-transport-security:
+ - max-age=31536000; includeSubDomains; preload
+ transfer-encoding:
+ - chunked
+ x-backend:
+ - easypost
+ x-content-type-options:
+ - nosniff
+ x-download-options:
+ - noopen
+ x-ep-request-uuid:
+ - ead55e6f6760a36de786c93e005b6d26
+ x-frame-options:
+ - SAMEORIGIN
+ x-node:
+ - bigweb55nuq
+ x-permitted-cross-domain-policies:
+ - none
+ x-proxied:
+ - intlb4nuq 51d74985a2
+ - extlb2nuq 99aac35317
+ x-runtime:
+ - '0.103086'
+ x-version-label:
+ - easypost-202412120021-b747238cc5-master
+ x-xss-protection:
+ - 1; mode=block
+ status:
+ code: 200
+ message: OK
+version: 1
diff --git a/tests/test_carrier_account.py b/tests/test_carrier_account.py
index 72e1a698..a7e73d89 100644
--- a/tests/test_carrier_account.py
+++ b/tests/test_carrier_account.py
@@ -131,3 +131,47 @@ def test_carrier_account_update_ups(prod_client):
prod_client.carrier_account.delete(
updated_carrier_account.id
) # Delete the carrier account once it's done being tested.
+
+
+@pytest.mark.vcr()
+def test_carrier_account_create_amazon_shipping(prod_client):
+ """Test registering an Amazon Shipping Carrier Account which uses a different URL and schema."""
+ params = {
+ "type": "AmazonShippingAccount",
+ "selling_partner_id": 123456,
+ "description": "Test Amazon Shipping Account",
+ "reference": "Test reference id",
+ }
+
+ carrier_account = prod_client.carrier_account.create(**params)
+
+ assert isinstance(carrier_account, CarrierAccount)
+ assert str.startswith(carrier_account.id, "ca_")
+ assert carrier_account.type == "AmazonShippingAccount"
+
+ prod_client.carrier_account.delete(carrier_account.id) # Delete the carrier account once it's done being tested.
+
+
+@pytest.mark.vcr()
+def test_carrier_account_update_amazon_shipping(prod_client):
+ """Test updating an Amazon Shipping Carrier Account which uses a different URL and schema."""
+ params = {
+ "type": "AmazonShippingAccount",
+ }
+
+ amazon_shipping_account = prod_client.carrier_account.create(**params)
+
+ # TODO: Re-record this cassettes and add two assertions for description
+ # and reference when we made the changes in API level for update endpoint
+ updated_amazon_shipping_account = prod_client.carrier_account.update(
+ amazon_shipping_account.id,
+ description="test description",
+ reference="test reference",
+ )
+
+ assert isinstance(updated_amazon_shipping_account, CarrierAccount)
+ assert str.startswith(updated_amazon_shipping_account.id, "ca_")
+
+ prod_client.carrier_account.delete(
+ amazon_shipping_account.id
+ ) # Delete the carrier account once it's done being tested.