Skip to content

Commit

Permalink
update client secret assertions to support empty client secret
Browse files Browse the repository at this point in the history
  • Loading branch information
@shnrndk
shnrndk committed Apr 1, 2024
1 parent 6f54515 commit 1060470
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 20 deletions.
18 changes: 6 additions & 12 deletions .../java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,17 +408,15 @@ public void testAddEndpointSecurityForOauthForClientCredentialsGrantType() throw
Assert.assertEquals(sandboxEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(sandboxEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientId"), applicationKeyBeanSandbox.getConsumerKey());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanSandbox.getConsumerSecret());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"), "");
Assert.assertNotNull(endpointSecurityModel.get("production"));
Map productionEndpointSecurityModel = (Map) endpointSecurityModel.get("production");
Assert.assertTrue((Boolean) productionEndpointSecurityModel.get("enabled"));
Assert.assertEquals(productionEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(productionEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(productionEndpointSecurityModel.get("clientId"),
applicationKeyBeanProduction.getConsumerKey());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanProduction.getConsumerSecret());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"), "");

String prodAppTokenJti = TokenUtils.getJtiOfJwtToken(productionApplication.getToken().getAccessToken());
requestHeadersGet.put("Authorization", "Bearer " + prodAppTokenJti);
Expand Down Expand Up @@ -484,17 +482,15 @@ public void testAPIDefinitionImportWithEndpointSecurity() throws Exception {
Assert.assertEquals(sandboxEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(sandboxEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientId"), applicationKeyBeanSandbox.getConsumerKey());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanSandbox.getConsumerSecret());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"), "");
Assert.assertNotNull(endpointSecurityModel.get("production"));
Map productionEndpointSecurityModel = (Map) endpointSecurityModel.get("production");
Assert.assertTrue((Boolean) productionEndpointSecurityModel.get("enabled"));
Assert.assertEquals(productionEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(productionEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(productionEndpointSecurityModel.get("clientId"),
applicationKeyBeanProduction.getConsumerKey());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanProduction.getConsumerSecret());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"), "");
}

@Test(groups = { "wso2.am"}, description = "Test add OAuth endpoint security for PASSWORD grant type",
Expand Down Expand Up @@ -562,17 +558,15 @@ public void testAddEndpointSecurityForOauthForPasswordGrantType() throws Excepti
Assert.assertEquals(sandboxEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(sandboxEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientId"), applicationKeyBeanSandbox.getConsumerKey());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanSandbox.getConsumerSecret());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"), "");
Assert.assertNotNull(endpointSecurityModel.get("production"));
Map productionEndpointSecurityModel = (Map) endpointSecurityModel.get("production");
Assert.assertTrue((Boolean) productionEndpointSecurityModel.get("enabled"));
Assert.assertEquals(productionEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(productionEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(productionEndpointSecurityModel.get("clientId"),
applicationKeyBeanProduction.getConsumerKey());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanProduction.getConsumerSecret());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"), "");

String prodAppTokenJti = TokenUtils.getJtiOfJwtToken(productionApplication.getToken().getAccessToken());
requestHeadersGet.put("Authorization", "Bearer " + prodAppTokenJti);
Expand Down
12 changes: 4 additions & 8 deletions ...va/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,17 +384,15 @@ public void testUpdateEndpointSecurityForOauthForClientCredentialsGrantType() th
Assert.assertEquals(sandboxEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(sandboxEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientId"), applicationKeyBeanSandbox.getConsumerKey());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanSandbox.getConsumerSecret());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"), "");
Assert.assertNotNull(endpointSecurityModel.get("production"));
Map productionEndpointSecurityModel = (Map) endpointSecurityModel.get("production");
Assert.assertTrue((Boolean) productionEndpointSecurityModel.get("enabled"));
Assert.assertEquals(productionEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(productionEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(productionEndpointSecurityModel.get("clientId"),
applicationKeyBeanProduction.getConsumerKey());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanProduction.getConsumerSecret());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"), "");

String prodAppTokenJti = TokenUtils.getJtiOfJwtToken(productionApplication.getToken().getAccessToken());
requestHeadersGet.put("Authorization", "Bearer " + prodAppTokenJti);
Expand Down Expand Up @@ -476,17 +474,15 @@ public void testUpdateEndpointSecurityForOauthForPasswordGrantType() throws Exce
Assert.assertEquals(sandboxEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(sandboxEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientId"), applicationKeyBeanSandbox.getConsumerKey());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanSandbox.getConsumerSecret());
Assert.assertEquals(sandboxEndpointSecurityModel.get("clientSecret"), "");
Assert.assertNotNull(endpointSecurityModel.get("production"));
Map productionEndpointSecurityModel = (Map) endpointSecurityModel.get("production");
Assert.assertTrue((Boolean) productionEndpointSecurityModel.get("enabled"));
Assert.assertEquals(productionEndpointSecurityModel.get("type"), "OAUTH");
Assert.assertEquals(productionEndpointSecurityModel.get("tokenUrl"), "https://localhost:9943/oauth2/token");
Assert.assertEquals(productionEndpointSecurityModel.get("clientId"),
applicationKeyBeanProduction.getConsumerKey());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"),
applicationKeyBeanProduction.getConsumerSecret());
Assert.assertEquals(productionEndpointSecurityModel.get("clientSecret"), "");

String prodAppTokenJti = TokenUtils.getJtiOfJwtToken(productionApplication.getToken().getAccessToken());
requestHeadersGet.put("Authorization", "Bearer " + prodAppTokenJti);
Expand Down

0 comments on commit 1060470

Please sign in to comment.