Refactoring

4.x.x
megala21 7 years ago
parent 75bb02ac4a
commit ab54dda56c

@ -151,9 +151,7 @@ public class WebappAuthenticationValve extends CarbonTomcatValve {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug(msg + " , API : " + Encode.forUriComponent(request.getRequestURI())); log.debug(msg + " , API : " + Encode.forUriComponent(request.getRequestURI()));
} }
AuthenticationFrameworkUtil. AuthenticationFrameworkUtil.handleResponse(request, response, HttpServletResponse.SC_UNAUTHORIZED, msg);
handleResponse(request, response, HttpServletResponse.SC_UNAUTHORIZED, msg);
break; break;
} }
} }

@ -63,7 +63,6 @@ public class WebappAuthenticationValveTest {
Mockito.doNothing().when(compositeValve).continueInvocation(Mockito.any(), Mockito.any()); Mockito.doNothing().when(compositeValve).continueInvocation(Mockito.any(), Mockito.any());
request.setContext(context); request.setContext(context);
webappAuthenticationValve.invoke(request, null, compositeValve); webappAuthenticationValve.invoke(request, null, compositeValve);
request = new TestRequest("", "test"); request = new TestRequest("", "test");
context = new StandardContext(); context = new StandardContext();
compositeValve = Mockito.mock(CompositeValve.class); compositeValve = Mockito.mock(CompositeValve.class);
@ -92,7 +91,6 @@ public class WebappAuthenticationValveTest {
String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes())); String encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER).getBytes()));
Request request = createRequest("basic " + encodedString); Request request = createRequest("basic " + encodedString);
webappAuthenticationValve.invoke(request, null, compositeValve); webappAuthenticationValve.invoke(request, null, compositeValve);
encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes())); encodedString = new String(Base64.getEncoder().encode((ADMIN_USER + ":" + ADMIN_USER + "test").getBytes()));
request = createRequest("basic " + encodedString); request = createRequest("basic " + encodedString);
Response response = new Response(); Response response = new Response();
@ -135,7 +133,6 @@ public class WebappAuthenticationValveTest {
context.setPath("carbon1"); context.setPath("carbon1");
context.addParameter("doAuthentication", String.valueOf(true)); context.addParameter("doAuthentication", String.valueOf(true));
request.setContext(context); request.setContext(context);
MimeHeaders mimeHeaders = new MimeHeaders(); MimeHeaders mimeHeaders = new MimeHeaders();
MessageBytes bytes = mimeHeaders.addValue(BaseWebAppAuthenticatorFrameworkTest.AUTHORIZATION_HEADER); MessageBytes bytes = mimeHeaders.addValue(BaseWebAppAuthenticatorFrameworkTest.AUTHORIZATION_HEADER);
bytes.setString(authorizationHeader); bytes.setString(authorizationHeader);

Loading…
Cancel
Save