Merge pull request #348 from EasyPost/amazon_account

amazon account

Author: Justintime50

CHANGELOG.md

@@ -9,6 +9,7 @@
   - `referralCustomer.addCreditCardFromStripe`
   - `referralCustomer.addBankAccountFromStripe`
 - Adds `tracking_codes` param to tracker index endpoint
+- Routes `AmazonShippingAccount` to the correct endpoint
 - Fixes error parsing
   - Allows for alternative format of `errors` field (previously we deserialized the `errors` field into a list of `Error` objects; however, sometimes the errors are simply a list of strings. This change make the `errors` field a list of `Object` allowing for either the new `FieldError` object or a list of strings. Users will need to check for the type of error returned and handle appropriately)
   - Removed the unused `Error` model

Makefile

@@ -12,7 +12,7 @@ clean:
 
 ## coverage - Test (and build) the project to generate a coverage report
 coverage:
-	mvn verify -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true jacoco:report
+	mvn test -Dgpg.skip=true -Dcheckstyle.skip=true -Ddependency-check.skip=true -Djavadoc.skip=true jacoco:report
 
 ## checkstyle - Check if project follows CheckStyle rules (must run install-checkstyle first)
 checkstyle:

src/main/java/com/easypost/Constants.java

@@ -61,13 +61,17 @@ public abstract static class ErrorCodes {
     }
 
     public abstract static class CarrierAccountTypes {
-        public static final List<String> CARRIER_TYPES_WITH_CUSTOM_WORKFLOW = ImmutableList.of("FedexAccount",
-                "FedexSmartpostAccount");
-    }
+        public static final List<String> CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_WORKFLOW = ImmutableList.of(
+            "FedexAccount", "FedexSmartpostAccount"
+        );
+
+        public static final List<String> UPS_OAUTH_CARRIER_ACCOUNT_TYPES = ImmutableList.of(
+            "UpsAccount", "UpsMailInnovationsAccount", "UpsSurepostAccount"
+        );
 
-    public abstract static class UpsAccountTypes {
-        public static final List<String> UPS_OAUTH_CARRIER_ACCOUNT_TYPES = ImmutableList.of("UpsAccount",
-                "UpsMailInnovationsAccount", "UpsSurepostAccount");
+        public static final List<String> CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH = ImmutableList.of(
+            "AmazonShippingAccount"
+        );
     }
 
     public abstract static class Http {

src/main/java/com/easypost/service/CarrierAccountService.java

@@ -93,7 +93,7 @@ public CarrierAccount update(String id, final Map<String, Object> params) throws
         Map<String, Object> wrappedParams = new HashMap<String, Object>();
         wrappedParams.put(selectTopLayerKey(type), params);
 
-        String endpoint = (Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(type) 
+        String endpoint = (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(type) 
                   ? "ups_oauth_registrations/"
                   : "carrier_accounts/") + id;
 
@@ -121,10 +121,12 @@ public void delete(String id) throws EasyPostException {
      * @return The endpoint for the carrier account creation request.
      */
     private static String selectCarrierAccountCreationEndpoint(final String carrierAccountType) {
-        if (Constants.CarrierAccountTypes.CARRIER_TYPES_WITH_CUSTOM_WORKFLOW.contains(carrierAccountType)) {
+        if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_WORKFLOW.contains(carrierAccountType)) {
             return "carrier_accounts/register";
-        } else if (Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
+        } else if (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
             return "ups_oauth_registrations";
+        } else if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH.contains(carrierAccountType)) {
+            return "carrier_accounts/register_oauth";
         } else {
             return "carrier_accounts";
         }
@@ -136,15 +138,20 @@ private static String selectCarrierAccountCreationEndpoint(final String carrierA
      *
      * @param carrierAccountType The type of carrier account to create.
      * @return The top-layer key for the carrier account creation/update request.
+     * @throws MissingParameterError when the request fails.
      */
-    private static String selectTopLayerKey(final String carrierAccountType) throws EasyPostException {
+    private static String selectTopLayerKey(final String carrierAccountType) throws MissingParameterError {
         if (carrierAccountType == null) {
             throw new MissingParameterError(
                     String.format(Constants.ErrorMessages.MISSING_REQUIRED_PARAMETER, "carrier account type"));
         }
 
-        return Constants.UpsAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)
-            ? "ups_oauth_registrations"
-            : "carrier_account";
+        if (Constants.CarrierAccountTypes.UPS_OAUTH_CARRIER_ACCOUNT_TYPES.contains(carrierAccountType)) {
+            return "ups_oauth_registrations";
+        } else if (Constants.CarrierAccountTypes.CARRIER_ACCOUNT_TYPES_WITH_CUSTOM_OAUTH.contains(carrierAccountType)) {
+            return "carrier_account_oauth_registrations";
+        } else {
+            return "carrier_account";
+        }
     }
 }