Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sohandey
Sohandey committed Feb 28, 2024
2 parents aaf2c85 + 6cbd1c1 commit 0b98083
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 44 deletions.
4 changes: 2 additions & 2 deletions automationtests/src/main/java/io/mosip/testrig/apirig/admin/fw/util/AdminTestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3723,7 +3723,7 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) {

public static String signJWKForMock(String clientId, String accessToken, RSAKey jwkKey, String testCaseName) {
// String tempUrl = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.base.url");
String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer") + "/v1/esignet";
String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer");
if (tempUrl.contains("esignet.")) {
tempUrl = tempUrl.replace("esignet.", propsKernel.getProperty("esignetMockBaseURL"));
}
Expand Down Expand Up @@ -3772,7 +3772,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") + "/v1/esignet";
String tempUrl = getValueFromEsignetWellKnownEndPoint("issuer");
int idTokenExpirySecs = Integer.parseInt(getValueFromEsignetActuator(GlobalConstants.ESIGNET_DEFAULT_PROPERTIES,
GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));
JWSSigner signer;
Expand Down
54 changes: 12 additions & 42 deletions ...signet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC.yml
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,70 @@
AuthorizationCodeSunBirdRCNegTC:
ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen1_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen1_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "openid profile"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope2_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Diff_Scope2_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen2_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen2_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "openid profile"}, {scope: "sunbird_rc_insurance_vc_ldp"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Comma_Separated_Scope_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Comma_Separated_Scope_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen3_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen3_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "sunbird_rc_insurance_vc_ldp,openid profile"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Missing_Scope_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Missing_Scope_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen4_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen4_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "$REMOVE$"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Empty_Scope_Neg:
Expand Down Expand Up @@ -131,48 +111,38 @@ AuthorizationCodeSunBirdRCNegTC:
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Invalid_Scope_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Invalid_Scope_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen7_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen7_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "sgsdfhg"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_Null_Scope_Neg:
ESignet_AuthorizationCode_SunBirdRCNegTC_Null_Scope_Pos:
endPoint: $ESIGNETMOCKBASEURL$/v1/esignet/authorization/auth-code
role: resident
restMethod: post
checkErrorsOnlyInResponse: true
validityCheckRequired: true
inputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC
outputTemplate: esignet/error
outputTemplate: esignet/SunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTC/AuthorizationCodeSunBirdRCNegTCRCResult
input: '{
"encodedHash": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen8_AuthCode_Valid_Smoke_sid_encodedResp$",
"requestTime": "$TIMESTAMP$",
"transactionId": "$ID:OAuthDetailsRequest_SunBirdRCNegTC_Scen8_AuthCode_Valid_Smoke_sid_transactionId$",
"permittedAuthorizeScopes": [{scope: "null"}]
}'
output: '{
"errors": [
{
"errorCode": "invalid_permitted_scope"
}
]
}'

ESignet_AuthorizationCode_SunBirdRCNegTC_All_Valid_Smoke_sid:
Expand Down

0 comments on commit 0b98083

Please sign in to comment.