Merge branch 'mssl-fix' into 'master'

Fix apim handler test failures

See merge request entgra/carbon-device-mgt!204
revert-70aa11f8
Milan Perera 5 years ago
commit 0261f96cc1

@ -55,7 +55,7 @@ public class AuthenticationHandler extends AbstractHandler {
private static final String X_JWT_ASSERTION = "X-JWT-Assertion"; private static final String X_JWT_ASSERTION = "X-JWT-Assertion";
private static final String JWTTOKEN = "JWTToken"; private static final String JWTTOKEN = "JWTToken";
private static final String AUTHORIZATION = "Authorization"; private static final String AUTHORIZATION = "Authorization";
private static final String BEARER = "Bearer "; private static final String BEARER = "Basic ";
private static final String CONTENT_TYPE = "Content-Type"; private static final String CONTENT_TYPE = "Content-Type";
private IOTServerConfiguration iotServerConfiguration; private IOTServerConfiguration iotServerConfiguration;

@ -92,8 +92,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.MDM_SIGNATURE, "some cert"); transportHeaders.put(AuthConstants.MDM_SIGNATURE, "some cert");
setMockClient(); setMockClient();
this.mockClient.setResponse(getDCRResponse());
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(getValidationResponse()); this.mockClient.setResponse(getValidationResponse());
boolean response = this.handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration, boolean response = this.handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice")); transportHeaders, "https://test.com/testservice/device-mgt/testdevice"));
@ -107,7 +105,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.PROXY_MUTUAL_AUTH_HEADER, "Test Header"); transportHeaders.put(AuthConstants.PROXY_MUTUAL_AUTH_HEADER, "Test Header");
setMockClient(); setMockClient();
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(getValidationResponse()); this.mockClient.setResponse(getValidationResponse());
boolean response = this.handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration, boolean response = this.handler.handleRequest(createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice")); transportHeaders, "https://test.com/testservice/device-mgt/testdevice"));
@ -121,7 +118,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.MUTUAL_AUTH_HEADER, "Test Header"); transportHeaders.put(AuthConstants.MUTUAL_AUTH_HEADER, "Test Header");
setMockClient(); setMockClient();
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(getValidationResponse()); this.mockClient.setResponse(getValidationResponse());
MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration, MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice"); transportHeaders, "https://test.com/testservice/device-mgt/testdevice");
@ -141,7 +137,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem"); transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
setMockClient(); setMockClient();
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(getValidationResponse()); this.mockClient.setResponse(getValidationResponse());
MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration, MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice"); transportHeaders, "https://test.com/testservice/device-mgt/testdevice");
@ -156,7 +151,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem"); transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
setMockClient(); setMockClient();
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(getInvalidResponse()); this.mockClient.setResponse(getInvalidResponse());
MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration, MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice"); transportHeaders, "https://test.com/testservice/device-mgt/testdevice");
@ -185,7 +179,6 @@ public class AuthenticationHandlerTest extends BaseAPIHandlerTest {
HashMap<String, String> transportHeaders = new HashMap<>(); HashMap<String, String> transportHeaders = new HashMap<>();
transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem"); transportHeaders.put(AuthConstants.ENCODED_PEM, "encoded pem");
setMockClient(); setMockClient();
this.mockClient.setResponse(getAccessTokenReponse());
this.mockClient.setResponse(null); this.mockClient.setResponse(null);
MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration, MessageContext messageContext = createSynapseMessageContext("<empty/>", this.synapseConfiguration,
transportHeaders, "https://test.com/testservice/device-mgt/testdevice"); transportHeaders, "https://test.com/testservice/device-mgt/testdevice");

Loading…
Cancel
Save