From 106047022d04ce1e24e15e7ffebd12c560ef620e Mon Sep 17 00:00:00 2001 From: Sahan Randika Date: Wed, 14 Feb 2024 07:11:44 +0530 Subject: [PATCH] update client secret assertions to support empty client secret --- .../AddEndPointSecurityPerTypeTestCase.java | 18 ++++++------------ .../ChangeEndPointSecurityPerTypeTestCase.java | 12 ++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java index 64e16bf257..9e5999a500 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java @@ -408,8 +408,7 @@ 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")); @@ -417,8 +416,7 @@ public void testAddEndpointSecurityForOauthForClientCredentialsGrantType() throw 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); @@ -484,8 +482,7 @@ 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")); @@ -493,8 +490,7 @@ public void testAPIDefinitionImportWithEndpointSecurity() throws Exception { 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", @@ -562,8 +558,7 @@ 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")); @@ -571,8 +566,7 @@ public void testAddEndpointSecurityForOauthForPasswordGrantType() throws Excepti 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); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java index cc914477c7..2ec0968dcc 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java @@ -384,8 +384,7 @@ 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")); @@ -393,8 +392,7 @@ public void testUpdateEndpointSecurityForOauthForClientCredentialsGrantType() th 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); @@ -476,8 +474,7 @@ 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")); @@ -485,8 +482,7 @@ public void testUpdateEndpointSecurityForOauthForPasswordGrantType() throws Exce 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);