Skip to content

Commit

Permalink
Merge pull request #468 from pg-techno123/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@neeharikatech
neeharikatech authored Oct 19, 2023
2 parents 8363107 + 510dc9f commit 9423d8d
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 41 deletions.
8 changes: 8 additions & 0 deletions ...rchestrator/src/main/java/io/mosip/testrig/dslrig/ivv/e2e/methods/DemoAuthentication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.json.JSONObject;

import io.mosip.testrig.apirig.admin.fw.util.AdminTestException;
import io.mosip.testrig.apirig.admin.fw.util.AdminTestUtil;
import io.mosip.testrig.apirig.admin.fw.util.TestCaseDTO;
import io.mosip.testrig.apirig.authentication.fw.precon.JsonPrecondtion;
import io.mosip.testrig.apirig.authentication.fw.util.AuthenticationTestException;
Expand Down Expand Up @@ -49,6 +50,12 @@ public void run() throws RigInternalError {
Object[] casesListUIN = null;
List<String> idType = BaseTestCase.getSupportedIdTypesValueFromActuator();
Object[] casesListVID = null;

String phone = AdminTestUtil.getValueFromAuthActuator("json-property", "phone_number");
String result = phone.replaceAll("\\[\"|\"\\]", "");

String email = AdminTestUtil.getValueFromAuthActuator("json-property", "emailId");
String emailResult = email.replaceAll("\\[\"|\"\\]", "");

// AuthPartnerProcessor.startProcess();
// step.getScenario().getUinPersonaProp().put("2759239619",
Expand Down Expand Up @@ -118,6 +125,7 @@ public void run() throws RigInternalError {
String input = test.getInput();
input = JsonPrecondtion.parseAndReturnJsonContent(input, uin, "individualId");
JSONObject inputJson = new JSONObject(input);

/*
* if(inputJson.has("identityRequest")) { identityRequest =
* inputJson.get("identityRequest").toString(); }
Expand Down
40 changes: 20 additions & 20 deletions mosip-acceptance-tests/ivv-orchestrator/src/main/resources/config/Kernel.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ partner_password=mosip123
partner_userName=111997
partner_user_password=mosip123
mosip_pms_client_id=mosip-pms-client
mosip_pms_client_secret=Vlhq5ABBQAm6hbH0
mosip_pms_client_secret=28nu0nKY9dgThCIs
policytest_password=mosip123
policytest_userName=111998
#RESIDENT & IDA
mosip_resident_app_id=resident
mosip_resident_client_id=mosip-resident-client
mosip_resident_client_secret=C81JIuQEwIMnNLKa
mosip_resident_client_secret=QHiANH32pu2ajXwU
#IDREPO
mosip_idrepo_app_id=idrepo
mosip_idrepo_client_id=mosip-idrepo-client
mosip_idrepo_client_secret=xCkJa2MxrdBb4QOi
mosip_idrepo_client_secret=1goKToWjb8t6nFeW



Expand All @@ -124,32 +124,32 @@ mosip_admin_app_id=admin
admin_password=Techno@123
admin_userName=star0
mosip_admin_client_id=mosip-admin-client
mosip_admin_client_secret=Rm8dkFIHqmzQEn4m
mosip_admin_client_secret=f3mZVaYBfuvyfcjJ

admin_zone_appid=admin
admin_zone_password=mosip123
admin_zone_userName=globaladmin
admin_zone_clientId=mosip-admin-client
admin_zone_clientSecret=Rm8dkFIHqmzQEn4m
admin_zone_clientSecret=f3mZVaYBfuvyfcjJ

mosip_regclient_app_id=registrationclient
mosip_reg_client_id=mosip-reg-client
mosip_reg_client_secret=V5rl45LfgcuwZ5O3
mosip_reg_client_secret=zPnLp4cpbpl3z6LX

#regproc
mosip_regprocclient_app_id=regproc
mosip_regproc_client_id=mosip-regproc-client
mosip_regproc_client_secret=qbxabiOspuXOw41G
mosip_regproc_client_secret=zJfvS0uBfKDuf7NK


#This credentials are used to execute auth demo service
AuthClientID=mosip-resident-client
AuthClientSecret=C81JIuQEwIMnNLKa
AuthClientSecret=QHiANH32pu2ajXwU

AuthAppID=resident
mosip_hotlist_app_id=hotlist
mosip_hotlist_client_id=mosip-hotlist-client
mosip_hotlist_client_secret=mFF6J161BKnRVEXz
mosip_hotlist_client_secret=UNzuUKJDBr3k9BuQ



Expand All @@ -164,16 +164,16 @@ roles.111995=PARTNER_ADMIN,default-roles-mosip


keycloak_UserName = admin
keycloak_Password = PBYnEyCGN1
keycloak_Password = KVOBq5dluk

keycloak-external-url=https://iam.dev2.mosip.net
keycloak-external-url=https://iam.qa-upgrade3.mosip.net
mosip_testrig_client_id=mosip-testrig-client
mosip_testrig_client_secret=tTmUxnqnVWoa7dAJ
mosip_testrig_client_secret=F0nqSasG5fWPpBvG


keycloak-realm-id=mosip
iam-users-to-create=111997,111998,220005,111992,globaladmin

#iam-users-to-create=111997,220005,111992
iam-users-password=mosip123,mosip123,mosip123,mosip123,mosip123
roles=GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN,AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR,DATA_READ
roles.111997=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
Expand All @@ -185,14 +185,14 @@ dialect=org.hibernate.dialect.PostgreSQLDialect
show_sql=true
current_session_context_class=thread
#audit details
audit_url=jdbc:postgresql://api-internal.dev2.mosip.net:30090/mosip_audit
audit_url=jdbc:postgresql://api-internal.qa-upgrade3.mosip.net:30090/mosip_audit
audit_username=postgres
audit_password=mosip123
audit_default_schema=audit
#ida-partner details
DB_PORT=
installation-domain=
partner_url=jdbc:postgresql://api-internal.dev2.mosip.net:30090/mosip_ida
partner_url=jdbc:postgresql://api-internal.qa-upgrade3.mosip.net:30090/mosip_ida
partner_username=postgres
partner_password=mosip123
partner_default_schema=partner
Expand All @@ -213,22 +213,22 @@ langselect=0
#----------------------------------Database properties----------------------------------------------------------#

db-port=5432
db-server=api-internal.dev2.mosip.net
db-server=api-internal.qa-upgrade3.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
db-su-password=YAbV7gwkvH
db-su-password=mosip123
pms_db_schema=pms
km_db_schema=keymgr
master_db_schema=master
audit_db_schema=audit
ida_db_schema=ida

authDemoServiceBaseURL=http://localhost
authDemoServicePort=8082
authDemoServicePort=8083

#######NEWLY ADDED ##############################################################################
mosip.test.persona.datapath=/profile_resource/
Expand Down Expand Up @@ -275,9 +275,9 @@ validateBindingEndpoint=esignet-binding
authCertsPath=
reportExpirationInDays=3

#----------------------------------Assume that by Default e-signet is deployed-------------------------------------------------------#
#----------------------------------Assume that by Default e-signet is deployed----------------------------------------------------------#
# supported values yes or no
eSignetDeployed=yes
eSignetDeployed=no

# ---- Add scenarios to skip from automation and server side -------------------------------------
# supported values "S-scnearioNumber" for server side and "A-scnearioNumber" for automation
Expand Down
40 changes: 20 additions & 20 deletions ...rces/config/Kernel_qa-upgrade3.properties → ...n/resources/config/Kernel_dev2.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,17 @@ partner_password=mosip123
partner_userName=111997
partner_user_password=mosip123
mosip_pms_client_id=mosip-pms-client
mosip_pms_client_secret=28nu0nKY9dgThCIs
mosip_pms_client_secret=Vlhq5ABBQAm6hbH0
policytest_password=mosip123
policytest_userName=111998
#RESIDENT & IDA
mosip_resident_app_id=resident
mosip_resident_client_id=mosip-resident-client
mosip_resident_client_secret=QHiANH32pu2ajXwU
mosip_resident_client_secret=C81JIuQEwIMnNLKa
#IDREPO
mosip_idrepo_app_id=idrepo
mosip_idrepo_client_id=mosip-idrepo-client
mosip_idrepo_client_secret=1goKToWjb8t6nFeW
mosip_idrepo_client_secret=xCkJa2MxrdBb4QOi



Expand All @@ -124,32 +124,32 @@ mosip_admin_app_id=admin
admin_password=Techno@123
admin_userName=star0
mosip_admin_client_id=mosip-admin-client
mosip_admin_client_secret=f3mZVaYBfuvyfcjJ
mosip_admin_client_secret=Rm8dkFIHqmzQEn4m

admin_zone_appid=admin
admin_zone_password=mosip123
admin_zone_userName=globaladmin
admin_zone_clientId=mosip-admin-client
admin_zone_clientSecret=f3mZVaYBfuvyfcjJ
admin_zone_clientSecret=Rm8dkFIHqmzQEn4m

mosip_regclient_app_id=registrationclient
mosip_reg_client_id=mosip-reg-client
mosip_reg_client_secret=zPnLp4cpbpl3z6LX
mosip_reg_client_secret=V5rl45LfgcuwZ5O3

#regproc
mosip_regprocclient_app_id=regproc
mosip_regproc_client_id=mosip-regproc-client
mosip_regproc_client_secret=zJfvS0uBfKDuf7NK
mosip_regproc_client_secret=qbxabiOspuXOw41G


#This credentials are used to execute auth demo service
AuthClientID=mosip-resident-client
AuthClientSecret=QHiANH32pu2ajXwU
AuthClientSecret=C81JIuQEwIMnNLKa

AuthAppID=resident
mosip_hotlist_app_id=hotlist
mosip_hotlist_client_id=mosip-hotlist-client
mosip_hotlist_client_secret=UNzuUKJDBr3k9BuQ
mosip_hotlist_client_secret=mFF6J161BKnRVEXz



Expand All @@ -164,16 +164,16 @@ roles.111995=PARTNER_ADMIN,default-roles-mosip


keycloak_UserName = admin
keycloak_Password = KVOBq5dluk
keycloak_Password = PBYnEyCGN1

keycloak-external-url=https://iam.qa-upgrade3.mosip.net
keycloak-external-url=https://iam.dev2.mosip.net
mosip_testrig_client_id=mosip-testrig-client
mosip_testrig_client_secret=F0nqSasG5fWPpBvG
mosip_testrig_client_secret=tTmUxnqnVWoa7dAJ


keycloak-realm-id=mosip
iam-users-to-create=111997,111998,220005,111992,globaladmin
#iam-users-to-create=111997,220005,111992

iam-users-password=mosip123,mosip123,mosip123,mosip123,mosip123
roles=GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN,AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR,DATA_READ
roles.111997=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR
Expand All @@ -185,14 +185,14 @@ dialect=org.hibernate.dialect.PostgreSQLDialect
show_sql=true
current_session_context_class=thread
#audit details
audit_url=jdbc:postgresql://api-internal.qa-upgrade3.mosip.net:30090/mosip_audit
audit_url=jdbc:postgresql://api-internal.dev2.mosip.net:30090/mosip_audit
audit_username=postgres
audit_password=mosip123
audit_default_schema=audit
#ida-partner details
DB_PORT=
installation-domain=
partner_url=jdbc:postgresql://api-internal.qa-upgrade3.mosip.net:30090/mosip_ida
partner_url=jdbc:postgresql://api-internal.dev2.mosip.net:30090/mosip_ida
partner_username=postgres
partner_password=mosip123
partner_default_schema=partner
Expand All @@ -213,22 +213,22 @@ langselect=0
#----------------------------------Database properties----------------------------------------------------------#

db-port=5432
db-server=api-internal.qa-upgrade3.mosip.net
db-server=api-internal.dev2.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
db-su-password=mosip123
db-su-password=YAbV7gwkvH
pms_db_schema=pms
km_db_schema=keymgr
master_db_schema=master
audit_db_schema=audit
ida_db_schema=ida

authDemoServiceBaseURL=http://localhost
authDemoServicePort=8083
authDemoServicePort=8082

#######NEWLY ADDED ##############################################################################
mosip.test.persona.datapath=/profile_resource/
Expand Down Expand Up @@ -275,9 +275,9 @@ validateBindingEndpoint=esignet-binding
authCertsPath=
reportExpirationInDays=3

#----------------------------------Assume that by Default e-signet is deployed----------------------------------------------------------#
#----------------------------------Assume that by Default e-signet is deployed-------------------------------------------------------#
# supported values yes or no
eSignetDeployed=no
eSignetDeployed=yes

# ---- Add scenarios to skip from automation and server side -------------------------------------
# supported values "S-scnearioNumber" for server side and "A-scnearioNumber" for automation
Expand Down
2 changes: 1 addition & 1 deletion mosipTestDataProvider/src/io/mosip/testrig/dslrig/dataprovider/PacketTemplateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ String generateIDJsonV2(ResidentModel resident, HashMap<String, String[]> fileIn
if (s.getFieldCategory().equals("pvt") || s.getFieldCategory().equals("kyc")) {
String primaryValue = "";
String secValue = "";
if (VariableManager.getVariableValue(contextKey, "name")!= null && s.getId().equals(VariableManager.getVariableValue(contextKey, "name"))) {
if (VariableManager.getVariableValue(contextKey, "name")!= null && VariableManager.getVariableValue(contextKey, "name").toString().contains(s.getId())) {
primaryValue = resident.getName().getFirstName() + " " + resident.getName().getMidName() + " "
+ resident.getName().getSurName();
if (secLanguage != null)
Expand Down

0 comments on commit 9423d8d

Please sign in to comment.