From e2451c64808aa22e8cbda9aa24d939f1ac58fac1 Mon Sep 17 00:00:00 2001 From: prathmeshj12 Date: Thu, 21 May 2026 23:06:05 +0530 Subject: [PATCH 1/3] 1844 - Updated the prompt consent for sunbird test cases and updated the FAPI test cases for mosipid usecase Signed-off-by: prathmeshj12 --- api-test/pom.xml | 2 +- .../apirig/esignet/utils/EsignetUtil.java | 5 +- .../config/testCaseInterDependency_mock.json | 14 +- .../testCaseInterDependency_mosip-id.json | 329 +++--------------- .../testCaseInterDependency_sunbirdrc.json | 68 ---- .../userinfo/GetOidcUserInfo.yml | 10 +- .../FAPI/FAPIGetUserInfo/FAPIGetUserInfo.yml | 10 +- .../FAPIGetUserInfoStatusCodeResult.hbs | 1 + .../FAPIPatchClientConfig.hbs | 24 ++ .../FAPIPatchClientConfig.yml | 26 ++ .../esignet/FAPI/OauthFAPI/OauthFAPI.yml | 2 +- .../esignet/OidcClient/OIDCClient.yml | 24 +- .../esignet/OidcClient/OIDCClientFAPI.hbs | 36 +- .../OAuthDetailsRequestSunBirdC.yml | 2 +- .../OAuthDetailsRequestSunBirdCNegTC.yml | 56 +-- api-test/testNgXmlFiles/esignetSuite.xml | 9 + 16 files changed, 193 insertions(+), 425 deletions(-) create mode 100644 api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfoStatusCodeResult.hbs create mode 100644 api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.hbs create mode 100644 api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.yml diff --git a/api-test/pom.xml b/api-test/pom.xml index eb382ff06..c1690937c 100644 --- a/api-test/pom.xml +++ b/api-test/pom.xml @@ -69,7 +69,7 @@ io.mosip.testrig.apitest.commons apitest-commons - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/esignet/utils/EsignetUtil.java b/api-test/src/main/java/io/mosip/testrig/apirig/esignet/utils/EsignetUtil.java index 5df004e1d..b72d0ec05 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/esignet/utils/EsignetUtil.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/esignet/utils/EsignetUtil.java @@ -225,7 +225,8 @@ public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) { || testCaseName.contains("_AuthenticateUser_V3_MOSIPID_") || testCaseName.contains("_AuthorizationCode_MOSIPID_") || testCaseName.contains("_GenerateToken_MOSIPID_") - || testCaseName.contains("_GetOidcUserInfo_MOSIPID_"))) { + || testCaseName.contains("_GetOidcUserInfo_MOSIPID_") + || testCaseName.contains("FAPIPatchClientConfig_MOSIPID_"))) { throw new SkipException(GlobalConstants.FEATURE_NOT_SUPPORTED_MESSAGE); } @@ -249,7 +250,7 @@ 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_PartialUpdateOIDCClient_MOCK_Invlalid_alg_value_Neg") + || testCaseName.equals("ESignet_PartialUpdateOIDCClient_MOCK_Invlalid_alg_invalid_Public_key_values_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") diff --git a/api-test/src/main/resources/config/testCaseInterDependency_mock.json b/api-test/src/main/resources/config/testCaseInterDependency_mock.json index 619866081..0bfe8a07e 100644 --- a/api-test/src/main/resources/config/testCaseInterDependency_mock.json +++ b/api-test/src/main/resources/config/testCaseInterDependency_mock.json @@ -1028,10 +1028,7 @@ ], "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_E2EMock_01": ["TC_ESignet_OIDCClientV3_E2EMock_01"], "TC_ESignet_OAuthDetailsRequestNonAuth_23": ["TC_ESignet_CreateOIDCClient_V2_03"], - "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_E2EMock_03": [ - "TC_ESignet_OIDCClientV3_E2EMock_03", - "TC_ESignet_UpdateOIDCClientV3_E2EMock_01" - ], + "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_E2EMock_03": ["TC_ESignet_OIDCClientV3_E2EMock_03"], "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_E2EMock_02": ["TC_ESignet_OIDCClientV3_E2EMock_02"], "TC_ESignet_OAuthDetailsRequestNonAuth_25": ["TC_ESignet_CreateOIDCClient_V2_03"], "TC_ESignet_GenerateTokenVerifiedClaims_01": [ @@ -1129,7 +1126,7 @@ ], "TC_ESignet_Oauth_FAPI_forUserInfoJWE_01": [ "TC_ESignet_FAPI_CreateOIDCClient_02", - "TC_ESignet_FAPI_PartialUpdateOIDCClient_01" + "TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01" ], "TC_ESignet_OauthParNegativeScenarios_07": ["TC_ESignet_PARCreateOIDCClientV3_01"], "TC_ESignet_OauthParNegativeScenarios_08": ["TC_ESignet_PARCreateOIDCClientV3_01"], @@ -1368,8 +1365,7 @@ ], "TC_ESignet_FAPI_GetUserInfo_02": [ "TC_ESignet_FAPI_GenerateToken_forUserInfoJWE_01", - "TC_ESignet_FAPI_CreateOIDCClient_02", - "TC_ESignet_FAPI_PartialUpdateOIDCClient_01" + "TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01" ], "TC_ESignet_SendBindingOtp_16": [ "Dependent_Idrepo_AddIdentity_04", @@ -1490,7 +1486,6 @@ "TC_ESignet_OauthDPoP_01" ], "TC_ESignet_GetOidcUserInfoForV3_E2EMock_02": [ - "TC_ESignet_OIDCClientV3_E2EMock_02", "TC_ESignet_PatchOIDCClient_01", "TC_ESignet_GenerateToken_E2EMock_02" ], @@ -1500,8 +1495,7 @@ ], "TC_ESignet_GetOidcUserInfoForV3_E2EMock_03": [ "TC_ESignet_PatchOIDCClient_02", - "TC_ESignet_GenerateToken_E2EMock_03", - "TC_ESignet_OIDCClientV3_E2EMock_03" + "TC_ESignet_GenerateToken_E2EMock_03" ], "TC_ESignet_UpdateOIDCClientV3_09": ["TC_ESignet_CreateOIDCClientV3_01"], "TC_ESignet_UpdateOIDCClientV3_19": ["TC_ESignet_CreateOIDCClientV3_01"], diff --git a/api-test/src/main/resources/config/testCaseInterDependency_mosip-id.json b/api-test/src/main/resources/config/testCaseInterDependency_mosip-id.json index 0606180b2..b042af28e 100644 --- a/api-test/src/main/resources/config/testCaseInterDependency_mosip-id.json +++ b/api-test/src/main/resources/config/testCaseInterDependency_mosip-id.json @@ -136,10 +136,7 @@ "TC_ESignet_CreateOIDCClient_MOSIPID_01", "TC_ESignet_CreateOIDCClient_V2_01" ], - "TC_ESignet_AuthenticateUserV3VerifiedClaims_01": [ - "TC_ESignet_OAuthDetailsRequestV3VerifiedClaims_01", - "Dependent_Idrepo_AddIdentity_45" - ], + "TC_ESignet_AuthenticateUserV3VerifiedClaims_01": [], "TC_ESignet_OAuthDetailsRequest_66": [ "TC_ESignet_CreateOIDCClient_MOSIPID_01", "TC_ESignet_CreateOIDCClient_V2_01" @@ -574,6 +571,7 @@ "Dependent_Idrepo_createPartnerSelfRegistration_04": ["Dependent_Idrepo_definePolicyGroup_01"], "Dependent_Idrepo_createPartnerSelfRegistration_05": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_createPartnerSelfRegistration_08": ["Dependent_Idrepo_definePolicyGroup_02"], + "TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01": ["TC_ESignet_CreateOIDCClient_MOSIPID_30"], "TC_ESignet_Generate_Token_12": ["TC_ESignet_CreateOIDCClient_MOSIPID_01"], "TC_ESignet_Generate_Token_11": [ "TC_ESignet_CreateOIDCClient_MOSIPID_01", @@ -639,68 +637,36 @@ "TC_ESignet_AuthenticateUserV3_WithoutVerifiedClaims_01", "TC_Signup_ESignet_OAuthDetailsRequestV3WithoutVerifiedClaims_01" ], - "TC_ESignet_GetOidcUserInfoForV3_E2E_01": [ - "TC_ESignet_GenerateToken_E2E_01", - "TC_ESignet_UpdateOIDCClientV3_E2E_01" - ], - "TC_ESignet_GetOidcUserInfoForV3_E2E_03": [ - "TC_ESignet_GenerateToken_E2E_03", - "TC_ESignet_UpdateOIDCClientV3_E2E_03" - ], - "TC_ESignet_GetOidcUserInfoForV3_E2E_02": [ - "TC_ESignet_GenerateToken_E2E_02", - "TC_ESignet_UpdateOIDCClientV3_E2E_02" - ], + "TC_ESignet_GetOidcUserInfoForV3_E2E_01": ["TC_ESignet_GenerateToken_E2E_01"], + "TC_ESignet_GetOidcUserInfoForV3_E2E_03": ["TC_ESignet_GenerateToken_E2E_03"], + "TC_ESignet_GetOidcUserInfoForV3_E2E_02": ["TC_ESignet_GenerateToken_E2E_02"], "TC_ESignet_OAuthDetailsRequestSunBirdC_01": ["TC_ESignet_CreatePolicySunBirdR_01"], "TC_ESignet_LinkedAuthConsent_07": [ "TC_ESignet_LinkTransactionConsent_08", "TC_ESignet_LinkedAuthenticationWlaV2_08" ], - "TC_ESignet_BioNonAuth_22": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_22" - ], "TC_ESignet_LinkedAuthConsent_06": [ "TC_ESignet_LinkTransactionConsent_07", "TC_ESignet_LinkedAuthenticationWlaV2_07" ], - "TC_ESignet_BioNonAuth_23": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_24" - ], "TC_ESignet_LinkedAuthConsent_05": [ "TC_ESignet_LinkTransactionConsent_06", "TC_ESignet_LinkedAuthenticationWlaV2_06" ], - "TC_ESignet_BioNonAuth_24": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_26" - ], "TC_ESignet_LinkedAuthConsent_04": [ "TC_ESignet_LinkTransactionConsent_05", "TC_ESignet_LinkedAuthenticationWlaV2_05" ], "Dependent_Idrepo_definePolicy_10": ["Dependent_Idrepo_definePolicyGroup_02"], - "TC_ESignet_GenTokenConsentNoCapture_01": [ - "TC_ESignet_AuthorizationCodeVerifiedClaims_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" - ], + "TC_ESignet_GenTokenConsentNoCapture_01": [], "TC_ESignet_LinkedAuthConsent_09": [ "TC_ESignet_LinkedAuthenticationWlaV2_10", "TC_ESignet_LinkTransactionConsent_10" ], - "TC_ESignet_BioNonAuth_20": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_18" - ], "TC_ESignet_LinkedAuthConsent_08": [ "TC_ESignet_LinkTransactionConsent_09", "TC_ESignet_LinkedAuthenticationWlaV2_09" ], - "TC_ESignet_BioNonAuth_21": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_20" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_29": [ "Dependent_Idrepo_RequestAPIKeyForAuthPartner_01", "Dependent_Idrepo_createPartnerSelfRegistration_01", @@ -794,75 +760,25 @@ "Dependent_Idrepo_definePolicy_06": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_definePolicy_05": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_definePolicy_04": ["Dependent_Idrepo_definePolicyGroup_01"], - "TC_ESignet_BioNonAuth_11": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_23" - ], - "TC_ESignet_BioNonAuth_12": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_25" - ], "TC_ESignet_BioNonAuth_13": [ "Dependent_Idrepo_GenerateVID_04", "TC_ESignet_OAuthDetailsRequestNonAuth_04" ], - "TC_ESignet_BioNonAuth_14": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_06" - ], - "TC_ESignet_BioNonAuth_10": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_21" - ], - "TC_ESignet_BioNonAuth_19": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_16" - ], - "TC_ESignet_GenerateTokenVerifiedClaims_01": [ - "TC_ESignet_AuthorizationCodeVerifiedClaims_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" - ], - "TC_ESignet_BioNonAuth_15": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_08" - ], - "TC_ESignet_BioNonAuth_16": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_10" - ], - "TC_ESignet_BioNonAuth_17": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_12" - ], - "TC_ESignet_BioNonAuth_18": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequestNonAuth_14" + "TC_ESignet_GenerateTokenVerifiedClaims_01": [], + "TC_ESignet_CreateOIDCClient_MOSIPID_30": [ + "Dependent_Idrepo_RequestAPIKeyForAuthPartner_01", + "Dependent_Idrepo_createPartnerSelfRegistration_01", + "Dependent_Idrepo_ApproveAPIKey_01", + "Dependent_Idrepo_GenerateApiKey_01", + "Dependent_Idrepo_definePolicy_01", + "Dependent_Idrepo_uploadPartnerCert_01" ], "Dependent_Idrepo_definePolicy_14": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_definePolicy_13": ["Dependent_Idrepo_definePolicyGroup_02"], - "TC_ESignet_UserInfoConsentNoCapture_01": [ - "TC_ESignet_GenTokenConsentNoCapture_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" - ], + "TC_ESignet_UserInfoConsentNoCapture_01": [], "Dependent_Idrepo_definePolicy_12": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_definePolicy_11": ["Dependent_Idrepo_definePolicyGroup_02"], "Dependent_Idrepo_definePolicy_15": ["Dependent_Idrepo_definePolicyGroup_02"], - "TC_ESignet_BioNonAuth_01": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_03" - ], - "TC_ESignet_BioNonAuth_02": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_05" - ], - "TC_ESignet_BioNonAuth_03": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_07" - ], - "TC_ESignet_BioNonAuth_08": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_17" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_09": [ "Dependent_Idrepo_RequestAPIKeyForAuthPartner_01", "Dependent_Idrepo_createPartnerSelfRegistration_01", @@ -870,10 +786,6 @@ "Dependent_Idrepo_GenerateApiKey_01", "Dependent_Idrepo_uploadPartnerCert_01" ], - "TC_ESignet_BioNonAuth_09": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_19" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_08": [ "Dependent_Idrepo_RequestAPIKeyForAuthPartner_01", "Dependent_Idrepo_createPartnerSelfRegistration_01", @@ -891,19 +803,11 @@ "Dependent_Idrepo_definePolicy_01", "Dependent_Idrepo_uploadPartnerCert_01" ], - "TC_ESignet_BioNonAuth_04": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_09" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_05": [ "Dependent_Idrepo_uploadPartnerCert_08", "Dependent_Idrepo_createPartnerSelfRegistration_08", "Dependent_Idrepo_definePolicy_15" ], - "TC_ESignet_BioNonAuth_05": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_11" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_04": [ "Dependent_Idrepo_ApproveAPIKey_06", "Dependent_Idrepo_createPartnerSelfRegistration_06", @@ -911,10 +815,6 @@ "Dependent_Idrepo_RequestAPIKeyForAuthPartner_06", "Dependent_Idrepo_definePolicy_13" ], - "TC_ESignet_BioNonAuth_06": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_13" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_03": [ "Dependent_Idrepo_createPartnerSelfRegistration_03", "Dependent_Idrepo_uploadPartnerCert_03", @@ -923,10 +823,6 @@ "Dependent_Idrepo_GenerateApiKey_02", "Dependent_Idrepo_RequestAPIKeyForAuthPartner_03" ], - "TC_ESignet_BioNonAuth_07": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequestNonAuth_15" - ], "TC_ESignet_CreateOIDCClient_MOSIPID_02": [ "Dependent_Idrepo_uploadPartnerCert_04", "Dependent_Idrepo_ApproveAPIKey_04", @@ -943,14 +839,12 @@ "Dependent_Idrepo_definePolicy_01", "Dependent_Idrepo_uploadPartnerCert_01" ], - "TC_ESignet_GenTokenConsentNoCaptureNegTC_02": [ - "TC_ESignet_AuthorizationCodeVerifiedClaims_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" - ], + "TC_ESignet_GenTokenConsentNoCaptureNegTC_02": [], "TC_ESignet_Oauth_FAPI_01": ["TC_ESignet_CreateOIDCClient_MOSIPID_29"], - "TC_ESignet_GenTokenConsentNoCaptureNegTC_01": [ - "TC_ESignet_AuthorizationCodeVerifiedClaims_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" + "TC_ESignet_GenTokenConsentNoCaptureNegTC_01": [], + "TC_ESignet_Oauth_FAPI_forUserInfoJWE_01": [ + "TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01", + "TC_ESignet_CreateOIDCClient_MOSIPID_30" ], "TC_ESignet_CreateOIDCClient_MOSIPID_19": [ "Dependent_Idrepo_RequestAPIKeyForAuthPartner_01", @@ -1108,11 +1002,6 @@ "Dependent_Idrepo_GenerateApiKey_01", "Dependent_Idrepo_AddIdentity_06" ], - "TC_ESignet_SendBindingOtp_03": [ - "Dependent_Idrepo_createPartnerSelfRegistration_01", - "Dependent_Idrepo_AddIdentity_05", - "Dependent_Idrepo_GenerateApiKey_01" - ], "TC_ESignet_SendBindingOtp_02": [ "Dependent_Idrepo_createPartnerSelfRegistration_01", "Dependent_Idrepo_GenerateApiKey_01", @@ -1264,8 +1153,6 @@ "Dependent_Idrepo_GenerateVID_01" ], "TC_ESignet_AuthorizationCodeVerifiedClaims_01": [ - "TC_ESignet_OAuthDetailsRequestConsentNoCapture_01", - "TC_ESignet_OAuthDetailsRequestV3VerifiedClaims_01", "TC_ESignet_AuthenticateUserV3VerifiedClaims_01", "TC_ESignet_AuthenticateConsentNoCapture_01" ], @@ -1480,6 +1367,10 @@ "Dependent_Idrepo_createPartnerSelfRegistration_01", "Dependent_Idrepo_GenerateApiKey_01" ], + "TC_ESignet_FAPI_GenerateToken_forUserInfoJWE_01": [ + "TC_ESignet_CreateOIDCClient_MOSIPID_30", + "TC_ESignet_FAPI_AuthorizationCode_02" + ], "TC_ESignet_WalletBinding_24": [ "Dependent_Idrepo_AddIdentity_04", "Dependent_Idrepo_createPartnerSelfRegistration_01", @@ -1684,6 +1575,10 @@ "Dependent_Idrepo_uploadCACert_02": ["Dependent_Idrepo_createPartnerSelfRegistration_01"], "Dependent_Idrepo_uploadCACert_05": ["Dependent_Idrepo_createPartnerSelfRegistration_03"], "Dependent_Idrepo_uploadCACert_04": ["Dependent_Idrepo_createPartnerSelfRegistration_02"], + "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01": [ + "TC_ESignet_Oauth_FAPI_forUserInfoJWE_01", + "TC_ESignet_CreateOIDCClient_MOSIPID_30" + ], "TC_ESignet_DPoPGetUserInfo_01": [ "TC_ESignet_DPoPGenerateToken_01", "TC_ESignet_CreateOIDCClient_MOSIPID_25" @@ -1729,6 +1624,10 @@ "TC_ESignet_LinkTransaction_01" ], "TC_ESignet_GetLinkStatus_19": ["TC_ESignet_OAuthDetailsRequestLinked_07"], + "TC_ESignet_FAPI_AuthorizationCode_02": [ + "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01", + "TC_ESignet_FAPI_AuthenticateUserV3_02" + ], "TC_ESignet_GetLinkStatus_18": ["TC_ESignet_OAuthDetailsRequestLinked_07"], "TC_ESignet_WalletBinding_01": [ "Dependent_Idrepo_AddIdentity_04", @@ -1888,6 +1787,10 @@ "Dependent_Idrepo_AddIdentity_03", "TC_ESignet_OAuthDetailsRequest_08" ], + "TC_ESignet_FAPI_AuthenticateUserV3_02": [ + "Dependent_Idrepo_AddIdentity_48", + "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01" + ], "TC_ESignet_AuthenticateUser_18": [ "Dependent_Idrepo_AddIdentity_03", "TC_ESignet_OAuthDetailsRequest_08" @@ -1896,10 +1799,6 @@ "Dependent_Idrepo_AddIdentity_48", "TC_ESignet_FAPI_OauthDetails_01" ], - "TC_ESignet_FAPI_AuthenticateUserV3_02": [ - "Dependent_Idrepo_AddIdentity_48", - "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01" - ], "TC_ESignet_SendOtp_27": [ "Dependent_Idrepo_GenerateVID_09", "TC_ESignet_OAuthDetailsRequest_01" @@ -1950,10 +1849,7 @@ "Dependent_Idrepo_AddIdentity_01", "TC_ESignet_OAuthDetailsRequest_03" ], - "TC_ESignet_AuthenticateUser_03": [ - "Dependent_Idrepo_AddIdentity_16", - "TC_ESignet_OAuthDetailsRequest_04" - ], + "TC_ESignet_AuthenticateUser_03": [], "TC_ESignet_AuthenticateUser_02": [ "Dependent_Idrepo_AddIdentity_01", "TC_ESignet_OAuthDetailsRequest_02" @@ -2269,20 +2165,14 @@ "Dependent_Idrepo_AddIdentity_03", "Dependent_Idrepo_GenerateVID_09" ], - "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_02": [ - "TC_ESignet_CreateOIDCClient_MOSIPID_22", - "TC_ESignet_UpdateOIDCClientV3_E2E_02" - ], + "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_02": ["TC_ESignet_CreateOIDCClient_MOSIPID_22"], "TC_ESignet_DPoPOauthDetailsNegativeScenarios_02": ["TC_ESignet_OauthDPoP_01"], "TC_ESignet_AuthenticateUser_45": [ "TC_ESignet_OAuthDetailsRequest_09", "Dependent_Idrepo_AddIdentity_03", "Dependent_Idrepo_GenerateVID_09" ], - "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_01": [ - "TC_ESignet_CreateOIDCClient_MOSIPID_21", - "TC_ESignet_UpdateOIDCClientV3_E2E_01" - ], + "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_01": ["TC_ESignet_CreateOIDCClient_MOSIPID_21"], "TC_ESignet_DPoPOauthDetailsNegativeScenarios_01": [ "TC_ESignet_OauthDPoP_01", "TC_ESignet_CreateOIDCClient_MOSIPID_25" @@ -2316,10 +2206,7 @@ "TC_ESignet_OAuthDetailsRequest_09", "Dependent_Idrepo_GenerateVID_09" ], - "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_03": [ - "TC_ESignet_CreateOIDCClient_MOSIPID_23", - "TC_ESignet_UpdateOIDCClientV3_E2E_03" - ], + "TC_ESignet_OAuthDetailsRequestV3_Prerequisite_03": ["TC_ESignet_CreateOIDCClient_MOSIPID_23"], "TC_ESignet_AuthorizationCode_09": [ "TC_ESignet_AuthenticateUser_02", "TC_ESignet_OAuthDetailsRequest_02" @@ -2384,8 +2271,8 @@ "TC_ESignet_LinkedAuthenticationWla_03": [ "Dependent_Idrepo_createPartnerSelfRegistration_03", "Dependent_Idrepo_AddIdentity_11", - "Dependent_Idrepo_GenerateApiKey_02", - "TC_ESignet_LinkTransaction_03" + "TC_ESignet_LinkTransaction_03", + "Dependent_Idrepo_GenerateApiKey_02" ], "TC_ESignet_SendOtp_05": [ "Dependent_Idrepo_AddIdentity_03", @@ -2519,36 +2406,8 @@ "TC_ESignet_AuthenticateUser_05", "TC_ESignet_OAuthDetailsRequest_05" ], - "TC_ESignet_BioAuth_07": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_15" - ], - "TC_ESignet_BioAuth_08": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_16" - ], "TC_ESignet_OAuthDetailsRequestNonAuth_21": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], - "TC_ESignet_BioAuth_09": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_17" - ], "TC_ESignet_OAuthDetailsRequestNonAuth_20": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], - "TC_ESignet_BioAuth_03": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_11" - ], - "TC_ESignet_BioAuth_04": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_12" - ], - "TC_ESignet_BioAuth_05": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_13" - ], - "TC_ESignet_BioAuth_06": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_14" - ], "TC_ESignet_LinkedAuthorizationConsent_01": [ "TC_ESignet_LinkTransaction_05", "TC_ESignet_LinkedAuthenticationWla_01" @@ -2599,14 +2458,6 @@ "TC_ESignet_LinkTransactionConsent_10" ], "TC_ESignet_OAuthDetailsRequestNonAuth_26": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], - "TC_ESignet_BioAuth_01": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_21" - ], - "TC_ESignet_BioAuth_02": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_10" - ], "TC_ESignet_OAuthDetailsRequestNonAuth_23": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], "TC_ESignet_OAuthDetailsRequestNonAuth_22": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], "TC_ESignet_OAuthDetailsRequestNonAuth_25": ["TC_ESignet_CreateOIDCClient_MOSIPID_02"], @@ -2924,32 +2775,14 @@ "TC_ESignet_CreateOIDCClient_MOSIPID_22", "TC_ESignet_AuthCode_E2E_02" ], - "TC_ESignet_FAPI_GetUserInfo_01": [ - "TC_ESignet_CreateOIDCClient_MOSIPID_29", - "TC_ESignet_FAPI_GenerateToken_01" - ], "TC_ESignet_FAPI_GetUserInfo_02": [ "TC_ESignet_FAPI_GenerateToken_forUserInfoJWE_01", - "TC_ESignet_FAPI_CreateOIDCClient_02", - "TC_ESignet_FAPI_PartialUpdateOIDCClient_01" + "TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01" ], - "TC_ESignet_FAPI_GenerateToken_forUserInfoJWE_01": [ - "TC_ESignet_FAPI_CreateOIDCClient_02", - "TC_ESignet_FAPI_AuthorizationCode_02" - ], - "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01": [ - "TC_ESignet_Oauth_FAPI_forUserInfoJWE_01", - "TC_ESignet_FAPI_CreateOIDCClient_02" - ], - "TC_ESignet_FAPI_AuthorizationCode_02": [ - "TC_ESignet_FAPI_OauthDetails_forUserInfoJWE_01", - "TC_ESignet_FAPI_AuthenticateUserV3_02" - ], - "TC_ESignet_Oauth_FAPI_forUserInfoJWE_01": [ - "TC_ESignet_FAPI_CreateOIDCClient_02", - "TC_ESignet_FAPI_PartialUpdateOIDCClient_01" + "TC_ESignet_FAPI_GetUserInfo_01": [ + "TC_ESignet_CreateOIDCClient_MOSIPID_29", + "TC_ESignet_FAPI_GenerateToken_01" ], - "TC_ESignet_FAPI_PartialUpdateOIDCClient_01": ["TC_ESignet_FAPI_CreateOIDCClient_02"], "TC_ESignet_AuthenticateUserConsent_04": [ "TC_ESignet_OAuthDetailsRequestConsent_05", "Dependent_Idrepo_AddIdentity_17", @@ -3066,10 +2899,7 @@ "TC_ESignet_OauthPar_01", "TC_ESignet_CreateOIDCClient_MOSIPID_25" ], - "TC_ESignet_GetOidcUserInfoVerifiedClaims_01": [ - "TC_ESignet_GenerateTokenVerifiedClaims_01", - "TC_ESignet_CreateOIDCClient_MOSIPID_26" - ], + "TC_ESignet_GetOidcUserInfoVerifiedClaims_01": [], "TC_ESignet_SearchPolicySunBirdR_01": ["TC_ESignet_GetPolicySunBirdR_01"], "TC_ESignet_UpdateOIDCClientV3_09": ["TC_ESignet_CreateOIDCClientV3_01"], "TC_ESignet_UpdateOIDCClientV3_19": ["TC_ESignet_CreateOIDCClientV3_01"], @@ -3399,59 +3229,12 @@ "TC_ESignet_LinkedAuthConsent_01", "TC_ESignet_GenerateLinkCodeConsent_01" ], - "TC_ESignet_BioAuth_21": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_30" - ], - "TC_ESignet_BioAuth_22": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_31" - ], - "TC_ESignet_BioAuth_23": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_32" - ], - "TC_ESignet_BioAuth_24": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_33" - ], - "TC_ESignet_BioAuth_20": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_29" - ], - "TC_ESignet_BioAuth_18": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_27" - ], - "TC_ESignet_BioAuth_19": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_28" - ], "TC_ESignet_GenerateLinkCode_02": ["TC_ESignet_OAuthDetailsRequestLinked_02"], "TC_ESignet_GenerateLinkCode_01": ["TC_ESignet_OAuthDetailsRequestLinked_01"], - "TC_ESignet_BioAuth_14": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_23" - ], - "TC_ESignet_BioAuth_15": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_24" - ], - "TC_ESignet_BioAuth_16": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_25" - ], - "TC_ESignet_BioAuth_17": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_26" - ], "TC_ESignet_GenerateLinkCode_08": ["TC_ESignet_OAuthDetailsRequestLinked_07"], "TC_ESignet_GenerateLinkCode_07": ["TC_ESignet_OAuthDetailsRequestLinked_07"], "TC_ESignet_GenerateLinkCode_09": ["TC_ESignet_OAuthDetailsRequestLinked_07"], - "TC_ESignet_AuthenticateConsentNoCapture_01": [ - "TC_ESignet_OAuthDetailsRequestConsentNoCapture_01", - "Dependent_Idrepo_AddIdentity_45" - ], + "TC_ESignet_AuthenticateConsentNoCapture_01": [], "TC_ESignet_GenerateLinkCode_04": ["TC_ESignet_OAuthDetailsRequestLinked_04"], "TC_ESignet_GenerateLinkCode_03": ["TC_ESignet_OAuthDetailsRequestLinked_03"], "TC_ESignet_GenerateLinkCode_06": ["TC_ESignet_OAuthDetailsRequestLinked_06"], @@ -3499,26 +3282,10 @@ "TC_ESignet_CreateOIDCClient_MOSIPID_01", "TC_ESignet_CreateOIDCClient_V2_01" ], - "TC_ESignet_BioAuth_10": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_18" - ], "TC_ESignet_OAuthDetailsRequest_01": [ "TC_ESignet_CreateOIDCClient_MOSIPID_01", "TC_ESignet_CreateOIDCClient_V2_01" ], - "TC_ESignet_BioAuth_11": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_19" - ], - "TC_ESignet_BioAuth_12": [ - "Dependent_Idrepo_AddIdentity_14", - "TC_ESignet_OAuthDetailsRequest_20" - ], - "TC_ESignet_BioAuth_13": [ - "Dependent_Idrepo_GenerateVID_04", - "TC_ESignet_OAuthDetailsRequest_22" - ], "Dependent_Idrepo_uploadPartnerCert_01": [ "Dependent_Idrepo_uploadCACert_01", "Dependent_Idrepo_createPartnerSelfRegistration_01", diff --git a/api-test/src/main/resources/config/testCaseInterDependency_sunbirdrc.json b/api-test/src/main/resources/config/testCaseInterDependency_sunbirdrc.json index d36ff4f9a..c4e900c43 100644 --- a/api-test/src/main/resources/config/testCaseInterDependency_sunbirdrc.json +++ b/api-test/src/main/resources/config/testCaseInterDependency_sunbirdrc.json @@ -227,73 +227,5 @@ "TC_ESignet_OAuthDetailsRequestSunBirdC_01": [ "TC_ESignet_CreateOIDCClientV2SunBirdC_01", "TC_ESignet_CreatePolicySunBirdR_01" - ], - "TC_ESignet_GetCredentialSunBirdC_01": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdC_01" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_01": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_02": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_03": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_04": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_05": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_06": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_07": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_08": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_09": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_10": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_11": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_12": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_13": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_14": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_15": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" - ], - "TC_ESignet_GetCredentialSunBirdCNegTC_16": [ - "TC_ESignet_CreateOIDCClientV2SunBirdC_01", - "TC_ESignet_GenerateTokenSunBirdCNegTC_06" ] } \ No newline at end of file diff --git a/api-test/src/main/resources/esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo.yml b/api-test/src/main/resources/esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo.yml index 99f913e9c..919801695 100644 --- a/api-test/src/main/resources/esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo.yml +++ b/api-test/src/main/resources/esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo.yml @@ -28,7 +28,7 @@ GetOidcUserInfo: "idpAccessToken": "$ID:GenerateToken_MOCK_uin_Valid_forUserInfoJWE_Smoke_sid_access_token$" }' output: "200" - ESignet_GetOidcUserInfo_MOCK_uin_IdpAccessToken_GetUserInfoJWE_toUpdatedJWEInfo_Valid_Smoke: + ESignet_GetOidcUserInfo_MOCK_uin_IdpAccessToken_StatusCode_toUpdatedJWEInfo_Valid_Smoke: endPoint: /v1/esignet/oidc/userinfo uniqueIdentifier: TC_ESignet_GetOidcUserInfoForV3_E2EMock_03 description: Get OIDC user info with all valid details UIN @@ -37,13 +37,11 @@ GetOidcUserInfo: validityCheckRequired: true additionalDependencies: TC_ESignet_PatchOIDCClient_02 inputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo - outputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfoDecryptResult + outputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfoResult input: '{ "idpAccessToken": "$ID:GenerateToken_MOCK_uin_Valid_forUserInfoUpdatedJWE_Smoke_sid_access_token$" }' - output: '{ - "aud": "$ID:CreateOIDCClientV3_MOCK_all_Valid_forUserInfoToUpdateClient_Smoke_sid_clientId$" -}' + output: "200" ESignet_GetOidcUserInfo_MOCK_uin_IdpAccessToken_StatusCode_EmptyAccessToken_Neg: endPoint: /v1/esignet/oidc/userinfo uniqueIdentifier: TC_ESignet_GetOidcUserInfoForV3_E2EMock_04 @@ -52,7 +50,7 @@ GetOidcUserInfo: restMethod: get validityCheckRequired: true inputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfo - outputTemplate: esignet/GetOidcUserInfo/GetOidcUserInfoResult + outputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfoResult input: '{ "idpAccessToken": "" }' diff --git a/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfo.yml b/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfo.yml index 894cc4f4f..002d4b049 100644 --- a/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfo.yml +++ b/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfo.yml @@ -17,22 +17,20 @@ FAPIGetUserInfo: output: '{ "aud": "$ID:CreateOIDCClientFAPI_all_Valid_Smoke_sid_clientId$" }' - ESignet_GetOidcUserInfo_FAPI_UIN_Dpop_AccessToken_GetUserInfoJWE_Valid_Smoke: + ESignet_GetOidcUserInfo_FAPI_UIN_Dpop_AccessToken_StatusCode_forUserInfoJWE_Valid_Smoke: endPoint: /v1/esignet/oidc/userinfo uniqueIdentifier: TC_ESignet_FAPI_GetUserInfo_02 description: Get OIDC user info with JWE response for FAPI PAR DPoP PKCE flow role: resident restMethod: get validityCheckRequired: true - additionalDependencies: TC_ESignet_FAPI_PartialUpdateOIDCClient_01 + additionalDependencies: TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01 inputTemplate: esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfo - outputTemplate: esignet/EndToEndFlowWithV3MOCK/userinfo/GetOidcUserInfoDecryptResult + outputTemplate: esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfoStatusCodeResult input: '{ "dpop_access_token": "$ID:GenerateToken_FAPI_DPoP_AuthToken_Xsrf_Valid_forUserInfoJWE_Smoke_sid_access_token$", "authorization_key": "Authorization", "dpop_key": "DPoP", "dpop_value": "$DPOP_PROOF_WITH_ACCESS_TOKEN$" }' - output: '{ - "aud": "$ID:CreateOIDCClientFAPI_all_Valid_forUserInfoJWE_Smoke_sid_clientId$" -}' \ No newline at end of file + output: "200" \ No newline at end of file diff --git a/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfoStatusCodeResult.hbs b/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfoStatusCodeResult.hbs new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/api-test/src/main/resources/esignet/FAPI/FAPIGetUserInfo/FAPIGetUserInfoStatusCodeResult.hbs @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.hbs b/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.hbs new file mode 100644 index 000000000..d6ceb96bf --- /dev/null +++ b/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.hbs @@ -0,0 +1,24 @@ +{ + "clientId": "{{clientId}}", + "requestTime": "{{requestTime}}", + "request": { + "additionalConfig": { + "userinfo_response_type": "{{userinfo_response_type}}", + "purpose": { + "type": "{{purpose_type}}", + "title": { + "@none": "{{purpose_title}}" + }, + "subTitle": { + "@none": "{{purpose_subTitle}}" + } + }, + "signup_banner_required": {{signup_banner_required}}, + "forgot_pwd_link_required": {{forgot_pwd_link_required}}, + "consent_expire_in_mins": {{consent_expire_in_mins}}, + "require_pushed_authorization_requests": {{require_pushed_authorization_requests}}, + "dpop_bound_access_tokens": {{dpop_bound_access_tokens}}, + "require_pkce": {{require_pkce}} + } + } +} diff --git a/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.yml b/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.yml new file mode 100644 index 000000000..f864e9151 --- /dev/null +++ b/api-test/src/main/resources/esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig.yml @@ -0,0 +1,26 @@ +FAPIPatchClientConfig: + ESignet_FAPIPatchClientConfig_MOSIPID_JWE_Smoke_sid: + endPoint: /v1/esignet/client-mgmt/client/{clientId} + uniqueIdentifier: TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01 + description: Patch FAPI OIDC client additionalConfig on eSignet for JWE userinfo (MOSIP ID only) + role: partner + restMethod: patch + inputTemplate: esignet/FAPI/FAPIPatchClientConfig/FAPIPatchClientConfig + outputTemplate: esignet/PartialUpdateOIDCClient/PartialUpdateOIDCClientResult + input: '{ + "requestTime": "$TIMESTAMP$", + "clientId": "$ID:CreateOIDCClientFAPI_all_Valid_forUserInfoJWE_Smoke_sid_clientId$", + "userinfo_response_type": "JWE", + "purpose_title": "title", + "purpose_type": "verify", + "purpose_subTitle": "subtitle", + "signup_banner_required": true, + "forgot_pwd_link_required": true, + "consent_expire_in_mins": 30, + "require_pushed_authorization_requests": true, + "dpop_bound_access_tokens": true, + "require_pkce": true +}' + output: '{ + "status": "ACTIVE" +}' diff --git a/api-test/src/main/resources/esignet/FAPI/OauthFAPI/OauthFAPI.yml b/api-test/src/main/resources/esignet/FAPI/OauthFAPI/OauthFAPI.yml index 181597f82..34636b3a1 100644 --- a/api-test/src/main/resources/esignet/FAPI/OauthFAPI/OauthFAPI.yml +++ b/api-test/src/main/resources/esignet/FAPI/OauthFAPI/OauthFAPI.yml @@ -36,7 +36,7 @@ OauthFAPI: role: resident restMethod: post checkErrorsOnlyInResponse: true - additionalDependencies: TC_ESignet_FAPI_PartialUpdateOIDCClient_01 + additionalDependencies: TC_ESignet_FAPI_PatchOIDCClientAdditionalConfig_01 inputTemplate: esignet/FAPI/OauthFAPI/OauthFAPI outputTemplate: esignet/FAPI/OauthFAPI/OauthFAPIResult input: '{ diff --git a/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml b/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml index e2b36132b..9c523cbba 100644 --- a/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml +++ b/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml @@ -713,12 +713,16 @@ CreateOIDCClient: "authPartnerId": "$ID:PartnerSelfRegistration_All_Valid_Smoke_sid_partnerId$", "logoUri": "https://health-services.com/logo.png", "redirectUris": "$IDPREDIRECTURI$", + "userClaims1": "name", + "userClaims2": "email", + "userClaims3": "gender", + "userClaims4": "phone_number", + "userClaims5": "birthdate", + "authContextRefs": [{acrValues: "mosip:idp:acr:static-code"},{acrValues: "mosip:idp:acr:generated-code"},{acrValues: "mosip:idp:acr:biometrics"}], "grantTypes": "authorization_code", "clientAuthMethods": "private_key_jwt", - "userinfo_response_type": "JWE", - "require_pushed_authorization_requests": true, - "dpop_bound_access_tokens": true, - "require_pkce": true + "keyLang1": "$1STLANG$", + "clientNameLang": "MOSIP FAPI OIDC Client" }' output: '{ "status": "ACTIVE" @@ -739,12 +743,16 @@ CreateOIDCClient: "authPartnerId": "$ID:PartnerSelfRegistration_All_Valid_Smoke_sid_partnerId$", "logoUri": "https://health-services.com/logo.png", "redirectUris": "$IDPREDIRECTURI$", + "userClaims1": "name", + "userClaims2": "email", + "userClaims3": "gender", + "userClaims4": "phone_number", + "userClaims5": "birthdate", + "authContextRefs": [{acrValues: "mosip:idp:acr:static-code"},{acrValues: "mosip:idp:acr:generated-code"},{acrValues: "mosip:idp:acr:biometrics"}], "grantTypes": "authorization_code", "clientAuthMethods": "private_key_jwt", - "userinfo_response_type": "JWE", - "require_pushed_authorization_requests": true, - "dpop_bound_access_tokens": true, - "require_pkce": true + "keyLang1": "$1STLANG$", + "clientNameLang": "MOSIP FAPI OIDC Client" }' output: '{ "status": "ACTIVE" diff --git a/api-test/src/main/resources/esignet/OidcClient/OIDCClientFAPI.hbs b/api-test/src/main/resources/esignet/OidcClient/OIDCClientFAPI.hbs index 71d9d98db..8fe663f58 100644 --- a/api-test/src/main/resources/esignet/OidcClient/OIDCClientFAPI.hbs +++ b/api-test/src/main/resources/esignet/OidcClient/OIDCClientFAPI.hbs @@ -6,19 +6,29 @@ "authPartnerId": "{{authPartnerId}}", "logoUri": "{{logoUri}}", "redirectUris": [ - "{{redirectUris}}" - ], + "{{redirectUris}}" + ], + "userClaims": [ + "{{userClaims1}}", + "{{userClaims2}}", + "{{userClaims3}}", + "{{userClaims4}}", + "{{userClaims5}}" + ], + "authContextRefs": [ + {{#each authContextRefs}} + "{{acrValues}}" + {{#unless @last}},{{/unless}} + {{/each}} + ], "grantTypes": [ - "{{grantTypes}}" - ], + "{{grantTypes}}" + ], "clientAuthMethods": [ - "{{clientAuthMethods}}" - ], - "additionalConfig": { - "require_pushed_authorization_requests": {{require_pushed_authorization_requests}}, - "dpop_bound_access_tokens": {{dpop_bound_access_tokens}}, - "require_pkce": {{require_pkce}}, - "userinfo_response_type": "{{userinfo_response_type}}" - } + "{{clientAuthMethods}}" + ], + "clientNameLangMap": { + "{{keyLang1}}": "{{clientNameLang}}" + } } -} \ No newline at end of file +} diff --git a/api-test/src/main/resources/esignet/SunBirdC/OAuthDetailsRequestSunBirdC/OAuthDetailsRequestSunBirdC.yml b/api-test/src/main/resources/esignet/SunBirdC/OAuthDetailsRequestSunBirdC/OAuthDetailsRequestSunBirdC.yml index 41a8fa558..b861d720c 100644 --- a/api-test/src/main/resources/esignet/SunBirdC/OAuthDetailsRequestSunBirdC/OAuthDetailsRequestSunBirdC.yml +++ b/api-test/src/main/resources/esignet/SunBirdC/OAuthDetailsRequestSunBirdC/OAuthDetailsRequestSunBirdC.yml @@ -16,7 +16,7 @@ OAuthDetailsRequestSunBirdC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", diff --git a/api-test/src/main/resources/esignet/SunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC.yml b/api-test/src/main/resources/esignet/SunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC.yml index c3264da4f..f0e9d8e61 100644 --- a/api-test/src/main/resources/esignet/SunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC.yml +++ b/api-test/src/main/resources/esignet/SunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC/OAuthDetailsRequestSunBirdCNegTC.yml @@ -16,7 +16,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge mosip:idp:acr:generated-code mosip:idp:acr:linked-wallet mosip:idp:acr:biometrics", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -44,7 +44,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -76,7 +76,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -109,7 +109,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -141,7 +141,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -169,7 +169,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -196,7 +196,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -224,7 +224,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -257,7 +257,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -289,7 +289,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -317,7 +317,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -349,7 +349,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -381,7 +381,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -414,7 +414,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -443,7 +443,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -472,7 +472,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -501,7 +501,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -530,7 +530,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -559,7 +559,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -588,7 +588,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -617,7 +617,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -646,7 +646,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -675,7 +675,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -704,7 +704,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -733,7 +733,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -762,7 +762,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -791,7 +791,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", @@ -820,7 +820,7 @@ OAuthDetailsRequestSunBirdCNegTC: "responseType": "code", "redirectUri": "$IDPREDIRECTURI$", "display": "popup", - "prompt": "login", + "prompt": "consent", "acrValues": "mosip:idp:acr:knowledge", "nonce": "$UNIQUENONCEVALUEFORESIGNET$", "state": "eree2311", diff --git a/api-test/testNgXmlFiles/esignetSuite.xml b/api-test/testNgXmlFiles/esignetSuite.xml index c19476a14..a8ff92dd8 100644 --- a/api-test/testNgXmlFiles/esignetSuite.xml +++ b/api-test/testNgXmlFiles/esignetSuite.xml @@ -1026,6 +1026,15 @@ + + + + + + + Date: Thu, 21 May 2026 23:25:19 +0530 Subject: [PATCH 2/3] 1844 - Updated the prompt consent for sunbird test cases and updated the FAPI test cases for mosipid usecase Signed-off-by: prathmeshj12 --- api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml b/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml index 9c523cbba..b2992faa5 100644 --- a/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml +++ b/api-test/src/main/resources/esignet/OidcClient/OIDCClient.yml @@ -718,7 +718,7 @@ CreateOIDCClient: "userClaims3": "gender", "userClaims4": "phone_number", "userClaims5": "birthdate", - "authContextRefs": [{acrValues: "mosip:idp:acr:static-code"},{acrValues: "mosip:idp:acr:generated-code"},{acrValues: "mosip:idp:acr:biometrics"}], + "authContextRefs": [{"acrValues": "mosip:idp:acr:static-code"},{"acrValues": "mosip:idp:acr:generated-code"},{"acrValues": "mosip:idp:acr:biometrics"}], "grantTypes": "authorization_code", "clientAuthMethods": "private_key_jwt", "keyLang1": "$1STLANG$", @@ -748,7 +748,7 @@ CreateOIDCClient: "userClaims3": "gender", "userClaims4": "phone_number", "userClaims5": "birthdate", - "authContextRefs": [{acrValues: "mosip:idp:acr:static-code"},{acrValues: "mosip:idp:acr:generated-code"},{acrValues: "mosip:idp:acr:biometrics"}], + "authContextRefs": [{"acrValues": "mosip:idp:acr:static-code"},{"acrValues": "mosip:idp:acr:generated-code"},{"acrValues": "mosip:idp:acr:biometrics"}], "grantTypes": "authorization_code", "clientAuthMethods": "private_key_jwt", "keyLang1": "$1STLANG$", From a551029d75b44abbea0a4c6fd7593b4d3f004042 Mon Sep 17 00:00:00 2001 From: prathmeshj12 Date: Fri, 22 May 2026 14:04:50 +0530 Subject: [PATCH 3/3] Updated prompt consent handling for Sunbird test cases and enhanced FAPI test cases for MOSIP ID use case Signed-off-by: prathmeshj12 --- api-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-test/pom.xml b/api-test/pom.xml index c1690937c..5f9dcb873 100644 --- a/api-test/pom.xml +++ b/api-test/pom.xml @@ -69,7 +69,7 @@ io.mosip.testrig.apitest.commons apitest-commons - 1.7.0-SNAPSHOT + 1.6.0