Skip to content
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

ES-1455 #1583

Merged
merged 2 commits into from
Aug 23, 2024
Merged

ES-1455 #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18e6af6
ES-1455
nandhu-kumar Aug 23, 2024
a328d14
Merge remote-tracking branch 'upstream/release-1.3.0-ES' into release…
nandhu-kumar Aug 23, 2024
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
10 changes: 1 addition & 9 deletions automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3529,7 +3529,7 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) {
String esignetBaseURI = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES,
"mosip.iam.token_endpoint");
int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(
GlobalConstants.ESIGNET_DEFAULT_PROPERTIES, GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));
ConfigManager.getActuatorPropertySection(), GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));

Instant instant = Instant.now();

Expand Down Expand Up @@ -3774,10 +3774,7 @@ public static String signJWKForMock(String clientId, String accessToken, RSAKey
}

public static String signJWK(String clientId, String accessToken, RSAKey jwkKey, String testCaseName) {
// String tempUrl = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.base.url");
String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer");
// int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(GlobalConstants.ESIGNET_DEFAULT_PROPERTIES,
// GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));

logger.info("actuatorPropertySection = " + ConfigManager.getActuatorPropertySection());
int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(ConfigManager.getActuatorPropertySection(),
Expand Down Expand Up @@ -5783,7 +5780,6 @@ public static void createAndPublishPolicyForKyc() {
// }

public static String signJWKKeyForMock(String clientId, RSAKey jwkKey) {
// String tempUrl = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.token_endpoint");
String tempUrl = getValueFromEsignetWellKnownEndPoint("token_endpoint");
if (tempUrl.contains("esignet.")) {
tempUrl = tempUrl.replace("esignet.", propsKernel.getProperty("esignetMockBaseURL"));
Expand Down Expand Up @@ -5827,10 +5823,7 @@ public static String signJWKKeyForMock(String clientId, RSAKey jwkKey) {
}

public static String signJWKKey(String clientId, RSAKey jwkKey) {
// String tempUrl = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.token_endpoint");
String tempUrl = getValueFromEsignetWellKnownEndPoint("token_endpoint");
// int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(GlobalConstants.ESIGNET_DEFAULT_PROPERTIES,
// GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));

logger.info("actuatorPropertySection = " + ConfigManager.getActuatorPropertySection());
int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(ConfigManager.getActuatorPropertySection(),
Expand Down Expand Up @@ -5872,7 +5865,6 @@ public static String signJWKKey(String clientId, RSAKey jwkKey) {
public static String getWlaToken(String individualId, RSAKey jwkKey, String certData)
throws JoseException, JOSEException {
String tempUrl = propsKernel.getProperty("validateBindingEndpoint");
//int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(GlobalConstants.ESIGNET_DEFAULT_PROPERTIES,
logger.info("actuatorPropertySection = " + ConfigManager.getActuatorPropertySection());
int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(ConfigManager.getActuatorPropertySection(),
GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));
Expand Down
42 changes: 27 additions & 15 deletions automationtests/src/main/resources/esignet/RegisterUserNegTC/RegisterUserNegTC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,10 +477,11 @@ RegisterUserNegTC:
}
]
}'
ESignet_RegisterUserNegTC_WITH_more_then_9digit_number:
ESignet_RegisterUserNegTC_WITH_more_than_9digit_number:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -505,6 +506,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand Down Expand Up @@ -988,6 +990,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand Down Expand Up @@ -1028,7 +1031,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language",
"errorCode": "invalid_preferredlang",
"errorMessage": "$IGNORE$"
}
]
Expand Down Expand Up @@ -1061,6 +1064,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1085,6 +1089,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone_number,invalid_phone
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1109,6 +1114,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1133,6 +1139,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1157,6 +1164,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1181,6 +1189,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand Down Expand Up @@ -1230,6 +1239,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1254,7 +1264,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_value,invalid_phone_number
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1279,7 +1289,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_value,invalid_phone_number
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1304,6 +1314,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_phone,invalid_phone_number
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand Down Expand Up @@ -1343,7 +1354,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language",
"errorCode": "invalid_preferredlang",
"errorMessage": "$IGNORE$"
}
]
Expand All @@ -1367,7 +1378,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language",
"errorCode": "invalid_preferredlang",
"errorMessage": "$IGNORE$"
}
]
Expand All @@ -1391,7 +1402,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language",
"errorCode": "invalid_preferredlang",
"errorMessage": "$IGNORE$"
}
]
Expand All @@ -1415,7 +1426,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language",
"errorCode": "invalid_preferredlang",
"errorMessage": "$IGNORE$"
}
]
Expand Down Expand Up @@ -1450,6 +1461,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_fullname,invalid_value
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1465,7 +1477,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unknown_error"
"errorCode": "invalid_language"
}
]
}'
Expand All @@ -1474,7 +1486,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_fullname,unsupported_language
allowedErrorCodes: invalid_fullname,unsupported_language,invalid_firstname
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1490,7 +1502,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language"
"errorCode": "invalid_language"
}
]
}'
Expand All @@ -1499,7 +1511,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: unsupported_language,invalid_fullname
allowedErrorCodes: unsupported_language,invalid_fullname,invalid_firstname
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand All @@ -1515,7 +1527,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "unsupported_language"
"errorCode": "invalid_language"
}
]
}'
Expand All @@ -1524,7 +1536,7 @@ RegisterUserNegTC:
endPoint: /v1/signup/registration/register
role: resident
restMethod: post
allowedErrorCodes: invalid_value,invalid_fullname
allowedErrorCodes: invalid_value,invalid_fullname,invalid_firstname
inputTemplate: esignet/RegisterUser/RegisterUser
outputTemplate: esignet/error
input: '{
Expand Down Expand Up @@ -1565,7 +1577,7 @@ RegisterUserNegTC:
output: '{
"errors": [
{
"errorCode": "invalid_value"
"errorCode": "invalid_fullname"
}
]
}'
Expand Down
4 changes: 2 additions & 2 deletions ...ces/esignet/VerifyChallengeForResetPasswordNegTC/VerifyChallengeForResetPasswordNegTC.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ VerifyChallengeForResetPasswordNegTC:
output: '{
"errors": [
{
"errorCode": "invalid_KBA_challenge"
"errorCode": "invalid_KBI_challenge"
}
],
"sendOtpResp":{
Expand Down Expand Up @@ -545,7 +545,7 @@ VerifyChallengeForResetPasswordNegTC:
output: '{
"errors": [
{
"errorCode": "invalid_KBA_challenge"
"errorCode": "invalid_KBI_challenge"
}
],
"sendOtpResp":{
Expand Down
Loading