Update integration tests to use REST APIs

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2DeviceFlowTestCase.java

@@ -15,16 +15,15 @@
  */
 package org.wso2.identity.integration.test.oauth2;
 
-import org.apache.commons.codec.binary.Base64;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 import org.json.simple.JSONObject;
@@ -36,8 +35,10 @@
 import org.testng.annotations.Test;
 import org.wso2.carbon.automation.engine.context.AutomationContext;
 import org.wso2.carbon.automation.engine.context.TestUserMode;
-import org.wso2.carbon.identity.oauth.stub.dto.OAuthConsumerAppDTO;
-import org.wso2.carbon.integration.common.admin.client.AuthenticatorClient;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ApplicationModel;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ApplicationResponseModel;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.InboundProtocols;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.OpenIDConnectConfiguration;
 import org.wso2.identity.integration.test.util.Utils;
 import org.wso2.identity.integration.test.utils.CommonConstants;
 import org.wso2.identity.integration.test.utils.DataExtractUtil;
@@ -46,10 +47,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.wso2.identity.integration.test.utils.OAuth2Constant.COMMON_AUTH_URL;
 import static org.wso2.identity.integration.test.utils.OAuth2Constant.SCOPE_PLAYGROUND_NAME;
@@ -64,41 +62,45 @@ public class OAuth2DeviceFlowTestCase extends OAuth2ServiceAbstractIntegrationTe
  private String sessionDataKey;
  private String consumerKey;
  private String consumerSecret;
+ private String appId;
  private String userCode;
  private String deviceCode;
+ private CloseableHttpClient client;
 
- private DefaultHttpClient client;
 
  @BeforeClass(alwaysRun = true)
  public void testInit() throws Exception {
 
  super.init(TestUserMode.SUPER_TENANT_USER);
- AuthenticatorClient logManger = new AuthenticatorClient(backendURL);
- logManger.login(isServer.getSuperTenant().getTenantAdmin().getUserName(),
- isServer.getSuperTenant().getTenantAdmin().getPassword(),
- isServer.getInstance().getHosts().get("default"));
- client = new DefaultHttpClient();
+ client = HttpClients.createDefault();
 
  setSystemproperties();
  }
 
  @AfterClass(alwaysRun = true)
  public void atEnd() throws Exception {
 
- deleteApplication();
- removeOAuthApplicationData();
+ deleteApp(appId);
+ consumerKey = null;
+ consumerSecret = null;
+ appId = null;
+ client.close();
  }
 
  @Test(groups = "wso2.is", description = "Check Oauth2 application registration")
  public void testRegisterApplication() throws Exception {
 
- OAuthConsumerAppDTO appDto = createApp();
- Assert.assertNotNull(appDto, "Application creation failed.");
+ ApplicationResponseModel application = createApp();
+ Assert.assertNotNull(application, "OAuth App creation failed.");
 
- consumerKey = appDto.getOauthConsumerKey();
+ OpenIDConnectConfiguration oidcConfig = getOIDCInboundDetailsOfApplication(application.getId());
+
+ consumerKey = oidcConfig.getClientId();
  Assert.assertNotNull(consumerKey, "Application creation failed.");
 
- consumerSecret = appDto.getOauthConsumerSecret();
+ consumerSecret = oidcConfig.getClientSecret();
+ Assert.assertNotNull(consumerSecret, "Application creation failed.");
+ appId = application.getId();
  }
 
  @Test(groups = "wso2.is", description = "Send authorize user request without redirect_uri param", dependsOnMethods
@@ -129,7 +131,7 @@ public void testNonUsedDeviceTokenRequest() throws Exception {
  @Test(groups = "wso2.is", description = "Send authorize user request", dependsOnMethods = "testSendDeviceAuthorize")
  public void testSendDeviceAuthorozedPost() throws Exception {
 
- List<NameValuePair> urlParameters = new ArrayList<NameValuePair>();
+ List<NameValuePair> urlParameters = new ArrayList<>();
  urlParameters.add(new BasicNameValuePair(USER_CODE, userCode));
  AutomationContext automationContext = new AutomationContext("IDENTITY", TestUserMode.SUPER_TENANT_ADMIN);
  String authenticationEndpoint = automationContext.getContextUrls().getBackEndUrl()
@@ -156,7 +158,7 @@ public void testDevicePost() throws Exception {
  response = sendGetRequest(client, locationHeader.getValue());
  Assert.assertNotNull(response, "Authorized user response is null.");
 
- Map<String, Integer> keyPositionMap = new HashMap<String, Integer>(1);
+ Map<String, Integer> keyPositionMap = new HashMap<>(1);
  keyPositionMap.put("name=\"sessionDataKey\"", 1);
  List<DataExtractUtil.KeyValue> keyValues =
  DataExtractUtil.extractDataFromResponse(response, keyPositionMap);
@@ -189,7 +191,7 @@ public void testSendLoginPost() throws Exception {
  EntityUtils.consume(response.getEntity());
 
  response = sendGetRequest(client, locationHeader.getValue());
- Map<String, Integer> keyPositionMap = new HashMap<String, Integer>(1);
+ Map<String, Integer> keyPositionMap = new HashMap<>(1);
  keyPositionMap.put("name=\"" + OAuth2Constant.SESSION_DATA_KEY_CONSENT + "\"", 1);
  List<DataExtractUtil.KeyValue> keyValues =
  DataExtractUtil.extractSessionConsentDataFromResponse(response,
@@ -297,19 +299,32 @@ public HttpResponse sendGetRequest(HttpClient client, String locationURL) throws
  /**
  * Create Application with the given app configurations
  *
- * @return OAuthConsumerAppDTO
- * @throws Exception
+ * @return ApplicationResponseModel
+ * @throws Exception exception
  */
- private OAuthConsumerAppDTO createApp() throws Exception {
-
- OAuthConsumerAppDTO appDTO = new OAuthConsumerAppDTO();
- appDTO.setApplicationName(OAuth2Constant.OAUTH_APPLICATION_NAME);
- appDTO.setCallbackUrl(OAuth2Constant.CALLBACK_URL);
- appDTO.setOAuthVersion(OAuth2Constant.OAUTH_VERSION_2);
- appDTO.setGrantTypes("authorization_code implicit password client_credentials refresh_token " +
- "urn:ietf:params:oauth:grant-type:saml2-bearer iwa:ntlm " +
- "urn:ietf:params:oauth:grant-type:device_code");
- appDTO.setBypassClientCredentials(true);
- return createApplication(appDTO, SERVICE_PROVIDER_NAME);
+ private ApplicationResponseModel createApp() throws Exception {
+
+ ApplicationModel application = new ApplicationModel();
+
+ List<String> grantTypes = new ArrayList<>();
+ Collections.addAll(grantTypes, "authorization_code", "implicit", "password", "client_credentials", "refresh_token", "urn:ietf:params:oauth:grant-type:saml2-bearer", "iwa:ntlm", "urn:ietf:params:oauth:grant-type:device_code");
+
+ List<String> callBackUrls = new ArrayList<>();
+ Collections.addAll(callBackUrls, OAuth2Constant.CALLBACK_URL);
+
+ OpenIDConnectConfiguration oidcConfig = new OpenIDConnectConfiguration();
+ oidcConfig.setGrantTypes(grantTypes);
+ oidcConfig.setCallbackURLs(callBackUrls);
+ oidcConfig.setPublicClient(true);
+
+ InboundProtocols inboundProtocolsConfig = new InboundProtocols();
+ inboundProtocolsConfig.setOidc(oidcConfig);
+
+ application.setInboundProtocolConfiguration(inboundProtocolsConfig);
+ application.setName(OAuth2Constant.OAUTH_APPLICATION_NAME);
+
+ String appId = addApplication(application);
+
+ return getApplication(appId);
  }
 }

modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2IDTokenEncryptionTestCase.java

@@ -53,16 +53,17 @@
 import org.testng.annotations.Test;
 import org.wso2.carbon.automation.engine.context.TestUserMode;
 import org.wso2.carbon.automation.test.utils.common.TestConfigurationProvider;
-import org.wso2.carbon.identity.application.common.model.xsd.ServiceProvider;
-import org.wso2.carbon.identity.oauth.stub.dto.OAuthConsumerAppDTO;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ApplicationResponseModel;
+import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.OpenIDConnectConfiguration;
 import org.wso2.identity.integration.test.utils.DataExtractUtil;
 import org.wso2.identity.integration.test.utils.OAuth2Constant;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.security.KeyStore;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
@@ -91,6 +92,10 @@ public class OAuth2IDTokenEncryptionTestCase extends OAuth2ServiceAbstractIntegr
  private String sessionDataKeyConsent;
  private AuthorizationCode authorizationCode;
  private String idToken;
+ private String consumerKey;
+ private String consumerSecret;
+ private ApplicationResponseModel application;
+ private OpenIDConnectConfiguration oidcInboundConfig;
 
  @BeforeClass(alwaysRun = true)
  public void testInit() throws Exception {
@@ -101,13 +106,14 @@ public void testInit() throws Exception {
 
  @AfterClass(alwaysRun = true)
  public void atEnd() throws Exception {
- deleteApplication();
- removeOAuthApplicationData();
+ deleteApp(application.getId());
 
  consumerKey = null;
  consumerSecret = null;
  spPrivateKey = null;
  spX509PublicCert = null;
+ application = null;
+ oidcInboundConfig = null;
 
  client.close();
  }
@@ -124,43 +130,42 @@ public void testGenerateServiceProviderKeys() throws Exception {
  dependsOnMethods = "testGenerateServiceProviderKeys")
  public void testRegisterApplication() throws Exception {
 
- OAuthConsumerAppDTO oAuthConsumerAppDTO = getBasicOAuthApp(CALLBACK_URL);
- ServiceProvider serviceProvider = registerServiceProviderWithOAuthInboundConfigs(oAuthConsumerAppDTO);
- Assert.assertNotNull(serviceProvider, "OAuth App creation failed.");
+ application = getBasicOAuthApplication(CALLBACK_URL);
+ Assert.assertNotNull(application, "OAuth App creation failed.");
+
+ oidcInboundConfig = getOIDCInboundDetailsOfApplication(application.getId());
+ consumerKey = oidcInboundConfig.getClientId();
  Assert.assertNotNull(consumerKey, "Consumer Key is null.");
+ consumerSecret = oidcInboundConfig.getClientSecret();
  Assert.assertNotNull(consumerSecret, "Consumer Secret is null.");
  }
 
  @Test(groups = "wso2.is", description = "Check Updating public cert of Service Provider.",
  dependsOnMethods = "testRegisterApplication")
  public void updateServiceProviderCert() throws Exception {
 
- ServiceProvider application = appMgtclient.getApplication(SERVICE_PROVIDER_NAME);
- Assert.assertNotNull(application, "Application: " + SERVICE_PROVIDER_NAME + " retrieval failed.");
-
- application.setCertificateContent(convertToPem(spX509PublicCert));
- appMgtclient.updateApplicationData(application);
+ updateApplicationCertificate(application.getId(), spX509PublicCert);
 
- ServiceProvider updatedApp = appMgtclient.getApplication(SERVICE_PROVIDER_NAME);
- Assert.assertNotNull(updatedApp, "Updated application: " + SERVICE_PROVIDER_NAME +
- " retrieval failed.");
- Assert.assertNotNull(updatedApp.getCertificateContent(), "Updating application certificate failed.");
+ ApplicationResponseModel updatedApplication = getApplication(application.getId());
+ Assert.assertNotNull(updatedApplication, "Application: " + application.getName() + " retrieval failed.");
+ Assert.assertNotNull(updatedApplication.getAdvancedConfigurations().getCertificate(), "Application Certificate update failed");
  }
 
  @Test(groups = "wso2.is", description = "Setup encryption algorithm and encryption method.",
  dependsOnMethods = "updateServiceProviderCert")
  public void testConfigureIDTokenEncryptionAlgorithms() throws Exception {
 
- OAuthConsumerAppDTO consumerAppDTO = adminClient.getOAuthAppByConsumerKey(consumerKey);
- consumerAppDTO.setIdTokenEncryptionEnabled(true);
- consumerAppDTO.setIdTokenEncryptionAlgorithm(ENCRYPTION_ALGORITHM);
- consumerAppDTO.setIdTokenEncryptionMethod(ENCRYPTION_METHOD);
- adminClient.updateConsumerApp(consumerAppDTO);
- OAuthConsumerAppDTO updateApp = adminClient.getOAuthAppByConsumerKey(consumerKey);
- Assert.assertTrue(updateApp.getIdTokenEncryptionEnabled(), "Enforcing ID Token encryption failed.");
- Assert.assertEquals(updateApp.getIdTokenEncryptionAlgorithm(),
+ oidcInboundConfig.getIdToken().getEncryption().setEnabled(true);
+ oidcInboundConfig.getIdToken().getEncryption().setAlgorithm(ENCRYPTION_ALGORITHM);
+ oidcInboundConfig.getIdToken().getEncryption().setMethod(ENCRYPTION_METHOD);
+ updateApplicationOidcInboundConfig(application.getId(), oidcInboundConfig);
+
+ OpenIDConnectConfiguration updatedOidcInboundConfig = getOIDCInboundDetailsOfApplication(application.getId());
+ Assert.assertTrue(updatedOidcInboundConfig.getIdToken().getEncryption().getEnabled(),
+ "Enforcing ID Token encryption failed.");
+ Assert.assertEquals(updatedOidcInboundConfig.getIdToken().getEncryption().getAlgorithm(),
  ENCRYPTION_ALGORITHM, "Configuring encryption algorithm failed.");
- Assert.assertEquals(updateApp.getIdTokenEncryptionMethod(),
+ Assert.assertEquals(updatedOidcInboundConfig.getIdToken().getEncryption().getMethod(),
  ENCRYPTION_METHOD, "Configuring encryption method failed.");
  }
 
@@ -407,7 +412,7 @@ private String getLocationHeaderValue(HttpResponse response) {
  /**
  * Initiate service provider keys required for the tests.
  *
- * @throws Exception
+ * @throws Exception error
  */
  private void initServiceProviderKeys() throws Exception {
 
@@ -416,7 +421,7 @@ private void initServiceProviderKeys() throws Exception {
  File.separator + "keystores" + File.separator + "sp1KeyStore.jks";
  String jksPassword = "wso2carbon";
 
- keyStore.load(new FileInputStream(jksPath), jksPassword.toCharArray());
+ keyStore.load(Files.newInputStream(Paths.get(jksPath)), jksPassword.toCharArray());
 
  String alias = "wso2carbon";
  KeyStore.PrivateKeyEntry pkEntry = (KeyStore.PrivateKeyEntry) keyStore.getEntry(alias,
@@ -434,8 +439,8 @@ private void initServiceProviderKeys() throws Exception {
  * @param client CloseableHttpClient object to send the login post.
  * @param sessionDataKey String sessionDataKey obtained.
  * @return Extracted sessionDataKeyConsent.
- * @throws IOException
- * @throws URISyntaxException
+ * @throws IOException Error
+ * @throws URISyntaxException Error
  */
  private String getSessionDataKeyConsent(CloseableHttpClient client, String sessionDataKey)
  throws IOException, URISyntaxException {
@@ -467,8 +472,8 @@ private String getSessionDataKeyConsent(CloseableHttpClient client, String sessi
  * @param idToken Encrypted ID token to be decrypted and checked.
  * @param audience Audience value that should be appeared in the token.
  * @return Boolean True if audience matches, False otherwise.
- * @throws ParseException
- * @throws JOSEException
+ * @throws ParseException Error
+ * @throws JOSEException Error
  */
  private boolean decryptAndCheckIDToken(String idToken, String audience) throws ParseException, JOSEException {