Fix account token failure on latest API version

stripe/src/main/java/com/stripe/android/ApiVersion.java

@@ -0,0 +1,56 @@
+package com.stripe.android;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.stripe.android.utils.ObjectUtils;
+
+/**
+ * A class that represents a Stripe API version.
+ *
+ * See <a href="https://stripe.com/docs/api/versioning">https://stripe.com/docs/api/versioning</a>
+ * for documentation on API versioning.
+ *
+ * See <a href="https://stripe.com/docs/upgrades">https://stripe.com/docs/upgrades</a> for latest
+ * API changes.
+ */
+public class ApiVersion {
+    static final String DEFAULT_API_VERSION = "2017-06-05";
+
+    @NonNull private static final ApiVersion DEFAULT_INSTANCE = new ApiVersion(DEFAULT_API_VERSION);
+
+    @NonNull private final String mCode;
+
+    @NonNull
+    public static ApiVersion create(@NonNull String code) {
+        return new ApiVersion(code);
+    }
+
+    @NonNull
+    public static ApiVersion getDefault() {
+        return DEFAULT_INSTANCE;
+    }
+
+    private ApiVersion(@NonNull String code) {
+        this.mCode = code;
+    }
+
+    @NonNull
+    public String getCode() {
+        return mCode;
+    }
+
+    @Override
+    public int hashCode() {
+        return ObjectUtils.hash(mCode);
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        return this == obj || (obj instanceof ApiVersion && typedEquals((ApiVersion) obj));
+    }
+
+    private boolean typedEquals(@NonNull ApiVersion apiVersion) {
+        return ObjectUtils.equals(mCode, apiVersion.mCode);
+    }
+}

stripe/src/main/java/com/stripe/android/EphemeralKeyManager.java

@@ -41,7 +41,7 @@ void retrieveEphemeralKey(@Nullable String actionString,
                 mEphemeralKey,
                 mTimeBufferInSeconds,
                 mOverrideCalendar)) {
-            mEphemeralKeyProvider.createEphemeralKey(StripeApiHandler.API_VERSION,
+            mEphemeralKeyProvider.createEphemeralKey(ApiVersion.DEFAULT_API_VERSION,
                     new ClientKeyUpdateListener(this, actionString, arguments));
         } else {
             mListener.onKeyUpdate(mEphemeralKey, actionString, arguments);

stripe/src/main/java/com/stripe/android/RequestOptions.java

@@ -94,6 +94,7 @@ public static RequestOptions.RequestOptionsBuilder builder(@Nullable String publ
         return builder(publishableApiKey, TYPE_QUERY);
     }
 
+    @NonNull
     public static RequestOptions.RequestOptionsBuilder builder(
             @Nullable String publishableApiKey,
             @Nullable String stripeAccount,
@@ -193,6 +194,14 @@ RequestOptionsBuilder setApiVersion(@Nullable String apiVersion) {
             return this;
         }
 
+        /**
+         * Convenience method for {@link #setApiVersion(String)}
+         */
+        @NonNull
+        RequestOptionsBuilder setApiVersion(@Nullable ApiVersion apiVersion) {
+            return setApiVersion(apiVersion != null ? apiVersion.getCode() : null);
+        }
+
         @NonNull
         RequestOptionsBuilder setStripeAccount(@Nullable String stripeAccount) {
             this.stripeAccount = stripeAccount;

stripe/src/main/java/com/stripe/android/Stripe.java

@@ -684,12 +684,26 @@ public Token createCvcUpdateTokenSynchronous(@NonNull String cvc,
      * @throws APIException any other type of problem (for instance, a temporary issue with
      * Stripe's servers)
      */
+    @Nullable
     public Token createAccountTokenSynchronous(@NonNull final AccountParams accountParams)
             throws AuthenticationException,
             InvalidRequestException,
             APIConnectionException,
             APIException {
-        return createAccountTokenSynchronous(accountParams, mDefaultPublishableKey);
+        return createAccountTokenSynchronous(accountParams, mDefaultPublishableKey, null);
+    }
+
+    /**
+     * See {@link #createAccountTokenSynchronous(AccountParams)}
+     */
+    @Nullable
+    public Token createAccountTokenSynchronous(@NonNull final AccountParams accountParams,
+                                               @NonNull final ApiVersion apiVersion)
+            throws AuthenticationException,
+            InvalidRequestException,
+            APIConnectionException,
+            APIException {
+        return createAccountTokenSynchronous(accountParams, mDefaultPublishableKey, apiVersion);
     }
 
     /**
@@ -707,9 +721,11 @@ public Token createAccountTokenSynchronous(@NonNull final AccountParams accountP
      * @throws APIException any other type of problem (for instance, a temporary issue with
      * Stripe's servers)
      */
+    @Nullable
     public Token createAccountTokenSynchronous(
             @NonNull final AccountParams accountParams,
-            @Nullable String publishableKey)
+            @Nullable String publishableKey,
+            @Nullable ApiVersion apiVersion)
             throws AuthenticationException,
             InvalidRequestException,
             APIConnectionException,
@@ -720,9 +736,9 @@ public Token createAccountTokenSynchronous(
         }
         validateKey(publishableKey);
         RequestOptions requestOptions = RequestOptions.builder(
-                publishableKey,
-                mStripeAccount,
-                RequestOptions.TYPE_QUERY).build();
+                publishableKey, mStripeAccount, RequestOptions.TYPE_QUERY)
+                .setApiVersion(apiVersion)
+                .build();
         try {
             return StripeApiHandler.createToken(
                     mContext,

stripe/src/main/java/com/stripe/android/StripeApiHandler.java

@@ -78,8 +78,6 @@ class StripeApiHandler {
     private static final String DNS_CACHE_TTL_PROPERTY_NAME = "networkaddress.cache.ttl";
     private static final SSLSocketFactory SSL_SOCKET_FACTORY = new StripeSSLSocketFactory();
 
-    static final String API_VERSION = "2017-06-05";
-
     static void logApiCall(
             @NonNull Map<String, Object> loggingMap,
             @NonNull RequestOptions options,
@@ -127,7 +125,7 @@ static PaymentIntent confirmPaymentIntent(
                 publishableKey,
                 stripeAccount,
                 RequestOptions.TYPE_QUERY)
-                .setApiVersion(API_VERSION)
+                .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
                 .build();
 
         try {
@@ -179,7 +177,7 @@ static PaymentIntent retrievePaymentIntent(
                 publishableKey,
                 stripeAccount,
                 RequestOptions.TYPE_QUERY)
-                .setApiVersion(API_VERSION)
+                .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
                 .build();
 
         try {
@@ -457,16 +455,19 @@ static Source addCustomerSource(
                     context, productUsageTokens, publicKey, sourceType);
 
             // We use the public key to log, so we need different RequestOptions.
-            final RequestOptions loggingOptions =
-                    RequestOptions.builder(publicKey).setApiVersion(API_VERSION).build();
+            final RequestOptions loggingOptions = RequestOptions.builder(publicKey)
+                    .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                    .build();
             logApiCall(loggingParamsMap, loggingOptions, listener);
         }
 
         final StripeResponse response = getStripeResponse(
                 POST,
                 getAddCustomerSourceUrl(customerId),
                 paramsMap,
-                RequestOptions.builder(secret).setApiVersion(API_VERSION).build());
+                RequestOptions.builder(secret)
+                        .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                        .build());
         // Method throws if errors are found, so no return value occurs.
         convertErrorsToExceptionsAndThrowIfNecessary(response);
         return Source.fromString(response.getResponseBody());
@@ -492,16 +493,19 @@ static Source deleteCustomerSource(
                     LoggingUtils.getDeleteSourceParams(context, productUsageTokens, publicKey);
 
             // We use the public key to log, so we need different RequestOptions.
-            final RequestOptions loggingOptions =
-                    RequestOptions.builder(publicKey).setApiVersion(API_VERSION).build();
+            final RequestOptions loggingOptions = RequestOptions.builder(publicKey)
+                    .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                    .build();
             logApiCall(loggingParamsMap, loggingOptions, listener);
         }
 
         final StripeResponse response = getStripeResponse(
                 DELETE,
                 getDeleteCustomerSourceUrl(customerId, sourceId),
                 paramsMap,
-                RequestOptions.builder(secret).setApiVersion(API_VERSION).build());
+                RequestOptions.builder(secret)
+                        .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                        .build());
         // Method throws if errors are found, so no return value occurs.
         convertErrorsToExceptionsAndThrowIfNecessary(response);
         return Source.fromString(response.getResponseBody());
@@ -528,7 +532,7 @@ static Customer setDefaultCustomerSource(
         // Context can be nullable because this action is performed with only a weak reference
         if (context != null) {
             final RequestOptions loggingOptions = RequestOptions.builder(publicKey)
-                    .setApiVersion(API_VERSION)
+                    .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
                     .build();
 
             final Map<String, Object> loggingParameters = LoggingUtils.getEventLoggingParams(
@@ -546,7 +550,9 @@ static Customer setDefaultCustomerSource(
                 POST,
                 getRetrieveCustomerUrl(customerId),
                 paramsMap,
-                RequestOptions.builder(secret).setApiVersion(API_VERSION).build());
+                RequestOptions.builder(secret)
+                        .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                        .build());
 
         // Method throws if errors are found, so no return value occurs.
         convertErrorsToExceptionsAndThrowIfNecessary(response);
@@ -573,7 +579,7 @@ static Customer setCustomerShippingInfo(
         // Context can be nullable because this action is performed with only a weak reference
         if (context != null) {
             final RequestOptions loggingOptions = RequestOptions.builder(publicKey)
-                    .setApiVersion(API_VERSION)
+                    .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
                     .build();
 
             final Map<String, Object> loggingParameters = LoggingUtils.getEventLoggingParams(
@@ -591,7 +597,9 @@ static Customer setCustomerShippingInfo(
                 POST,
                 getRetrieveCustomerUrl(customerId),
                 paramsMap,
-                RequestOptions.builder(secret).setApiVersion(API_VERSION).build());
+                RequestOptions.builder(secret)
+                        .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                        .build());
         // Method throws if errors are found, so no return value occurs.
         convertErrorsToExceptionsAndThrowIfNecessary(response);
         return Customer.fromString(response.getResponseBody());
@@ -609,7 +617,9 @@ static Customer retrieveCustomer(@NonNull String customerId, @NonNull String sec
                 GET,
                 getRetrieveCustomerUrl(customerId),
                 null,
-                RequestOptions.builder(secret).setApiVersion(API_VERSION).build());
+                RequestOptions.builder(secret)
+                        .setApiVersion(ApiVersion.DEFAULT_API_VERSION)
+                        .build());
         convertErrorsToExceptionsAndThrowIfNecessary(response);
         return Customer.fromString(response.getResponseBody());
     }