#241: catch FinapiAuthenticationException (#360)

ccostin93 · web-flow · commit e02c2bd4cdfc · 2021-02-21T23:54:48.000+01:00
diff --git a/src/main/java/org/proshin/finapi/endpoint/FpEndpoint.java b/src/main/java/org/proshin/finapi/endpoint/FpEndpoint.java
@@ -43,6 +43,7 @@
 import org.cactoos.text.UncheckedText;
 import org.proshin.finapi.Jsonable;
 import org.proshin.finapi.accesstoken.AccessToken;
+import org.proshin.finapi.exception.FinapiAuthenticationException;
 import org.proshin.finapi.exception.FinapiException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,19 +72,8 @@ public String get(final String path, final AccessToken token, final Iterable<Nam
             builder.setParameters(new ListOf<>(parameters));
             final HttpUriRequest get = new HttpGet(builder.build());
             get.addHeader(new AuthorizationHeader(token.accessToken()));
-            final HttpResponse response = this.client.execute(get);
-            if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-                throw new FinapiException(HttpStatus.SC_OK, response);
-            }
-            final String responseBody = new UncheckedText(
-                new TextOf(
-                    new InputOf(response.getEntity().getContent()),
-                    StandardCharsets.UTF_8
-                )
-            ).asString();
-            LOGGER.info("Response body was: {}", responseBody);
-            return responseBody;
-        } catch (final IOException | URISyntaxException e) {
+            return this.execute(get);
+        } catch (final URISyntaxException e) {
             throw new RuntimeException(
                 new UncheckedText(
                     new FormattedText(
@@ -103,19 +93,8 @@ public String delete(final String path, final AccessToken token, final Iterable<
             builder.setParameters(new ListOf<>(parameters));
             final HttpUriRequest delete = new HttpDelete(builder.build());
             delete.addHeader(new AuthorizationHeader(token.accessToken()));
-            final HttpResponse response = this.client.execute(delete);
-            if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-                throw new FinapiException(HttpStatus.SC_OK, response);
-            }
-            final String responseBody = new UncheckedText(
-                new TextOf(
-                    new InputOf(response.getEntity().getContent()),
-                    StandardCharsets.UTF_8
-                )
-            ).asString();
-            LOGGER.info("Response body was: {}", responseBody);
-            return responseBody;
-        } catch (final IOException | URISyntaxException e) {
+            return this.execute(delete);
+        } catch (final URISyntaxException e) {
             throw new IllegalStateException(
                 new UncheckedText(
                     new FormattedText(
@@ -142,29 +121,9 @@ public HttpPost post(final String path) {
      */
     @Override
     public String post(final String path, final HttpEntity entity, final int expected) {
-        try {
-            final HttpPost post = new HttpPost(this.endpoint + path);
-            post.setEntity(entity);
-            final HttpResponse response = this.client.execute(post);
-            if (response.getStatusLine().getStatusCode() != expected) {
-                throw new FinapiException(expected, response);
-            }
-            return new UncheckedText(
-                new TextOf(
-                    new InputOf(response.getEntity().getContent()),
-                    StandardCharsets.UTF_8
-                )
-            ).asString();
-        } catch (final IOException e) {
-            throw new IllegalStateException(
-                new UncheckedText(
-                    new FormattedText(
-                        "Couldn't post to '%s'",
-                        path
-                    )
-                ).asString()
-            );
-        }
+        final HttpPost post = new HttpPost(this.endpoint + path);
+        post.setEntity(entity);
+        return this.execute(post, expected);
     }
 
     @Override
@@ -176,67 +135,50 @@ public HttpPost post(final String path, final AccessToken token) {
 
     @Override
     public String post(final String path, final AccessToken token, final int expected) {
-        try {
-            final HttpUriRequest post = new HttpPost(this.endpoint + path);
-            post.addHeader(new AuthorizationHeader(token.accessToken()));
-            final HttpResponse response = this.client.execute(post);
-            if (response.getStatusLine().getStatusCode() != expected) {
-                throw new FinapiException(expected, response);
-            }
-            return new UncheckedText(
-                new TextOf(
-                    new InputOf(response.getEntity().getContent()),
-                    StandardCharsets.UTF_8
-                )
-            ).asString();
-        } catch (final IOException e) {
-            throw new IllegalStateException(
-                new UncheckedText(
-                    new FormattedText(
-                        "Couldn't post to '%s'",
-                        path
-                    )
-                ).asString()
-            );
-        }
+        final HttpUriRequest post = new HttpPost(this.endpoint + path);
+        post.addHeader(new AuthorizationHeader(token.accessToken()));
+        return this.execute(post, expected);
     }
 
     @Override
     public String post(final String path, final AccessToken token, final HttpEntity entity, final int expected) {
-        try {
-            final HttpPost post = new HttpPost(this.endpoint + path);
-            post.addHeader(new AuthorizationHeader(token.accessToken()));
-            post.setEntity(entity);
-            final HttpResponse response = this.client.execute(post);
-            if (response.getStatusLine().getStatusCode() != expected) {
-                throw new FinapiException(expected, response);
-            }
-            return new UncheckedText(
-                new TextOf(
-                    new InputOf(response.getEntity().getContent()),
-                    StandardCharsets.UTF_8
-                )
-            ).asString();
-        } catch (final IOException e) {
-            throw new IllegalStateException(
-                new UncheckedText(
-                    new FormattedText(
-                        "Couldn't post to '%s'",
-                        path
-                    )
-                ).asString()
-            );
-        }
+        final HttpPost post = new HttpPost(this.endpoint + path);
+        post.addHeader(new AuthorizationHeader(token.accessToken()));
+        post.setEntity(entity);
+        return this.execute(post, expected);
     }
 
     @Override
     public String patch(final String path, final AccessToken token, final HttpEntity entity, final int expected) {
+        final HttpPatch patch = new HttpPatch(this.endpoint + path);
+        patch.addHeader(new AuthorizationHeader(token.accessToken()));
+        patch.setEntity(entity);
+        return this.execute(patch, expected);
+    }
+
+    @Override
+    public String patch(final String path, final AccessToken token, final Jsonable body) {
+        return this.patch(
+            path, token,
+            new StringEntity(
+                body.asString(),
+                ContentType.APPLICATION_JSON
+            ),
+            HttpStatus.SC_OK
+        );
+    }
+
+    private String execute(final HttpUriRequest request) {
+        return this.execute(request, HttpStatus.SC_OK);
+    }
+
+    private String execute(final HttpUriRequest request, final int expected) {
         try {
-            final HttpPatch patch = new HttpPatch(this.endpoint + path);
-            patch.addHeader(new AuthorizationHeader(token.accessToken()));
-            patch.setEntity(entity);
-            final HttpResponse response = this.client.execute(patch);
-            if (response.getStatusLine().getStatusCode() != expected) {
+            final HttpResponse response = this.client.execute(request);
+            final int statusCode = response.getStatusLine().getStatusCode();
+            if (statusCode == HttpStatus.SC_UNAUTHORIZED) {
+                throw new FinapiAuthenticationException(response);
+            } else if (statusCode != expected) {
                 throw new FinapiException(expected, response);
             }
             return new UncheckedText(
@@ -246,29 +188,18 @@ public String patch(final String path, final AccessToken token, final HttpEntity
                 )
             ).asString();
         } catch (final IOException e) {
-            throw new IllegalStateException(
+            throw new RuntimeException(
                 new UncheckedText(
                     new FormattedText(
-                        "Couldn't post to '%s'",
-                        path
+                        "Couldn't get '%s'",
+                        request.getURI()
                     )
-                ).asString()
+                ).asString(),
+                e
             );
         }
     }
 
-    @Override
-    public String patch(final String path, final AccessToken token, final Jsonable body) {
-        return this.patch(
-            path, token,
-            new StringEntity(
-                body.asString(),
-                ContentType.APPLICATION_JSON
-            ),
-            HttpStatus.SC_OK
-        );
-    }
-
     @SuppressWarnings("staticfree")
     private static final class AuthorizationHeader implements Header {
 
diff --git a/src/main/java/org/proshin/finapi/exception/FinapiAuthenticationException.java b/src/main/java/org/proshin/finapi/exception/FinapiAuthenticationException.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2018 Roman Proshin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.proshin.finapi.exception;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Supplier;
+import org.apache.http.HttpResponse;
+import org.cactoos.io.InputOf;
+import org.cactoos.text.TextOf;
+import org.cactoos.text.UncheckedText;
+import org.json.JSONObject;
+
+public final class FinapiAuthenticationException extends RuntimeException {
+
+    @SuppressWarnings("staticfree")
+    private static final long serialVersionUID = -2536176269994901299L;
+
+    @SuppressWarnings("TransientFieldNotInitialized")
+    private final transient String requestId;
+
+    @SuppressWarnings("nullfree")
+    public FinapiAuthenticationException(final HttpResponse response) {
+        this(
+            ((Supplier<String>) () -> {
+                try {
+                    final JSONObject jsonObject = new JSONObject(
+                        new UncheckedText(
+                            new TextOf(
+                                new InputOf(response.getEntity().getContent()),
+                                StandardCharsets.UTF_8
+                            )
+                        ).asString()
+                    );
+                    return String.format("%s: %s",
+                        jsonObject.getString("error"), jsonObject.getString("error_description")
+                    );
+                } catch (final IOException e) {
+                    throw new RuntimeException("Couldn't read the response body", e);
+                }
+            }
+            ).get(),
+            response.getFirstHeader("X-Request-Id").getValue()
+        );
+    }
+
+    public FinapiAuthenticationException(final String message, final String requestId) {
+        super(message);
+        this.requestId = requestId;
+    }
+
+    public String requestId() {
+        return this.requestId;
+    }
+}
diff --git a/src/main/java/org/proshin/finapi/exception/FinapiException.java b/src/main/java/org/proshin/finapi/exception/FinapiException.java
@@ -36,6 +36,8 @@ public final class FinapiException extends RuntimeException {
 
     @SuppressWarnings("TransientFieldNotInitialized")
     private final transient JSONObject origin;
+    @SuppressWarnings("TransientFieldNotInitialized")
+    private final transient String requestId;
     @SuppressWarnings({"TransientFieldNotInitialized", "OptionalUsedAsFieldOrParameterType"})
     private final transient Optional<String> location;
 
@@ -61,15 +63,22 @@ public FinapiException(final int expected, final HttpResponse response) {
                 }
             }
             ).get(),
+            response.getFirstHeader("X-Request-Id").getValue(),
             Optional.ofNullable(response.getFirstHeader("Location"))
                 .map(NameValuePair::getValue)
                 .orElse(null)
         );
     }
 
-    public FinapiException(final String message, final JSONObject origin, final String location) {
+    public FinapiException(
+        final String message,
+        final JSONObject origin,
+        final String requestId,
+        final String location) {
+
         super(message);
         this.origin = origin;
+        this.requestId = requestId;
         this.location = Optional.ofNullable(location);
     }
 
@@ -85,7 +94,7 @@ public OffsetDateTime date() {
     }
 
     public String requestId() {
-        return this.origin.getString("requestId");
+        return this.requestId;
     }
 
     public String endpoint() {
diff --git a/src/test/java/org/proshin/finapi/endpoint/FpEndpointTest.java b/src/test/java/org/proshin/finapi/endpoint/FpEndpointTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2019 Roman Proshin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.proshin.finapi.endpoint;
+
+import org.apache.http.HttpStatus;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import static org.assertj.core.api.Assertions.fail;
+import org.junit.jupiter.api.Test;
+import org.mockserver.model.HttpRequest;
+import org.mockserver.model.HttpResponse;
+import org.mockserver.model.JsonBody;
+import org.proshin.finapi.TestWithMockedEndpoint;
+import org.proshin.finapi.exception.FinapiAuthenticationException;
+
+final class FpEndpointTest extends TestWithMockedEndpoint {
+
+    @Test
+    void testAuthenticationException() {
+        final String body = '{' +
+            "  \"bankId\": 277672," +
+            '}';
+        this.server()
+            .when(
+                HttpRequest.request("/api/v1/bankConnections")
+                    .withMethod("POST")
+                    .withBody(new JsonBody(body))
+            ).respond(
+            HttpResponse.response('{' +
+                "  \"error\": \"unauthorized\"," +
+                "  \"error_description\": \"An Authentication object was not found in the SecurityContext\"" +
+                '}')
+                .withStatusCode(HttpStatus.SC_UNAUTHORIZED)
+                .withHeader("x-request-id", "request-id")
+        );
+
+        try {
+            this.endpoint()
+                .post(
+                    "/api/v1/bankConnections",
+                    new StringEntity(body, ContentType.APPLICATION_JSON),
+                    HttpStatus.SC_CREATED
+                );
+        } catch (final FinapiAuthenticationException e) {
+            // do nothing
+            return;
+        }
+        fail("Should never be reached");
+    }
+}
diff --git a/src/test/java/org/proshin/finapi/exception/FinapiExceptionTest.java b/src/test/java/org/proshin/finapi/exception/FinapiExceptionTest.java

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public final class FinapiException extends RuntimeException {`
`36`	`36`
`37`	`37`	`@SuppressWarnings("TransientFieldNotInitialized")`
`38`	`38`	`private final transient JSONObject origin;`
	`39`	`+ @SuppressWarnings("TransientFieldNotInitialized")`
	`40`	`+ private final transient String requestId;`
`39`	`41`	`@SuppressWarnings({"TransientFieldNotInitialized", "OptionalUsedAsFieldOrParameterType"})`
`40`	`42`	`private final transient Optional<String> location;`
`41`	`43`
`@@ -61,15 +63,22 @@ public FinapiException(final int expected, final HttpResponse response) {`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`	`).get(),`
	`66`	`+ response.getFirstHeader("X-Request-Id").getValue(),`
`64`	`67`	`Optional.ofNullable(response.getFirstHeader("Location"))`
`65`	`68`	`.map(NameValuePair::getValue)`
`66`	`69`	`.orElse(null)`
`67`	`70`	`);`
`68`	`71`	`}`
`69`	`72`
`70`		`- public FinapiException(final String message, final JSONObject origin, final String location) {`
	`73`	`+ public FinapiException(`
	`74`	`+ final String message,`
	`75`	`+ final JSONObject origin,`
	`76`	`+ final String requestId,`
	`77`	`+ final String location) {`
	`78`	`+`
`71`	`79`	`super(message);`
`72`	`80`	`this.origin = origin;`
	`81`	`+ this.requestId = requestId;`
`73`	`82`	`this.location = Optional.ofNullable(location);`
`74`	`83`	`}`
`75`	`84`
`@@ -85,7 +94,7 @@ public OffsetDateTime date() {`
`85`	`94`	`}`
`86`	`95`
`87`	`96`	`public String requestId() {`
`88`		`- return this.origin.getString("requestId");`
	`97`	`+ return this.requestId;`
`89`	`98`	`}`
`90`	`99`
`91`	`100`	`public String endpoint() {`