Skip to content

ES-2961, MOSIP-44503, ES-3003 - Added test cases for JWE test cases & fixed the consent issue #1882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zesu22 merged 7 commits into from
May 20, 2026
Merged

ES-2961, MOSIP-44503, ES-3003 - Added test cases for JWE test cases & fixed the consent issue #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5af70a
Updated API Automation Tests for Prompt Validation Changes
prathmeshj12 May 6, 2026
8c62ebc
Merge branch 'mosip:develop' into develop
prathmeshj12 May 11, 2026
41319e8
Merge branch 'mosip:develop' into develop
prathmeshj12 May 14, 2026
d0288f5
Merge branch 'mosip:develop' into develop
prathmeshj12 May 19, 2026
bb9aa10
ES-2691 - Added test cases for JWE story
prathmeshj12 May 19, 2026
6ee05ef
ES-2961, MOSIP-44503, ES-3003 - Added test cases for JWE test cases &…
prathmeshj12 May 19, 2026
0785019
ES-2961, MOSIP-44503, ES-3003 - Added test cases for JWE test cases &…
prathmeshj12 May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion api-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<maven.shade.plugin.version>3.2.4</maven.shade.plugin.version>
<maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version>
<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
<central.publishing.maven.plugin.version>0.7.0</central.publishing.maven.plugin.version>

<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
<fileName>apitest-esignet-1.8.1-SNAPSHOT-jar-with-dependencies</fileName>
Expand All @@ -72,13 +73,34 @@
</dependency>
</dependencies>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://central.sonatype.com/api/v1/publisher</url>
</repository>
</distributionManagement>

<build>
<pluginManagement>
<plugins>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central.publishing.maven.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>ossrh</publishingServerId>
<autoPublish>false</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -277,4 +299,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
99 changes: 87 additions & 12 deletions api-test/src/main/java/io/mosip/testrig/apirig/esignet/utils/EsignetUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,14 @@ public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
|| testCaseName.equals("ESignet_OIDCClient_DifferentScopeLanguageClaimsSce_sid")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_all_Valid_forUserInfoJWE_Smoke_sid")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_all_Valid_forUserInfoUpdateJWE_Smoke_sid")
|| testCaseName.equals("ESignet_CreateOIDCClientFAPI_all_Valid_Smoke_sid"))
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Invlalid_alg_value_Neg")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Invlalid_ClientID_Neg")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Missing_kid_value_Neg")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Duplicate_EncKey_forUserInfoUpdateJWE_Neg")
|| testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Different_Encryption_alg_value_Pos")
|| testCaseName.equals("ESignet_CreateOIDCClientFAPI_all_Valid_Smoke_sid")
|| testCaseName.equals("ESignet_CreateOIDCClientFAPI_all_Valid_forUserInfoJWE_Smoke_sid")
|| testCaseName.equals("ESignet_FAPIPartialUpdateOIDCClient_all_Valid_forUserInfoJWE_Smoke_sid"))
&& (endpoint.contains("/v1/esignet/client-mgmt/client")
|| endpoint.contains("/v1/esignet/client-mgmt/client/{clientId}")
|| endpoint.contains("/v1/esignet/client-mgmt/oauth-client")))) {
Expand Down Expand Up @@ -406,7 +413,7 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
String jwkKeyString;

if (testCaseName != null && testCaseName.toUpperCase().contains("FAPI")) {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI);
jwkKeyString = JWKKeyUtil.getJWKKey(getFapiJwkKeyName(testCaseName));
} else {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_DPoP);
}
Expand All @@ -426,7 +433,7 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
String jwkKeyString;

if (testCaseName != null && testCaseName.toUpperCase().contains("FAPI")) {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI);
jwkKeyString = JWKKeyUtil.getJWKKey(getFapiJwkKeyName(testCaseName));
} else {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_DPoP);
}
Expand All @@ -453,7 +460,7 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
String jwkKeyString;

if (testCaseName != null && testCaseName.toUpperCase().contains("FAPI")) {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI);
jwkKeyString = JWKKeyUtil.getJWKKey(getFapiJwkKeyName(testCaseName));
} else {
jwkKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_DPoP);
}
Expand Down Expand Up @@ -806,6 +813,17 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
jsonString = replaceKeywordValue(jsonString, "$OIDC_JWK_KEY_DPoP$", jwkKey);
}

if (jsonString.contains("$OIDC_JWK_KEY_FAPI_JWE$")) {
String jwkKey = "";
if (getTriggerESignetKeyGenForFAPIJWE()) {
jwkKey = JWKKeyUtil.generateAndCacheJWKKey(OIDC_JWK_FOR_FAPI_JWE);
setTriggerESignetKeyGenForFAPIJWE(false);
} else {
jwkKey = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI_JWE);
}
jsonString = replaceKeywordValue(jsonString, "$OIDC_JWK_KEY_FAPI_JWE$", jwkKey);
}

if (jsonString.contains("$OIDC_JWK_KEY_FAPI$")) {
String jwkKey = "";
if (getTriggerESignetKeyGenForFAPI()) {
Expand Down Expand Up @@ -1039,12 +1057,12 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
}
}

if (jsonString.contains("$CLIENT_ASSERTION_FAPI_JWT$")) {
String oidcJWKKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI);
if (jsonString.contains("$CLIENT_ASSERTION_FAPI_JWE_JWT$")) {
String oidcJWKKeyString = JWKKeyUtil.getJWKKey(OIDC_JWK_FOR_FAPI_JWE);
logger.info("oidcJWKKeyString =" + oidcJWKKeyString);
try {
oidc_JWK_Key_For_FAPI = RSAKey.parse(oidcJWKKeyString);
logger.info("oidc_JWK_Key_For_FAPI =" + oidc_JWK_Key_For_FAPI);
oidc_JWK_Key_For_FAPI_JWE = RSAKey.parse(oidcJWKKeyString);
logger.info("oidc_JWK_Key_For_FAPI_JWE =" + oidc_JWK_Key_For_FAPI_JWE);
} catch (java.text.ParseException e) {
logger.error(e.getMessage());
}
Expand All @@ -1062,8 +1080,47 @@ public static String inputstringKeyWordHandeler(String jsonString, String testCa
String tempUrl = getValueFromEsignetWellKnownEndPoint(audKey, EsignetConfigManager.getEsignetBaseUrl());

if (clientId != null) {
jsonString = replaceKeywordValue(jsonString, "$CLIENT_ASSERTION_FAPI_JWE_JWT$",
signJWKKey(clientId, oidc_JWK_Key_For_FAPI_JWE, tempUrl));
} else {
logger.error("Client ID not found in JSON for $CLIENT_ASSERTION_FAPI_JWE_JWT$.");
}
}

if (jsonString.contains("$CLIENT_ASSERTION_FAPI_JWT$")) {
String fapiJwkKeyName = getFapiJwkKeyName(testCaseName);
String oidcJWKKeyString = JWKKeyUtil.getJWKKey(fapiJwkKeyName);
logger.info("oidcJWKKeyString =" + oidcJWKKeyString);
RSAKey fapiSigningKey;
try {
fapiSigningKey = RSAKey.parse(oidcJWKKeyString);
if (OIDC_JWK_FOR_FAPI_JWE.equals(fapiJwkKeyName)) {
oidc_JWK_Key_For_FAPI_JWE = fapiSigningKey;
logger.info("oidc_JWK_Key_For_FAPI_JWE =" + oidc_JWK_Key_For_FAPI_JWE);
} else {
oidc_JWK_Key_For_FAPI = fapiSigningKey;
logger.info("oidc_JWK_Key_For_FAPI =" + oidc_JWK_Key_For_FAPI);
}
} catch (java.text.ParseException e) {
logger.error(e.getMessage());
fapiSigningKey = null;
}

JSONObject root = new JSONObject(jsonString);
String clientId = root.optString("client_id", null);
String audKey = null;

if (root.has("aud_key")) {
audKey = root.optString("aud_key", null);
root.remove("aud_key");
jsonString = root.toString();
}

String tempUrl = getValueFromEsignetWellKnownEndPoint(audKey, EsignetConfigManager.getEsignetBaseUrl());

if (clientId != null && fapiSigningKey != null) {
jsonString = replaceKeywordValue(jsonString, "$CLIENT_ASSERTION_FAPI_JWT$",
signJWKKey(clientId, oidc_JWK_Key_For_FAPI, tempUrl));
signJWKKey(clientId, fapiSigningKey, tempUrl));
} else {
logger.error("Client ID not found in JSON for $CLIENT_ASSERTION_FAPI_JWT$.");
}
Expand Down Expand Up @@ -1959,7 +2016,8 @@ public static String getValueFromEsignetWellKnownEndPoint(String key, String bas
protected static final String OIDCJWK14= "oidcJWK14";
protected static final String OIDC_JWK_FOR_PAR = "oidcJWKForPAR";
protected static final String OIDC_JWK_FOR_DPoP = "oidcJWKForDPoP";
protected static final String OIDC_JWK_FOR_FAPI = "oidcJWKForFAPI";
protected static final String OIDC_JWK_FOR_FAPI = "oidcJWKForFAPI";
protected static final String OIDC_JWK_FOR_FAPI_JWE = "oidcJWKForFAPIJWE";

protected static RSAKey oidcJWKKey1 = null;
protected static RSAKey oidcJWKKey3 = null;
Expand All @@ -1977,6 +2035,7 @@ public static String getValueFromEsignetWellKnownEndPoint(String key, String bas
protected static RSAKey oidc_JWK_Key_For_PAR = null;
protected static RSAKey oidc_JWK_Key_For_DPoP = null;
protected static RSAKey oidc_JWK_Key_For_FAPI = null;
protected static RSAKey oidc_JWK_Key_For_FAPI_JWE = null;

protected static boolean triggerESignetKeyGen1 = true;
protected static boolean triggerESignetKeyGen2 = true;
Expand Down Expand Up @@ -2017,8 +2076,16 @@ public static String getValueFromEsignetWellKnownEndPoint(String key, String bas
protected static boolean triggerESignetKeyGen38 = true;
protected static boolean triggerESignetKeyGenForPAR = true;
protected static boolean triggerESignetKeyGenForDPoP = true;
protected static boolean triggerESignetKeyGenForFAPI = true;
protected static boolean triggerESignetKeyGenForFAPI = true;
protected static boolean triggerESignetKeyGenForFAPIJWE = true;

private static String getFapiJwkKeyName(String testCaseName) {
if (testCaseName != null
&& (testCaseName.contains("forUserInfoJWE") || testCaseName.contains("_GetUserInfoJWE_"))) {
return OIDC_JWK_FOR_FAPI_JWE;
}
return OIDC_JWK_FOR_FAPI;
}

private static boolean gettriggerESignetKeyGen3() {
return triggerESignetKeyGen3;
Expand Down Expand Up @@ -2122,7 +2189,15 @@ private static void setTriggerESignetKeyGenForDPoP(boolean value) {

private static void setTriggerESignetKeyGenForFAPI(boolean value) {
triggerESignetKeyGenForFAPI = value;
}
}

private static boolean getTriggerESignetKeyGenForFAPIJWE() {
return triggerESignetKeyGenForFAPIJWE;
}

private static void setTriggerESignetKeyGenForFAPIJWE(boolean value) {
triggerESignetKeyGenForFAPIJWE = value;
}

private static void settriggerESignetKeyGen2(boolean value) {
triggerESignetKeyGen2 = value;
Expand Down
Loading
Loading