#60: Use a single field in Auth for the last generated request id

Author: miszobi

core/src/main/java/com/onelogin/saml2/Auth.java

@@ -97,14 +97,9 @@ public class Auth {
 	private String errorReason;
 
 	/**
-	 * The id of the last AuthnRequest generated
+	 * The id of the last request (Authn or Logout) generated
 	 */
-	private String lastLoginRequestId;
-
-	/**
-	 * The id of the last LogoutRequest generated
-	 */
-	private String lastLogoutRequestId;
+	private String lastRequestId;
 
 	/**
 	 * Initializes the SP SAML instance.
@@ -242,7 +237,7 @@ public void login(String returnTo, Boolean forceAuthn, Boolean isPassive, Boolea
 
 		LOGGER.debug("AuthNRequest sent to " + ssoUrl + " --> " + samlRequest);
 		Util.sendRedirect(response, ssoUrl, parameters);
-		lastLoginRequestId = authnRequest.getId();
+		lastRequestId = authnRequest.getId();
 	}
 
 	/**
@@ -306,7 +301,7 @@ public void logout(String returnTo, String nameId, String sessionIndex) throws I
 		String sloUrl = getSLOurl();
 		LOGGER.debug("Logout request sent to " + sloUrl + " --> " + samlLogoutRequest);
 		Util.sendRedirect(response, sloUrl, parameters);
-		lastLogoutRequestId = logoutRequest.getId();
+		lastRequestId = logoutRequest.getId();
 	}
 
 	/**
@@ -555,19 +550,11 @@ public String getLastErrorReason()
     }
 
 	/**
-	 * @return the id of the last AuthnRequest generated, null if none
-	 */
-	public String getLastLoginRequestId()
-	{
-		return lastLoginRequestId;
-	}
-
-	/**
-	 * @return the id of the last LogoutRequest generated, null if none
+	 * @return the id of the last request generated (AuthnRequest or LogoutRequest), null if none
 	 */
-	public String getLastLogoutRequestId()
+	public String getLastRequestId()
 	{
-		return lastLogoutRequestId;
+		return lastRequestId;
 	}
 
     /**

core/src/test/java/com/onelogin/saml2/test/AuthTest.java

@@ -93,8 +93,7 @@ public void testConstructor() throws IOException, SettingsException {
 		Saml2Settings settings = new SettingsBuilder().fromFile("onelogin.saml.properties").build();
 		assertEquals(settings.getIdpEntityId(), auth.getSettings().getIdpEntityId());
 		assertEquals(settings.getSpEntityId(), auth.getSettings().getSpEntityId());
-		assertNull(auth.getLastLoginRequestId());
-		assertNull(auth.getLastLogoutRequestId());
+		assertNull(auth.getLastRequestId());
 	}
 
 	/**
@@ -900,7 +899,7 @@ public void testLogin() throws IOException, SettingsException, URISyntaxExceptio
 		Auth auth = new Auth(settings, request, response);
 		auth.login();
 		verify(response).sendRedirect(matches("https:\\/\\/pitbulk.no-ip.org\\/simplesaml\\/saml2\\/idp\\/SSOService.php\\?SAMLRequest=(.)*&RelayState=http%3A%2F%2Flocalhost%3A8080%2Finitial.jsp"));
-		assertThat(auth.getLastLoginRequestId(), startsWith(Util.UNIQUE_ID_PREFIX));
+		assertThat(auth.getLastRequestId(), startsWith(Util.UNIQUE_ID_PREFIX));
 	}
 
 	/**
@@ -1016,7 +1015,7 @@ public void testLogout() throws IOException, SettingsException, XMLEntityExcepti
 		auth.logout();
 
 		verify(response).sendRedirect(matches("https:\\/\\/pitbulk.no-ip.org\\/simplesaml\\/saml2\\/idp\\/SingleLogoutService.php\\?SAMLRequest=(.)*&RelayState=http%3A%2F%2Flocalhost%3A8080%2Finitial.jsp"));
-		assertThat(auth.getLastLogoutRequestId(), startsWith(Util.UNIQUE_ID_PREFIX));
+		assertThat(auth.getLastRequestId(), startsWith(Util.UNIQUE_ID_PREFIX));
 	}
 
 	/**