Merge pull request #92 from ral-facilities/91_login_error_handling

Add error handling to UserResource.login

Author: patrick-austin

src/main/java/org/icatproject/topcat/IcatClient.java

@@ -70,26 +70,40 @@ public IcatClient(String url, String sessionId) {
 	 * @param password ICAT password
 	 * @return json with sessionId of the form
 	 *         <samp>{"sessionId","0d9a3706-80d4-4d29-9ff3-4d65d4308a24"}</samp>
-	 * @throws BadRequestException
+	 * @throws TopcatException
 	 */
-	public String login(String plugin, String username, String password) throws BadRequestException {
+	public String login(String plugin, String username, String password) throws TopcatException {
+		JsonObjectBuilder objectBuilder = Json.createObjectBuilder();
+		JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
+		JsonObjectBuilder usernameBuilder = Json.createObjectBuilder();
+		JsonObjectBuilder passwordBuilder = Json.createObjectBuilder();
+		usernameBuilder.add("username", username);
+		passwordBuilder.add("password", password);
+		arrayBuilder.add(usernameBuilder);
+		arrayBuilder.add(passwordBuilder);
+		objectBuilder.add("plugin", plugin);
+		objectBuilder.add("credentials", arrayBuilder);
+		String jsonString = "json=" + objectBuilder.build().toString();
+		Response response;
 		try {
-			JsonObjectBuilder objectBuilder = Json.createObjectBuilder();
-			JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
-			JsonObjectBuilder usernameBuilder = Json.createObjectBuilder();
-			JsonObjectBuilder passwordBuilder = Json.createObjectBuilder();
-			usernameBuilder.add("username", username);
-			passwordBuilder.add("password", password);
-			arrayBuilder.add(usernameBuilder);
-			arrayBuilder.add(passwordBuilder);
-			objectBuilder.add("plugin", plugin);
-			objectBuilder.add("credentials", arrayBuilder);
-			String jsonString = "json=" + objectBuilder.build().toString();
-			Response response = httpClient.post("session", new HashMap<String, String>(), jsonString);
-			return response.toString();
+			response = httpClient.post("session", new HashMap<String, String>(), jsonString);
 		} catch (Exception e) {
 			throw new BadRequestException(e.getMessage());
 		}
+		switch (response.getCode()) {
+			case 200:
+				return response.toString();
+			case 400:
+				throw new BadRequestException(response.toString());
+			case 401:
+				throw new AuthenticationException(response.toString());
+			case 403:
+				throw new ForbiddenException(response.toString());
+			case 404:
+				throw new NotFoundException(response.toString());
+			default:
+				throw new InternalException(response.toString());
+		}
 	}
 
 	public String getUserName() throws TopcatException {

src/main/java/org/icatproject/topcat/web/rest/UserResource.java

@@ -101,11 +101,12 @@ private String getCartUserName(String userName, String sessionId) {
 	 * @param plugin       ICAT authentication plugin. If null, a default value will be used.
 	 * @return json with sessionId of the form
 	 *         <samp>{"sessionId","0d9a3706-80d4-4d29-9ff3-4d65d4308a24"}</samp>
-	 * @throws BadRequestException
+	 * @throws TopcatException 
 	 */
 	@POST
 	@Path("/session")
-	public String login(@QueryParam("facilityName") String facilityName, @FormParam("username") String username, @FormParam("password") String password, @FormParam("plugin") String plugin) throws BadRequestException {
+	public String login(@QueryParam("facilityName") String facilityName, @FormParam("username") String username,
+			@FormParam("password") String password, @FormParam("plugin") String plugin) throws TopcatException {
 		if (plugin == null) {
 			plugin = defaultPlugin;
 		}

src/test/java/org/icatproject/topcat/UserResourceTest.java

@@ -110,6 +110,11 @@ public void testLogin() throws Exception {
 		UUID.fromString(loginResponseObject.getString("sessionId"));
 	}
 
+	@Test
+	public void testLoginFailure() throws Exception {
+		assertThrows(ForbiddenException.class, () -> userResource.login(null, "root", "guess", null));
+	}
+
 	@Test
 	public void testGetSize() throws Exception {
 		String facilityName = "LILS";