[ISSUE-45] Fix bug allowing library to automatically renew expired sessions (#46)

Author: Crim

CHANGELOG.md

@@ -2,6 +2,9 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.2 (02/20/2020)
+- Fixed bug preventing the library from auto-renewing a session when it expires.
+
 ## 1.1.1 (01/07/2020)
 - Fixed bug in User create endpoint where setting a new user's role could only be set via a RoleId.  Now you can set the role by name or id.
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.darksci</groupId>
     <artifactId>pardot-api-client</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <!-- Require Maven 3.5.0 -->

src/main/java/com/darksci/pardot/api/PardotClient.java

@@ -121,6 +121,7 @@
 import com.darksci.pardot.api.request.visitor.VisitorReadRequest;
 import com.darksci.pardot.api.request.visitoractivity.VisitorActivityQueryRequest;
 import com.darksci.pardot.api.request.visitoractivity.VisitorActivityReadRequest;
+import com.darksci.pardot.api.response.ErrorCode;
 import com.darksci.pardot.api.response.ErrorResponse;
 import com.darksci.pardot.api.response.account.Account;
 import com.darksci.pardot.api.response.campaign.Campaign;
@@ -236,9 +237,19 @@ private <T> T submitRequest(final Request request, ResponseParser<T> responsePar
                     // Parse error response
                     final ErrorResponse error = new ErrorResponseParser().parseResponse(restResponse.getResponseStr());
 
+                    // Inspect error code
+                    if (ErrorCode.INVALID_API_OR_USER_KEY.getCode() == error.getCode()) {
+                        // This means the user session has expired.  Lets attempt to renew it.
+                        configuration.setApiKey(null);
+                        checkLogin();
+
+                        // Replay original request
+                        return submitRequest(request, responseParser);
+                    }
+
                     // throw exception
                     throw new InvalidRequestException(error.getMessage(), error.getCode());
-                } catch (IOException exception) {
+                } catch (final IOException exception) {
                     throw new ParserException(exception.getMessage(), exception);
                 }
             }

src/main/java/com/darksci/pardot/api/response/ErrorCode.java

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2017, 2018, 2019, 2020 Stephen Powis https://github.com/Crim/pardot-java-client
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.darksci.pardot.api.response;
+
+/**
+ * List of Pardot API Response Error Codes.
+ *
+ * Incomplete List.
+ */
+public enum ErrorCode {
+    // Returned if API Session becomes invalid.
+    INVALID_API_OR_USER_KEY(1),
+    INVALID_ACTION(2),
+    INVALID_PROSPECT_ID(3),
+    INVALID_PROSPECT_EMAIL_ADDRESS(4),
+    INVALID_USER_ID(10),
+    INVALID_ID(11),
+    // Returned if authentication credentials are invalid.
+    LOGIN_FAILED(15),
+    INVALID_CAMPAIGN_ID(38),
+    EMAIL_ADDRESS_IS_ALREADY_IN_USE(54),
+    INVALID_LIST_ID(55),
+    INVALID_EMAIL_FORMAT(65);
+
+    private final int code;
+
+    ErrorCode(final int code) {
+        this.code = code;
+    }
+
+    public int getCode() {
+        return code;
+    }
+}