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

Develop #1306

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Develop #1306

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
584a9ca
MOSIP-34894
Sohandey Aug 1, 2024
ce23875
MOSIP-34894 resolved conflicts
Sohandey Aug 1, 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
6 changes: 6 additions & 0 deletions ...est/src/main/java/io/mosip/testrig/apirig/testscripts/DemoAuthSimplePostForAutoGenId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,12 @@ public void test(TestCaseDTO testCaseDTO)
throw new AdminTestException("Failed at output validation");
}
} else {
if (testCaseName.contains("partnerDemoDown")) {

//url = ConfigManager.getAuthDemoServiceUrl() + "local";
} else {
//url = ConfigManager.getAuthDemoServiceUrl();
}

response = postWithBodyAndCookie(url + testCaseDTO.getEndPoint(), inputJson, COOKIENAME,
testCaseDTO.getRole(), testCaseDTO.getTestCaseName());
Expand Down
8 changes: 7 additions & 1 deletion apitest/src/main/java/io/mosip/testrig/apirig/testscripts/MultiFactorAuthNew.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
// {
// testCaseDTO.setEndPoint(testCaseDTO.getEndPoint().replace("$partnerKeyURL$", ekycPartnerKeyUrl));
// }
String otpChannel="";
String otpRequest = null, sendOtpReqTemplate = null, sendOtpEndPoint = null, otpIdentyEnryptRequestPath = null;
if(req.has("otpChannel")) {
otpChannel = req.get("otpChannel").toString();
}
if(req.has("sendOtp")) {
otpRequest = req.get("sendOtp").toString();
req.remove("sendOtp");
Expand Down Expand Up @@ -171,7 +175,9 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
identityRequestEncUrl = identityReqJson.getString("identityRequestEncUrl");
identityReqJson.remove("identityRequestEncUrl");
identityRequest = getJsonFromTemplate(identityReqJson.toString(), identityRequestTemplate);
String identyEnryptRequest = updateTimestampOtp(identityRequest);
otpChannel = inputJsonKeyWordHandeler(otpChannel, testCaseName);
String identyEnryptRequest = updateTimestampOtp(identityRequest, otpChannel, testCaseName);
//String identyEnryptRequest = updateTimestampOtp(identityRequest);
String encryptedIdentityReq=null;
try {
encryptedIdentityReq = bioDataUtil.constractBioIdentityRequest(identyEnryptRequest, getResourcePath()+props.getProperty("bioValueEncryptionTemplate"), testCaseName, false);
Expand Down
7 changes: 6 additions & 1 deletion apitest/src/main/java/io/mosip/testrig/apirig/testscripts/OtpAuthNew.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
PartnerRegistration.updatedpartnerKeyUrl));
}
JSONObject req = new JSONObject(testCaseDTO.getInput());
String otpChannel="";
String otpRequest = null, sendOtpReqTemplate = null, sendOtpEndPoint = null, otpIdentyEnryptRequestPath = null;
if(req.has("otpChannel")) {
otpChannel = req.get("otpChannel").toString();
}
if(req.has("sendOtp")) {
otpRequest = req.get("sendOtp").toString();
req.remove("sendOtp");
Expand Down Expand Up @@ -152,7 +156,8 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
//String id = getAutoGeneratedFieldValue(otpRequest, testCaseName);

String otpIdentyEnryptRequest = FileUtil.readInput(getResourcePath()+otpIdentyEnryptRequestPath);
otpIdentyEnryptRequest = updateTimestampOtp(otpIdentyEnryptRequest);
otpChannel = inputJsonKeyWordHandeler(otpChannel, testCaseName);
otpIdentyEnryptRequest = updateTimestampOtp(otpIdentyEnryptRequest, otpChannel, testCaseName);

Map<String, String> bioAuthTempMap = (isInternal)
? encryptDecryptUtil.getInternalEncryptSessionKeyValue(otpIdentyEnryptRequest)
Expand Down
71 changes: 38 additions & 33 deletions apitest/src/main/resources/config/Kernel.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,17 @@ AuthClientID = mosip-resident-client

#---------------------------------- Client Secret Keys -----------------------#
#-- When test rig ran in docker, these values dervied from the environment ---#
mosip_partner_client_secret = vXS7WUyPDpfWYuoz
mosip_pms_client_secret = 5Qj8vn989OL1Vlu6
mosip_resident_client_secret = SnZQ6nnVwN9YWvdM
mosip_idrepo_client_secret = AeM2TwFuuZygCuvO
mosip_reg_client_secret = DLXygc82rkAkjrwV
mosip_admin_client_secret = Styop9nqkshXMTgj
mosip_hotlist_client_secret = TKyc4cqWymxjiLEsVydX4uME1xU3i9xl
mosip_regproc_client_secret = eyeXdyhO0u2ETibw
mpartner_default_mobile_secret = iCkj8BRZU6hP6MAN
mosip_testrig_client_secret = AonuXbikoWmHP5ug
AuthClientSecret = SnZQ6nnVwN9YWvdM
mosip_partner_client_secret =
mosip_pms_client_secret =
mosip_resident_client_secret =
mosip_idrepo_client_secret =
mosip_reg_client_secret =
mosip_admin_client_secret =
mosip_hotlist_client_secret =
mosip_regproc_client_secret =
mpartner_default_mobile_secret =
mosip_testrig_client_secret =
AuthClientSecret =



Expand All @@ -158,7 +158,7 @@ s3-account = automation
s3-region = null
reportExpirationInDays = 3
s3-account-for-persona-data = personaData
push-reports-to-s3 = yes
push-reports-to-s3 = no


#-------------------- Keycloak User Creation proprties ----------------------#
Expand All @@ -168,17 +168,17 @@ new_Resident_Password = mosip123
new_Resident_Role = default-roles-mosip,PARTNER_ADMIN
roles.111995 = PARTNER_ADMIN,default-roles-mosip
keycloak_UserName = admin
keycloak_Password = sMDr9Ainw9
keycloak-external-url = https://iam.qa-inji.mosip.net
keycloak_Password =
keycloak-external-url = https://iam.qa1-java21.mosip.net
keycloak-realm-id = mosip
iam-users-to-create = 111997,111998,220005,111992,globaladmin,111887,111999
iam-users-password = mosip123,mosip123,mosip123,mosip123,mosip123
roles.220005 = GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN
roles.111997 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111999 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111887 = AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,REGISTRATION_SUPERVISOR
roles.111998 = POLICYMANAGER
roles.111992 = GLOBAL_ADMIN
iam-users-to-create=111997,111998,220005,111992,globaladmin,111999,111887
iam-users-password=mosip123,mosip123,mosip123,mosip123,mosip123,mosip123,mosip123
roles.220005=GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN
roles.111997=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111999=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
roles.111887=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,REGISTRATION_SUPERVISOR
roles.111998=POLICYMANAGER
roles.111992=GLOBAL_ADMIN
roles.globaladmin = GLOBAL_ADMIN,REGISTRATION_ADMIN,uma_authorization,ZONAL_ADMIN,default-roles-mosip


Expand All @@ -189,27 +189,27 @@ pool_size=1
dialect=org.hibernate.dialect.PostgreSQLDialect
show_sql=true
current_session_context_class=thread
audit_url=jdbc:postgresql://qa-inji.mosip.net:5432/mosip_audit
audit_url=jdbc:postgresql://qa1-java21.mosip.net:5432/mosip_audit
audit_username=postgres
audit_password=2BhgiSpCaT
audit_password=
audit_default_schema=audit
DB_PORT=
installation-domain=
partner_url=jdbc:postgresql://qa-inji.mosip.net:5432/mosip_ida
partner_url=jdbc:postgresql://qa1-java21.mosip.net:5432/mosip_ida
partner_username=postgres
partner_password=2BhgiSpCaT
partner_password=
partner_default_schema=partner
reportLogPath=automationLogAndReport
postgresqlUser=postgresql
db-port=5432
db-server=qa-inji.mosip.net
db-server=qa1-java21.mosip.net
hibernate.connection.driver_class=org.postgresql.Driver
hibernate.connection.pool_size=1
hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
hibernate.show_sql=true
hibernate.current_session_context_class=thread
db-su-user=postgres
postgres-password=2BhgiSpCaT
postgres-password=
pms_db_schema=pms
km_db_schema=keymgr
master_db_schema=master
Expand All @@ -236,13 +236,14 @@ threadCount=1
#------------------------ Generic properties ------------------------#
enableDebug=yes
preconfiguredOtp=111111
usePreConfiguredOtp=true
usePreConfiguredOtp=false
# supported values yes or no. Assume that by Default e-signet is deployed
eSignetDeployed=yes
partnerUrlSuffix=oYf63Lax0DY2QkYMRHnrmDqhmO3RMWQagwm0ftgLlkuin1KOND/666/576732
reportIgnoredTestCases=no
servicesNotDeployed=
esignetMockBaseURL=esignet-insurance.
sunBirdBaseURL=registry
slack-webhook-url=
serverErrorsToMonitor=IDA-MLC-018
pmsAuthInternal=true
Expand Down Expand Up @@ -270,10 +271,14 @@ langselect=0


#----------------------------------AuthDemoService Host properties----------------------------------------------------------#
#authCertsPath=
authCertsPath=/home/mosip/authcerts


#Uncommemnt the below to run locally
authDemoServiceBaseURL=http://localhost
authDemoServicePort=8082
authCertsPath=
#Uncommemnt the below to run in Docker
#authDemoServiceBaseURL=http://authdemo.apitestrig
#authDemoServicePort=80
#authCertsPath=/home/mosip/authcerts


mosip_components_base_urls=
Expand Down
2 changes: 1 addition & 1 deletion apitest/src/main/resources/ida/AddIdentity/AddIdentity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ AddIdentity:
"UIN": "$UIN$",
"dateOfBirth": "1970/07/08",
"postalCode": "14022",
"email": "auth_AddIdentity_Positive_demoauth_name_smoke@mosip.net",
"email": "auth_AddIdentity_deactivate_UIN_smoke_sid_Pos@mosip.net",
"phone": "7019858531",
"mobileno": "7019858531",
"referenceIdentityNumber": "6789545678878",
Expand Down
Loading
Loading