Throw Auth0Exception when failure occurs during retries (#495)

Author: jimmyjames

src/main/java/com/auth0/net/RateLimitInterceptor.java

@@ -1,7 +1,9 @@
 package com.auth0.net;
 
+import com.auth0.exception.Auth0Exception;
 import com.auth0.net.client.DefaultHttpClient;
 import net.jodah.failsafe.Failsafe;
+import net.jodah.failsafe.FailsafeException;
 import net.jodah.failsafe.RetryPolicy;
 import net.jodah.failsafe.event.ExecutionAttemptedEvent;
 import net.jodah.failsafe.function.CheckedConsumer;
@@ -78,6 +80,12 @@ public Response intercept(@NotNull Chain chain) throws IOException {
             retryPolicy.onRetry(retryListener);
         }
 
-        return Failsafe.with(retryPolicy).get(() -> chain.proceed(chain.request()));
+        try {
+            // throw Auth0Exception instead of FailSafe exception on error
+            // see https://github.com/auth0/auth0-java/issues/483
+            return Failsafe.with(retryPolicy).get(() -> chain.proceed(chain.request()));
+        } catch (FailsafeException fe) {
+            throw new Auth0Exception("Failed to execute request", fe.getCause());
+        }
     }
 }

src/test/java/com/auth0/net/RateLimitInterceptorTest.java

@@ -1,22 +1,26 @@
 package com.auth0.net;
 
+import com.auth0.exception.Auth0Exception;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
+import okhttp3.mockwebserver.SocketPolicy;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertThrows;
 
 public class RateLimitInterceptorTest {
 
@@ -175,4 +179,21 @@ public void shouldBackOffOnRetries()  throws Exception {
         assertThat(retryTimings.get(5), greaterThan(retryTimings.get(2)));
     }
 
+    @Test
+    public void shouldThrowAuth0Exception() {
+        OkHttpClient client = new OkHttpClient.Builder()
+            .addInterceptor(new RateLimitInterceptor(3))
+            .readTimeout(Duration.ofSeconds(1))
+            .build();
+
+        server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.NO_RESPONSE));
+
+        okhttp3.Request request = new Request.Builder()
+            .get()
+            .url(server.url("/"))
+            .build();
+
+        Auth0Exception e = assertThrows(Auth0Exception.class, () -> client.newCall(request).execute());
+        assertThat(e.getMessage(), is("Failed to execute request"));
+    }
 }