begin tidy up of error handling for authentication.

mifosng-provider/src/main/java/org/mifosng/platform/api/errorhandling/BadCredentialsExceptionMapper.java

@@ -0,0 +1,27 @@
+package org.mifosng.platform.api.errorhandling;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+import org.mifosng.data.ApiGlobalErrorResponse;
+import org.springframework.context.annotation.Scope;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.stereotype.Component;
+
+/**
+ * An {@link ExceptionMapper} to map {@link BadCredentialsException} thrown by platform during authentication into a HTTP API friendly format.
+ * 
+ * The {@link BadCredentialsException} is thrown by spring security on platform when an attempt is made to authenticate using invalid username/password credentials.
+ */
+@Provider
+@Component
+@Scope("singleton")
+public class BadCredentialsExceptionMapper implements ExceptionMapper<BadCredentialsException> {
+
+	@Override
+	public Response toResponse(BadCredentialsException exception) {
+		return Response.status(Status.UNAUTHORIZED).entity(ApiGlobalErrorResponse.unAuthenticated()).build();
+	}
+}

mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiAuthenticationEntryPoint.java

@@ -1,21 +0,0 @@
-package org.mifosng.platform.api.infrastructure;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-@Component("apiAuthenticationEntryPoint")
-public final class ApiAuthenticationEntryPoint implements AuthenticationEntryPoint {
-
-	@Override
-	public final void commence(HttpServletRequest request,
-			HttpServletResponse response, AuthenticationException authException)
-			throws IOException {
-		response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthenticated");
-	}
-}

mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiAuthenticationSuccessHandler.java

@@ -1,52 +0,0 @@
-package org.mifosng.platform.api.infrastructure;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
-import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
-import org.springframework.security.web.savedrequest.RequestCache;
-import org.springframework.security.web.savedrequest.SavedRequest;
-import org.springframework.util.StringUtils;
-
-public class ApiAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
-
-	private RequestCache requestCache = new HttpSessionRequestCache();
-
-	@Override
-	public void onAuthenticationSuccess(HttpServletRequest request,
-			HttpServletResponse response, Authentication authentication)
-			throws ServletException, IOException {
-		SavedRequest savedRequest = requestCache.getRequest(request, response);
-
-		if (savedRequest == null) {
-			super.onAuthenticationSuccess(request, response, authentication);
-
-			return;
-		}
-		String targetUrlParameter = getTargetUrlParameter();
-		if (isAlwaysUseDefaultTargetUrl()
-				|| (targetUrlParameter != null && StringUtils.hasText(request
-						.getParameter(targetUrlParameter)))) {
-			requestCache.removeRequest(request, response);
-			super.onAuthenticationSuccess(request, response, authentication);
-
-			return;
-		}
-
-		clearAuthenticationAttributes(request);
-
-//		// Use the DefaultSavedRequest URL
-//		String targetUrl = savedRequest.getRedirectUrl();
-//		logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl);
-//		getRedirectStrategy().sendRedirect(request, response, targetUrl);
-	}
-
-	public void setRequestCache(RequestCache requestCache) {
-		this.requestCache = requestCache;
-	}
-}

mifosng-provider/src/main/webapp/WEB-INF/views/login.jsp

@@ -20,6 +20,13 @@
 <div id="container">	
 	<div id="content">
 		<div id="spacer" style="line-height: 25px;">&nbsp;</div>
+	</div>
+</div>
+</body>
+</html>
+
+
+		<!-- 
 		<h1>Mifos - Individual Lending: Login</h1>
 		<div id="formcontainer">
 		
@@ -63,8 +70,4 @@
 				</div>
 			</fieldset>
 		</form>
-		</div>
-	</div>
-</div>
-</body>
-</html>
+		 -->