From b610e3f0ef69fd53aa883d8d228c0f1b5fe0f1b2 Mon Sep 17 00:00:00 2001 From: M1049813 Date: Tue, 17 Dec 2019 15:42:48 +0530 Subject: [PATCH 1/3] MOS-29826, MOS-29825 : Code merge according to keycloak change and bug retest --- .../authentication/fw/util/AuthTestsUtil.java | 11 +- .../authentication/fw/util/IdRepoUtil.java | 2 +- .../tests/InternalAuthTransaction.java | 2 +- .../tests/InternalOtpAuthentication.java | 12 +- .../tests/InternalOtpGeneration.java | 2 +- .../mosip/authentication/tests/LockUIN.java | 2 +- .../tests/RetrieveAuthTypeStatus.java | 2 +- .../mosip/authentication/tests/UnlockUIN.java | 2 +- .../java/io/mosip/service/BaseTestCase.java | 16 +-- ...tdata.idRepository.AddIdentity.mapping.yml | 109 ++++++++++++++++++ .../TestData/RunConfig/rid.properties | 84 +++++++------- .../TestData/RunConfig/uin.properties | 84 +++++++------- .../TestData/RunConfig/vid.properties | 82 ++++++------- .../GetCookie/getCookieForUinGenerator.json | 4 +- .../Security/GetCookie/getCookieRequest.json | 4 +- .../Face/testdata.ida.Bio.Face.mapping.yml | 63 ---------- .../Name/testdata.ida.Demo.Name.mapping.yml | 1 - .../RunConfig/authTypeStatus.properties | 22 ++-- .../RunConfig/authenitcationTestdata.yaml | 6 + .../RunConfig/envRunConfig.properties | 2 + .../ida/TestData/RunConfig/errorCodeMsg.yml | 4 +- .../ida/TestData/RunConfig/rid.properties | 84 +++++++------- .../RunConfig/runConfiguration.properties | 8 +- .../ida/TestData/RunConfig/uin.properties | 84 +++++++------- .../ida/TestData/RunConfig/vid.properties | 82 ++++++------- ...json => dev.getCookieForInternalAuth.json} | 4 +- ...json => dev.getCookieForUinGenerator.json} | 4 +- ...Request.json => dev.getCookieRequest.json} | 4 +- .../dev.residentServiceCredential.json | 10 ++ .../qa.getCookieForInternalAuth.json | 11 ++ .../qa.getCookieForUinGenerator.json | 11 ++ .../GetCookie/qa.getCookieRequest.json | 10 ++ .../qa.residentServiceCredential.json | 10 ++ .../src/main/resources/testngapi.xml | 8 +- 34 files changed, 482 insertions(+), 364 deletions(-) rename automationtests/src/main/resources/ida/TestData/Security/GetCookie/{getCookieForInternalAuth.json => dev.getCookieForInternalAuth.json} (61%) rename automationtests/src/main/resources/ida/TestData/Security/GetCookie/{getCookieForUinGenerator.json => dev.getCookieForUinGenerator.json} (61%) rename automationtests/src/main/resources/ida/TestData/Security/GetCookie/{getCookieRequest.json => dev.getCookieRequest.json} (54%) create mode 100644 automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.residentServiceCredential.json create mode 100644 automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForInternalAuth.json create mode 100644 automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForUinGenerator.json create mode 100644 automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieRequest.json create mode 100644 automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.residentServiceCredential.json diff --git a/automationtests/src/main/java/io/mosip/authentication/fw/util/AuthTestsUtil.java b/automationtests/src/main/java/io/mosip/authentication/fw/util/AuthTestsUtil.java index bf3c6c6cb5..2d74132d5d 100644 --- a/automationtests/src/main/java/io/mosip/authentication/fw/util/AuthTestsUtil.java +++ b/automationtests/src/main/java/io/mosip/authentication/fw/util/AuthTestsUtil.java @@ -1214,17 +1214,22 @@ protected static String postStrContentRequestWithCookie(String content, String u protected static String getCookieRequestFilePath() { return RunConfigUtil.getResourcePath() - + "ida/TestData/Security/GetCookie/getCookieRequest.json".toString(); + + "ida/TestData/Security/GetCookie/"+RunConfigUtil.getRunEvironment()+".getCookieRequest.json".toString(); } protected static String getCookieRequestFilePathForUinGenerator() { return RunConfigUtil.getResourcePath() - + "ida/TestData/Security/GetCookie/getCookieForUinGenerator.json".toString(); + + "ida/TestData/Security/GetCookie/"+RunConfigUtil.getRunEvironment()+".getCookieForUinGenerator.json".toString(); } protected static String getCookieRequestFilePathForInternalAuth() { return RunConfigUtil.getResourcePath() - + "ida/TestData/Security/GetCookie/getCookieForInternalAuth.json".toString(); + + "ida/TestData/Security/GetCookie/"+RunConfigUtil.getRunEvironment()+".getCookieForInternalAuth.json".toString(); + } + + protected static String getCookieRequestFilePathForResidentAuth() { + return RunConfigUtil.getResourcePath() + + "ida/TestData/Security/GetCookie/"+RunConfigUtil.getRunEvironment()+".residentServiceCredential.json".toString(); } protected String patchRequestWithCookie(String filename, String url,String cookieName,String cookieValue) { diff --git a/automationtests/src/main/java/io/mosip/authentication/fw/util/IdRepoUtil.java b/automationtests/src/main/java/io/mosip/authentication/fw/util/IdRepoUtil.java index e25023b773..2913cc3cd8 100644 --- a/automationtests/src/main/java/io/mosip/authentication/fw/util/IdRepoUtil.java +++ b/automationtests/src/main/java/io/mosip/authentication/fw/util/IdRepoUtil.java @@ -33,7 +33,7 @@ public class IdRepoUtil extends AuthTestsUtil { public static boolean retrieveIdRepo(String uinNumber) { String retrievePath = RunConfigUtil.objRunConfig.getIdRepoRetrieveDataPath().replace("$uin$", uinNumber); String url = RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + retrievePath; - String cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + String cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); if (!FileUtil.checkFileExistForIdRepo(uinNumber + ".json")) { diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/InternalAuthTransaction.java b/automationtests/src/main/java/io/mosip/authentication/tests/InternalAuthTransaction.java index 097ae68bb3..2924d59ce6 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/InternalAuthTransaction.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/InternalAuthTransaction.java @@ -84,7 +84,7 @@ public void setTestType() { } public void setCookie() { - cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); getCookieStartTime = Cookie.getCookieCurrentDateTime(); diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpAuthentication.java b/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpAuthentication.java index 5fff412232..d4e4635e86 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpAuthentication.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpAuthentication.java @@ -58,6 +58,7 @@ public class InternalOtpAuthentication extends PrerequisteTests implements ITest private int invocationCount = 0; private String kubernetSeriveName=""; private static String cookieValue; + private static String residentCookieValue; private static String getCookieStartTime; /** @@ -76,6 +77,12 @@ public void setCookie() { AUTHORIZATHION_COOKIENAME); getCookieStartTime = Cookie.getCookieCurrentDateTime(); } + + public void getResidentAccess() { + residentCookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), + RunConfigUtil.objRunConfig.getEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), + AUTHORIZATHION_COOKIENAME); + } /** * Method set Test data path and its filename @@ -179,6 +186,7 @@ public void setResultTestName(ITestResult result) { @Test(dataProvider = "testcaselist") public void idaOtpAuthenticationTest(TestParameters objTestParameters, String testScenario, String testcaseName) throws AuthenticationTestException { setCookie(); + getResidentAccess(); File testCaseName = objTestParameters.getTestCaseFile(); int testCaseNumber = Integer.parseInt(objTestParameters.getTestId()); displayLog(testCaseName, testCaseNumber); @@ -193,7 +201,7 @@ public void idaOtpAuthenticationTest(TestParameters objTestParameters, String te + " *******"); if(!postRequestAndGenerateOuputFileForIntenalAuth(testCaseName.listFiles(), RunConfigUtil.objRunConfig.getEndPointUrl() + RunConfigUtil.objRunConfig.getIdaInternalOtpPath(), "otp-generate", "output-1-actual-res", - AUTHORIZATHION_COOKIENAME, cookieValue, 200)) + AUTHORIZATHION_COOKIENAME, residentCookieValue, 200)) throw new AuthenticationTestException("Failed at HTTP-POST otp-generate-request"); Map> ouputValid = OutputValidationUtil.doOutputValidation( FileUtil.getFilePath(testCaseName, "output-1-actual").toString(), @@ -218,7 +226,7 @@ public void idaOtpAuthenticationTest(TestParameters objTestParameters, String te if (!getTestCaseName().contains("OTP_exceed_more_attemp")) { if (!postRequestAndGenerateOuputFileForIntenalAuth(testCaseName.listFiles(), RunConfigUtil.objRunConfig.getEndPointUrl() + RunConfigUtil.objRunConfig.getInternalAuthPath(), - "otp-auth-request", "output-2-actual-res", AUTHORIZATHION_COOKIENAME, cookieValue, 200)) + "otp-auth-request", "output-2-actual-res", AUTHORIZATHION_COOKIENAME, residentCookieValue, 200)) throw new AuthenticationTestException("Failed at HTTP-POST otp-auth-request"); } else for (int i = 0; i < 10; i++) { diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpGeneration.java b/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpGeneration.java index 44cc589565..f260b20dbb 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpGeneration.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/InternalOtpGeneration.java @@ -67,7 +67,7 @@ public void setTestType() { } public void setCookie() { - cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); getCookieStartTime = Cookie.getCookieCurrentDateTime(); diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/LockUIN.java b/automationtests/src/main/java/io/mosip/authentication/tests/LockUIN.java index 95c1d7199f..f6b3b90493 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/LockUIN.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/LockUIN.java @@ -65,7 +65,7 @@ public void setTestType() { } public void setCookie() { - cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); getCookieStartTime = Cookie.getCookieCurrentDateTime(); diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/RetrieveAuthTypeStatus.java b/automationtests/src/main/java/io/mosip/authentication/tests/RetrieveAuthTypeStatus.java index 38e9308e1f..8410b60be7 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/RetrieveAuthTypeStatus.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/RetrieveAuthTypeStatus.java @@ -78,7 +78,7 @@ public void setTestType() { } public void setCookie() { - cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); } diff --git a/automationtests/src/main/java/io/mosip/authentication/tests/UnlockUIN.java b/automationtests/src/main/java/io/mosip/authentication/tests/UnlockUIN.java index c1912e3858..ec3f4fb533 100644 --- a/automationtests/src/main/java/io/mosip/authentication/tests/UnlockUIN.java +++ b/automationtests/src/main/java/io/mosip/authentication/tests/UnlockUIN.java @@ -62,7 +62,7 @@ public void setTestType() { } public void setCookie() { - cookieValue = getAuthorizationCookie(getCookieRequestFilePathForInternalAuth(), + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForResidentAuth(), RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), AUTHORIZATHION_COOKIENAME); getCookieStartTime = Cookie.getCookieCurrentDateTime(); diff --git a/automationtests/src/main/java/io/mosip/service/BaseTestCase.java b/automationtests/src/main/java/io/mosip/service/BaseTestCase.java index 49f01e5d62..93c6c07a16 100644 --- a/automationtests/src/main/java/io/mosip/service/BaseTestCase.java +++ b/automationtests/src/main/java/io/mosip/service/BaseTestCase.java @@ -99,11 +99,11 @@ public static String getOSType(){ public static void initialize() { - copyDbInTarget(); + /*copyDbInTarget(); PropertyConfigurator.configure(getLoggerPropertyConfig()); kernelAuthLib = new KernelAuthentication(); kernelCmnLib = new CommonLibrary(); - queries = kernelCmnLib.readProperty("adminQueries"); + queries = kernelCmnLib.readProperty("adminQueries");*/ /** * Make sure test-output is there */ @@ -144,10 +144,10 @@ public static void suiteSetup() { initialize(); logger.info("Done with BeforeSuite and test case setup! BEGINNING TEST EXECUTION!\n\n"); - PreRegistrationLibrary pil=new PreRegistrationLibrary(); + /*PreRegistrationLibrary pil=new PreRegistrationLibrary(); pil.PreRegistrationResourceIntialize(); new PreregistrationDAO().deleteAvailableSlot(); - new PreregistrationDAO().makeAllRegistartionCenterActive(); + new PreregistrationDAO().makeAllRegistartionCenterActive();*/ AuthTestsUtil.removeOldMosipTempTestResource(); AuthTestsUtil.initiateAuthTest(); AdminTestUtil.initiateAdminTest(); @@ -161,18 +161,18 @@ public static void suiteSetup() { * consumedPreRegIds list contain list of consumed pre registration ids * */ - expiredPreRegIds=lib.BookExpiredApplication(); - consumedPreRegIds=lib.consumedPreId(); + /*expiredPreRegIds=lib.BookExpiredApplication(); + consumedPreRegIds=lib.consumedPreId();*/ /** * here we are assuming batch job will run in every 5 min thats why we are giving wait for 10 min */ logger.info("waiting for job run to start"); - try { + /*try { TimeUnit.MINUTES.sleep(8); } catch (InterruptedException e) { e.printStackTrace(); - } + }*/ //authToken=pil.getToken(); /*htmlReporter=new ExtentHtmlReporter(System.getProperty("user.dir")+"/test-output/MyOwnReport.html"); extent=new ExtentReports(); diff --git a/automationtests/src/main/resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml b/automationtests/src/main/resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml index 3ccb09738e..59319054e5 100644 --- a/automationtests/src/main/resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml +++ b/automationtests/src/main/resources/idRepository/TestData/AddIdentity/testdata.idRepository.AddIdentity.mapping.yml @@ -107,6 +107,115 @@ testdata: output.1.res.version: $version$ output.1.res.timestamp: $IGNORE$ output.1.res.id: mosip.id.create + + IdRepository_AddIdentity_withNAInLocation_Smoke_Pos: + input.cbeff-bio-data: + BDB1BIR1BIR1: $BIO~fir~rightIndex~70Percentage$ + Score1BIR1BIR1: 70 + BDB1BIR2BIR1: $BIO~fir~leftIndex~70Percentage$ + Score1BIR1BIR2: 70 + BDB1BIR3BIR1: $BIO~fir~rightThumb~70Percentage$ + Score1BIR1BIR3: 70 + BDB1BIR4BIR1: $BIO~fir~leftThumb~70Percentage$ + Score1BIR1BIR4: 70 + BDB1BIR5BIR1: $BIO~fir~rightMiddle~70Percentage$ + Score1BIR1BIR5: 70 + BDB1BIR6BIR1: $BIO~fir~leftMiddle~70Percentage$ + Score1BIR1BIR6: 70 + BDB1BIR7BIR1: $BIO~fir~rightRing~70Percentage$ + Score1BIR1BIR7: 70 + BDB1BIR8BIR1: $BIO~fir~leftRing~70Percentage$ + Score1BIR1BIR8: 70 + BDB1BIR9BIR1: $BIO~fir~rightLittle~70Percentage$ + Score1BIR1BIR9: 70 + BDB1BIR10BIR1: $BIO~fir~leftLittle~70Percentage$ + Score1BIR1BIR10: 70 + BDB1BIR11BIR1: $BIO~iir~right~100Percentage$ + Score1BIR1BIR11: 100 + BDB1BIR12BIR1: $BIO~iir~left~100Percentage$ + Score1BIR1BIR12: 100 + BDB1BIR13BIR1: $BIO~fid~fid~100Percentage$ + Score1BIR1BIR13: 100 + input.create-request: + registrationId: 278476573600025+$YYYYMMddHHmmss$ + UIN: $generate_UIN$ + dateOfBirth: $TestData:dob_valid$ + IDSchemaVersion: DOUBLE:1.0 + individualBiometricsVersion: DOUBLE:1.0 + languagefullName0: $TestData:english_lang_code_valid$ + languagefullName2: $TestData:french_lang_code_valid$ + languagefullName1: $TestData:arabic_lang_code_valid$ + valuefullName2: $TRANSLATE~$input.create-request:valuefullName0$~en~fr$ + valuefullName1: $TRANSLATE~$input.create-request:valuefullName0$~en~ar$ + valuefullName0: $TRANSLATE~$TestData:name_valid$~en~en$ + languageparentOrGuardianName0: $TestData:english_lang_code_valid$ + languageparentOrGuardianName2: $TestData:french_lang_code_valid$ + languageparentOrGuardianName1: $TestData:arabic_lang_code_valid$ + valueparentOrGuardianName2: $TRANSLATE~$input.create-request:valueparentOrGuardianName0$~en~fr$ + valueparentOrGuardianName1: $TRANSLATE~$input.create-request:valueparentOrGuardianName0$~en~ar$ + valueparentOrGuardianName0: $TRANSLATE~$TestData:name_valid$~en~en$ + languagegender2: $TestData:english_lang_code_valid$ + languagegender1: $TestData:french_lang_code_valid$ + languagegender0: $TestData:arabic_lang_code_valid$ + valuegender2: $TestData:male_gender_english_valid$ + valuegender1: $TestData:male_gender_french_valid$ + valuegender0: $TestData:male_gender_arabic_valid$ + languagelocalAdministrativeAuthority0: $TestData:english_lang_code_valid$ + languagelocalAdministrativeAuthority2: $TestData:french_lang_code_valid$ + languagelocalAdministrativeAuthority1: $TestData:arabic_lang_code_valid$ + valuelocalAdministrativeAuthority2: NA + valuelocalAdministrativeAuthority1: NA + valuelocalAdministrativeAuthority0: NA + age: $TestData:age_valid$ + residenceStatus: abc + languageaddressLine10: $TestData:english_lang_code_valid$ + languageaddressLine12: $TestData:french_lang_code_valid$ + languageaddressLine11: $TestData:arabic_lang_code_valid$ + valueaddressLine12: $TRANSLATE~$input.create-request:valueaddressLine10$~en~fr$ + valueaddressLine11: $TRANSLATE~$input.create-request:valueaddressLine10$~en~ar$ + valueaddressLine10: $TRANSLATE~$TestData:addressLine1_valid$~en~en$ + languageaddressLine20: $TestData:english_lang_code_valid$ + languageaddressLine22: $TestData:french_lang_code_valid$ + languageaddressLine21: $TestData:arabic_lang_code_valid$ + valueaddressLine22: $TRANSLATE~$input.create-request:valueaddressLine20$~en~fr$ + valueaddressLine21: $TRANSLATE~$input.create-request:valueaddressLine20$~en~ar$ + valueaddressLine20: $TRANSLATE~$TestData:addressLine2_valid$~en~en$ + languageaddressLine30: $TestData:english_lang_code_valid$ + languageaddressLine32: $TestData:french_lang_code_valid$ + languageaddressLine31: $TestData:arabic_lang_code_valid$ + valueaddressLine32: $TRANSLATE~$input.create-request:valueaddressLine30$~en~fr$ + valueaddressLine31: $TRANSLATE~$input.create-request:valueaddressLine30$~en~ar$ + valueaddressLine30: $TRANSLATE~$TestData:addressLine3_valid$~en~en$ + languageregion0: $TestData:english_lang_code_valid$ + languageregion2: $TestData:french_lang_code_valid$ + languageregion1: $TestData:arabic_lang_code_valid$ + valueregion2: NA + valueregion1: NA + valueregion0: NA + languageprovince0: $TestData:english_lang_code_valid$ + languageprovince2: $TestData:french_lang_code_valid$ + languageprovince1: $TestData:arabic_lang_code_valid$ + valueprovince2: NA + valueprovince1: NA + valueprovince0: NA + languagecity0: $TestData:english_lang_code_valid$ + languagecity2: $TestData:french_lang_code_valid$ + languagecity1: $TestData:arabic_lang_code_valid$ + valuecity2: NA + valuecity1: NA + valuecity0: NA + timestamp: $TIMESTAMPZ$ + phone: $TestData:phone_valid$ + postalCode: $TestData:postalcode_valid$ + email: $TestData:emailId_valid$ + CNIENumber: $TestData:CNIENumber_valid$ + categorydocuments0: individualBiometrics + valuedocuments0: $ENCODEFILE:cbeff-bio-data.xml$ + output.output-1-expected-y-res: + output.1.res.status: ACTIVATED + output.1.res.version: $version$ + output.1.res.timestamp: $IGNORE$ + output.1.res.id: mosip.id.create IdRepository_AddIdentity_withInvalidUIN: input.create-request: diff --git a/automationtests/src/main/resources/idRepository/TestData/RunConfig/rid.properties b/automationtests/src/main/resources/idRepository/TestData/RunConfig/rid.properties index 8887e47d38..6783396ae9 100644 --- a/automationtests/src/main/resources/idRepository/TestData/RunConfig/rid.properties +++ b/automationtests/src/main/resources/idRepository/TestData/RunConfig/rid.properties @@ -1,42 +1,42 @@ -#Mon Oct 21 15:29:45 IST 2019 -27847657360002520191021152845=7058431856 -27847657360002520191021152811=7127952613 -27847657360002520191021152554=4830657849 -27847657360002520191021152718=3806739718 -27847657360002520191021152711=8431748936 -27847657360002520191021152423=7305947683 -27847657360002520191021152455=3894758037 -27847657360002520191021152450=2190239716 -27847657360002520191021152616=9149071385 -27847657360002520191021152936=9308127617 -27847657360002520191021152903=5694874027 -27847657360002520191021152646=9031496519 -27847657360002520191021152640=3569047130 -27847657360002520191021152839=6912983175 -27847657360002520191021152519=5938163245 -27847657360002520191021152548=7982197204 -27847657360002520191021152803=3241035869 -27847657360002520191021152833=9328308195 -27847657360002520191021152511=2875640913 -27847657360002520191021152540=6950370512 -27847657360002520191021152703=5329603580 -27847657360002520191021152733=7105937236 -27847657360002520191021152412=7230281387 -27847657360002520191021152928=9410749614 -27847657360002520191021152608=4083529168 -27847657360002520191021152440=6938526182 -27847657360002520191021152923=2475165871 -27847657360002520191021152601=2375645036 -27847657360002520191021152858=4203243896 -27847657360002520191021152825=8708409342 -27847657360002520191021152504=2187031945 -27847657360002520191021152532=4673275143 -27847657360002520191021152725=3897683093 -27847657360002520191021152755=5120650152 -27847657360002520191021152432=5275631986 -27847657360002520191021152918=2670439512 -27847657360002520191021152750=3542138652 -27847657360002520191021152624=7962760734 -27847657360002520191021152910=4921509536 -27847657360002520191021152654=6157927047 -27847657360002520191021152817=5375083978 +#Fri Dec 06 11:57:08 IST 2019 +27847657360002520191206115208=7968074290 +27847657360002520191206115238=8609350695 +27847657360002520191206115557=8397598618 +27847657360002520191206115521=8916031469 +27847657360002520191206115231=6329073157 +27847657360002520191206115550=9061758031 +27847657360002520191206115456=2039785170 +27847657360002520191206115134=8690896351 +27847657360002520191206115422=2470610597 +27847657360002520191206115329=7508742094 +27847657360002520191206115616=2986759146 +27847657360002520191206115645=8237143953 +27847657360002520191206115355=4981692437 +27847657360002520191206115322=6471870369 +27847657360002520191206115641=8598152395 +27847657360002520191206115258=2452034631 +27847657360002520191206115514=3650623985 +27847657360002520191206115222=3167583793 +27847657360002520191206115540=7487014395 +27847657360002520191206115449=2394791487 +27847657360002520191206115127=3017945847 +27847657360002520191206115159=3209415481 +27847657360002520191206115412=6417819306 +27847657360002520191206115700=2570438018 +27847657360002520191206115441=5643897815 +27847657360002520191206115606=8102982735 +27847657360002520191206115150=7536237019 +27847657360002520191206115314=3671896039 +27847657360002520191206115346=6850816384 +27847657360002520191206115632=9835902436 +27847657360002520191206115505=9283150452 +27847657360002520191206115215=9102514813 +27847657360002520191206115247=2859768352 +27847657360002520191206115531=9532471481 +27847657360002520191206115405=8957198216 +27847657360002520191206115432=7401957693 +27847657360002520191206115141=8935017681 +27847657360002520191206115306=5395102604 +27847657360002520191206115338=5631679610 +27847657360002520191206115624=7031401850 +27847657360002520191206115653=2189367410 diff --git a/automationtests/src/main/resources/idRepository/TestData/RunConfig/uin.properties b/automationtests/src/main/resources/idRepository/TestData/RunConfig/uin.properties index f736518c65..a56dbc02ca 100644 --- a/automationtests/src/main/resources/idRepository/TestData/RunConfig/uin.properties +++ b/automationtests/src/main/resources/idRepository/TestData/RunConfig/uin.properties @@ -1,42 +1,42 @@ -#Mon Oct 21 15:41:07 IST 2019 -9031496519=Authentication_Create_valid_uin_10_record -6950370512=Authentication_Create_uin_With_VID_type_temporary_record_2 -3894758037=Authentication_Create_uin_LOCKUIN_3_record -2190239716=Authentication_Create_uin_LOCKUIN_2_record -2375645036=Authentication_Create_uin_With_VID_type_temporary_record_5 -7105937236=IdRepository_UpdateIdentity_withDeactivatedStatus -8431748936=Authentication_Create_valid_uin_13_record -3806739718=Authentication_Create_valid_uin_14_record -2475165871=Authentication_IdentityMismatch_OTP_record -6912983175=Authentication_Create_valid_uin_8_record -5275631986=Authentication_Create_GenderMLE_record -5694874027=Authentication_Create_valid_uin_smoke_2_record -4921509536=Authentication_Create_valid_uin_smoke_3_record -5375083978=Authentication_Create_valid_uin_5_record -2670439512=Authentication_Create_withoutBio_record -7982197204=Authentication_Create_uin_With_VID_type_temporary_record_3 -5120650152=Authentication_Create_valid_uin_18_record -5329603580=Authentication_Create_valid_uin_12_record -5938163245=Authentication_Create_uin_LOCKUIN_6_record -4673275143=Authentication_Create_uin_With_VID_type_temporary_record_1 -6157927047=Authentication_Create_valid_uin_11_record -2187031945=Authentication_Create_uin_LOCKUIN_4_record -3542138652=Authentication_Create_valid_uin_17_record -7230281387=Authentication_Create_DR_smoke_record -8708409342=Authentication_Create_valid_uin_6_record -4830657849=Authentication_Create_uin_With_VID_type_temporary_record_4 -9410749614=Authentication_OTP_EXCEED_record -7305947683=Authentication_Create_GenderFLE_record -7058431856=Authentication_Create_valid_uin_9_record -3897683093=Update_UIN_Deactivated -9308127617=Authentication_OTP_FLOD_record -7962760734=Authentication_Create_uin_With_VID_type_temporary_record_8 -3569047130=Authentication_Create_uin_With_VID_type_temporary_record_9 -4203243896=Authentication_Create_valid_uin_smoke_1_record -2875640913=Authentication_Create_uin_LOCKUIN_5_record -4083529168=Authentication_Create_uin_With_VID_type_temporary_record_6 -3241035869=Authentication_Create_valid_uin_19_record -9328308195=Authentication_Create_valid_uin_7_record -7127952613=IdRepository_UpdateIdentity_withBlockedStatus -6938526182=Authentication_Create_uin_LOCKUIN_1_record -9149071385=Authentication_Create_uin_With_VID_type_temporary_record_7 +#Fri Dec 06 12:18:57 IST 2019 +5643897815=IdRepository_UpdateIdentity_withDeactivatedStatus +8598152395=Authentication_Create_withoutBio_record +6417819306=Authentication_Create_valid_uin_12_record +6329073157=Authentication_Create_uin_LOCKUIN_6_record +4981692437=Authentication_Create_valid_uin_10_record +2570438018=Authentication_OTP_FLOD_record +3209415481=Authentication_Create_uin_LOCKUIN_2_record +6471870369=Authentication_Create_uin_With_VID_type_temporary_record_6 +7968074290=Authentication_Create_uin_LOCKUIN_3_record +2986759146=Authentication_Create_valid_uin_smoke_1_record +6850816384=Authentication_Create_uin_With_VID_type_temporary_record_9 +9283150452=Authentication_Create_valid_uin_18_record +3167583793=Authentication_Create_uin_LOCKUIN_5_record +2189367410=Authentication_OTP_EXCEED_record +9835902436=Authentication_Create_valid_uin_smoke_3_record +2859768352=Authentication_Create_uin_With_VID_type_temporary_record_2 +7536237019=Authentication_Create_uin_LOCKUIN_1_record +8102982735=Authentication_Create_valid_uin_9_record +7031401850=Authentication_Create_valid_uin_smoke_2_record +8957198216=Authentication_Create_valid_uin_11_record +2452034631=Authentication_Create_uin_With_VID_type_temporary_record_3 +3650623985=Authentication_Create_valid_uin_19_record +5395102604=Authentication_Create_uin_With_VID_type_temporary_record_4 +8916031469=Update_UIN_Deactivated +7401957693=Authentication_Create_valid_uin_14_record +9532471481=Authentication_Create_valid_uin_5_record +5631679610=Authentication_Create_uin_With_VID_type_temporary_record_8 +8237143953=Authentication_IdentityMismatch_OTP_record +8609350695=Authentication_Create_uin_With_VID_type_temporary_record_1 +2039785170=Authentication_Create_valid_uin_17_record +3671896039=Authentication_Create_uin_With_VID_type_temporary_record_5 +2394791487=IdRepository_UpdateIdentity_withDeactivatedStatus +7487014395=Authentication_Create_valid_uin_6_record +9061758031=Authentication_Create_valid_uin_7_record +2470610597=Authentication_Create_valid_uin_13_record +9102514813=Authentication_Create_uin_LOCKUIN_4_record +8397598618=IdRepository_UpdateIdentity_withBlockedStatus +7508742094=Authentication_Create_uin_With_VID_type_temporary_record_7 +8935017681=Authentication_Create_GenderMLE_record +3017945847=Authentication_Create_DR_smoke_record +8690896351=Authentication_Create_GenderFLE_record diff --git a/automationtests/src/main/resources/idRepository/TestData/RunConfig/vid.properties b/automationtests/src/main/resources/idRepository/TestData/RunConfig/vid.properties index abda868a35..9bd5f33422 100644 --- a/automationtests/src/main/resources/idRepository/TestData/RunConfig/vid.properties +++ b/automationtests/src/main/resources/idRepository/TestData/RunConfig/vid.properties @@ -1,41 +1,41 @@ -#Mon Oct 21 15:30:40 IST 2019 -9031496519=6319615740698329.Perpetual.ACTIVE -6950370512=3963021958798078.Temporary.ACTIVE.1 -3894758037=2068703745823046.Perpetual.ACTIVE -2190239716=3190592835497698.Perpetual.ACTIVE -2375645036=6471041387902950.Temporary.ACTIVE.1 -7105937236=3508520387342360.Perpetual.ACTIVE -8431748936=2680725160235486.Perpetual.ACTIVE -3806739718=3490168328940713.Perpetual.ACTIVE -2475165871=5276471846394215.Perpetual.ACTIVE -6912983175=2649823725740390.Perpetual.ACTIVE -5275631986=3246735261590185.Perpetual.ACTIVE -5694874027=6208640917631459.Perpetual.DEACTIVATED -4921509536=2849169510463723.Perpetual.ACTIVE -5375083978=3873618915837294.Perpetual.ACTIVE -2670439512=3750820367459846.Perpetual.ACTIVE -7982197204=5495187248390659.Temporary.ACTIVE.1 -5120650152=3290692718046026.Perpetual.ACTIVE -5329603580=3461721547923893.Perpetual.ACTIVE -5938163245=6281960943153840.Perpetual.ACTIVE -4673275143=6154913643108679.Temporary.ACTIVE.1 -6157927047=3015912578420736.Perpetual.INACTIVE -2187031945=4027620348350937.Perpetual.ACTIVE -3542138652=3013807365185693.Perpetual.ACTIVE -7230281387=2375329824925691.Perpetual.ACTIVE -8708409342=8173907260846536.Perpetual.ACTIVE -4830657849=4739546015241968.Temporary.ACTIVE.1 -9410749614=5705372918401756.Perpetual.ACTIVE -7305947683=5102475623904265.Perpetual.ACTIVE -7058431856=3901356071248053.Perpetual.REVOKED -9308127617=5806423824531469.Perpetual.ACTIVE -7962760734=6970821435625465.Temporary.ACTIVE.1 -3569047130=3804531062097149.Temporary.ACTIVE.1 -4203243896=2140837859439064.Perpetual.EXPIRED -2875640913=3509837512810420.Perpetual.ACTIVE -4083529168=3270149176240713.Temporary.ACTIVE.1 -3241035869=3851354675021659.Perpetual.ACTIVE -9328308195=4917485684157290.Perpetual.ACTIVE -7127952613=3061978265295149.Perpetual.ACTIVE -6938526182=5149531798104257.Perpetual.ACTIVE -9149071385=2031941864539624.Temporary.ACTIVE.1 +#Fri Dec 06 11:57:41 IST 2019 +5643897815=4120132689563703.Perpetual.ACTIVE +8598152395=5045126348137196.Perpetual.ACTIVE +6417819306=2701571645391425.Perpetual.DEACTIVATED +6329073157=6206194230710216.Perpetual.ACTIVE +4981692437=3871268325347236.Perpetual.ACTIVE +2570438018=4293047532465983.Perpetual.ACTIVE +3209415481=5712469563523903.Perpetual.ACTIVE +6471870369=6204510584134781.Temporary.ACTIVE.1 +7968074290=6354126728093648.Perpetual.ACTIVE +2986759146=2891437294261380.Perpetual.INACTIVE +6850816384=2672156931964950.Temporary.ACTIVE.1 +9283150452=6031836250956192.Perpetual.REVOKED +3167583793=5480130573465285.Perpetual.ACTIVE +2189367410=6347246153927314.Perpetual.ACTIVE +9835902436=3479562864251324.Perpetual.ACTIVE +2859768352=6810314805129846.Temporary.ACTIVE.1 +7536237019=3713965369127946.Perpetual.ACTIVE +8102982735=3597642961782147.Perpetual.ACTIVE +7031401850=3569824731097501.Perpetual.ACTIVE +8957198216=6183780329739814.Perpetual.ACTIVE +2452034631=2158712793165284.Temporary.ACTIVE.1 +3650623985=6180739465983163.Perpetual.ACTIVE +5395102604=6087137504864318.Temporary.ACTIVE.1 +7401957693=4310753015062917.Perpetual.EXPIRED +9532471481=3625820481728750.Perpetual.ACTIVE +5631679610=5974302165180486.Temporary.ACTIVE.1 +8237143953=6310830148265076.Perpetual.ACTIVE +8609350695=3769159608170398.Temporary.ACTIVE.1 +2039785170=4715983728469754.Perpetual.ACTIVE +3671896039=6472460392013526.Temporary.ACTIVE.1 +2394791487=6290730891493718.Perpetual.ACTIVE +7487014395=9728127409189084.Perpetual.ACTIVE +9061758031=2914307318368493.Perpetual.ACTIVE +2470610597=2412058925486082.Perpetual.ACTIVE +9102514813=5184574910340894.Perpetual.ACTIVE +8397598618=3587293603823749.Perpetual.ACTIVE +7508742094=3463274198021570.Temporary.ACTIVE.1 +8935017681=3528641205762701.Perpetual.ACTIVE +3017945847=2041578528962531.Perpetual.ACTIVE +8690896351=4968261735480318.Perpetual.ACTIVE diff --git a/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieForUinGenerator.json b/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieForUinGenerator.json index f3b2915516..f1480012a4 100644 --- a/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieForUinGenerator.json +++ b/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieForUinGenerator.json @@ -2,8 +2,8 @@ "id": "mosip.otpnotification.send", "metadata": {}, "request": { - "clientId": "regproc_app_user", - "secretKey": "80565e06e382d5e8b924123feb6ef43b", + "clientId": "registration-processor", + "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b", "appId": "registrationprocessor" }, "requesttime": "$TIMESTAMPZ$", diff --git a/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieRequest.json b/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieRequest.json index f9fec3ed91..3eae3a22f7 100644 --- a/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieRequest.json +++ b/automationtests/src/main/resources/idRepository/TestData/Security/GetCookie/getCookieRequest.json @@ -1,8 +1,8 @@ { "id": "string", "request": { - "clientId": "ida_app_user", - "secretKey": "5debb60adbfcf8feea4a6ed6160092ec", + "clientId": "ida", + "secretKey": "bad25866-e6a5-4f93-831a-08923ea6eee0", "appId": "ida" }, "requesttime": "$TIMESTAMPZ$", diff --git a/automationtests/src/main/resources/ida/TestData/Bio/Face/testdata.ida.Bio.Face.mapping.yml b/automationtests/src/main/resources/ida/TestData/Bio/Face/testdata.ida.Bio.Face.mapping.yml index a919f5c3af..e7b5e88bb3 100644 --- a/automationtests/src/main/resources/ida/TestData/Bio/Face/testdata.ida.Bio.Face.mapping.yml +++ b/automationtests/src/main/resources/ida/TestData/Bio/Face/testdata.ida.Bio.Face.mapping.yml @@ -2666,69 +2666,6 @@ testdata: output.1.response.error.errorCode: $errors:MissingDeviceType:errorCode$ output.1.response.error.errorMessage: $errors:MissingDeviceType:errorMessage$ - Authentication_Biometric_Missing_DeviceSubType_Neg: - endpoint.url: - partnerIDMispLK: $PIDMLKURL:ValidPIDMLK$ - input.bio-auth-request: - AuthReq.individualId: $UIN$ - AuthReq.requestTime: $TIMESTAMP$ - AuthReq.transactionID: $RANDOM:N:10$ - input.identity-encrypt-data: - identityReq.bioSubType: $TestData:bio_face_subType$ - identityReq.bioType: $TestData:bio_face_type$ - identityReq.timestamp: $TIMESTAMP$ - identityReq.data.timestamp: $TIMESTAMP$ - identityReq.transactionID: $input.bio-auth-request:AuthReq.transactionID$ - identityReq.bioValue: $idrepo~$input.bio-auth-request:AuthReq.individualId$~DECODEFILE:individualBiometricsValue~//BIR/BDBInfo[Type='Face']//following::BDB$ - #Device - identityReq.deviceCode: $Device:face:code$ - identityReq.deviceProviderID: $Device:face:provider_id$ - identityReq.deviceServiceVersion: $Device:face:sw_version$ - identityReq.digitalId.serialNo: $Device:face:serial_number$ - identityReq.digitalId.make: $Device:face:make$ - identityReq.digitalId.model: $Device:face:model$ - identityReq.digitalId.deviceProvider: $Device:face:provider_name$ - identityReq.digitalId.deviceProviderId: $Device:face:provider_id$ - identityReq.digitalId.dateTime: $TIMESTAMP$ - identityReq.digitalId.subType: '' - output.output-1-expected-n-res: - output.1.response.status: $TestData:auth_Fail_status$ - output.1.response.responseTime: $TIMESTAMP$ - output.1.response.transactionID: $input.bio-auth-request:AuthReq.transactionID$ - output.1.response.error.errorCode: $errors:MissingDeviceSubType:errorCode$ - output.1.response.error.errorMessage: $errors:MissingDeviceSubType:errorMessage$ - - Authentication_Biometric_Without_DeviceProviderId_Neg: - endpoint.url: - partnerIDMispLK: $PIDMLKURL:ValidPIDMLK$ - input.bio-auth-request: - AuthReq.individualId: $UIN$ - AuthReq.requestTime: $TIMESTAMP$ - AuthReq.transactionID: $RANDOM:N:10$ - input.identity-encrypt-data: - identityReq.bioSubType: $TestData:bio_face_subType$ - identityReq.bioType: $TestData:bio_face_type$ - identityReq.timestamp: $TIMESTAMP$ - identityReq.data.timestamp: $TIMESTAMP$ - identityReq.transactionID: $input.bio-auth-request:AuthReq.transactionID$ - identityReq.bioValue: $idrepo~$input.bio-auth-request:AuthReq.individualId$~DECODEFILE:individualBiometricsValue~//BIR/BDBInfo[Type='Face']//following::BDB$ - #Device - identityReq.deviceCode: $Device:face:code$ - identityReq.deviceProviderID: $Device:face:provider_id$ - identityReq.deviceServiceVersion: $Device:face:sw_version$ - identityReq.digitalId.serialNo: $Device:face:serial_number$ - identityReq.digitalId.make: $Device:face:make$ - identityReq.digitalId.model: $Device:face:model$ - identityReq.digitalId.deviceProvider: $Device:face:provider_name$ - identityReq.digitalId.deviceProviderId: $REMOVE$ - identityReq.digitalId.dateTime: $TIMESTAMP$ - output.output-1-expected-n-res: - output.1.response.status: $TestData:auth_Fail_status$ - output.1.response.responseTime: $TIMESTAMP$ - output.1.response.transactionID: $input.bio-auth-request:AuthReq.transactionID$ - output.1.response.error.errorCode: $errors:MissingDeviceProviderID:errorCode$ - output.1.response.error.errorMessage: $errors:MissingDeviceProviderID:errorMessage$ - Authentication_Biometric_without_DeviceProvider_Neg: endpoint.url: partnerIDMispLK: $PIDMLKURL:ValidPIDMLK$ diff --git a/automationtests/src/main/resources/ida/TestData/Demo/Name/testdata.ida.Demo.Name.mapping.yml b/automationtests/src/main/resources/ida/TestData/Demo/Name/testdata.ida.Demo.Name.mapping.yml index f24c60f504..993abcf13a 100644 --- a/automationtests/src/main/resources/ida/TestData/Demo/Name/testdata.ida.Demo.Name.mapping.yml +++ b/automationtests/src/main/resources/ida/TestData/Demo/Name/testdata.ida.Demo.Name.mapping.yml @@ -194,7 +194,6 @@ testdata: partnerIDMispLK: $PIDMLKURL:ValidPIDMLK$ input.demo-auth-request: AuthReq.individualId: $UIN$ - AuthReq.requestTime: $TIMESTAMP$ AuthReq.transactionID: $RANDOM:N:10$ input.identity-encrypt-data: identityReq.valuename: $idrepo~$input.demo-auth-request:AuthReq.individualId$~valuefullName:langcode:TestData:secondary_lang_code$ diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/authTypeStatus.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/authTypeStatus.properties index ce0c939ebe..e955efced5 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/authTypeStatus.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/authTypeStatus.properties @@ -1,11 +1,11 @@ -#Tue Dec 10 15:41:24 IST 2019 -VID.bio.IIR.true=3691684639478379 -UIN.bio.IIR.true=2549530793 -UIN.demo.true=6194165205 -VID.demo.true=2793295043053173 -VID.otp.true=2819657927340762 -VID.bio.FIR.true=6081270289649035 -VID.bio.FACE.true=3691684639478379 -UIN.otp.true=2836817908 -UIN.bio.FIR.true=5816274852 -UIN.bio.FACE.true=3902754670 +#Mon Dec 16 18:09:52 IST 2019 +VID.bio.IIR.true=3728540926913947 +UIN.bio.IIR.true=9034204963 +UIN.demo.true=3967537243 +VID.demo.true=3620610476851824 +VID.otp.true=4087597493285470 +VID.bio.FIR.true=5297143784591582 +VID.bio.FACE.true=4087597493285470 +UIN.otp.true=9034204963 +UIN.bio.FIR.true=9034204963 +UIN.bio.FACE.true=6957314961 diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/authenitcationTestdata.yaml b/automationtests/src/main/resources/ida/TestData/RunConfig/authenitcationTestdata.yaml index 33a9c9e885..6709d0e696 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/authenitcationTestdata.yaml +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/authenitcationTestdata.yaml @@ -381,14 +381,20 @@ int.face.deviceid: - SYNCBYTE.LTC165 qa.face.deviceid: - SYNCBYTE.LTC165 +dev.face.deviceid: + - SYNCBYTE.LTC165 int.finger.deviceid: - SYNCBYTE.LTC165 qa.finger.deviceid: - SYNCBYTE.LTC163 +dev.finger.deviceid: + - SYNCBYTE.MC01A int.iris.deviceid: - SYNCBYTE.LTC165 qa.iris.deviceid: - SYNCBYTE.LTC164 +dev.iris.deviceid: + - SYNCBYTE.TCI322 bio_iris_deviceCode: - cogent bio_iris_deviceProviderID: diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/envRunConfig.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/envRunConfig.properties index 5d340c5955..5f8bb7a785 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/envRunConfig.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/envRunConfig.properties @@ -21,6 +21,7 @@ idRepoRegenerateVidPath=/idrepository/v1/vid/$vid$/regenerate cryptomanagerEncrypt=/v1/cryptomanager/encrypt #Security clientidsecretkey=/v1/authmanager/authenticate/clientidsecretkey +useridPwd=/v1/authmanager/authenticate/useridPwd #DeploymenyVersion authVersion=1.0 idrepoVersion=v1 @@ -29,6 +30,7 @@ demoAppVersion=0.10.0 dev.encryptionPort=7654 int.encryptionPort=7655 qa.encryptionPort=7656 +security.encryptionPort=7657 ext-int.encryptionPort=7656 encryptUtilBaseUrl=http://$hostname$:$port$/v1 encryptionPath=/identity/encrypt?isInternal=false diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/errorCodeMsg.yml b/automationtests/src/main/resources/ida/TestData/RunConfig/errorCodeMsg.yml index abedd1934e..8eb8ef9dfb 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/errorCodeMsg.yml +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/errorCodeMsg.yml @@ -176,7 +176,7 @@ errors: actionMessage: Your Biometric data is not available in MOSIP InvalidBioSubtype: errorCode: IDA-MLC-009 - errorMessage: $REGEXP:Invalid Input Parameter - bioSubType - .* for bioType .*$ + errorMessage: $REGEXP:Invalid Input Parameter - request/biometrics/.*/data/bioSubType.*$ FaceExceed1: errorCode: IDA-BIA-009 errorMessage: Number of FACE records should not exceed 1 @@ -197,7 +197,7 @@ errors: errorMessage: BIO-IIR Authentication usage not allowed as per policy MissingBioSubtype: errorCode: IDA-MLC-006 - errorMessage: Missing Input Parameter - bioSubType + errorMessage: Missing Input Parameter - request/biometrics/0/data/bioSubType MissingBioType: errorCode: IDA-MLC-006 errorMessage: Missing Input Parameter - request/biometrics/0/data/bioType diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/rid.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/rid.properties index 0ef85f80d6..70821e5f6b 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/rid.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/rid.properties @@ -1,42 +1,42 @@ -#Tue Dec 10 13:07:54 IST 2019 -27847657360002520191210130441=7384126058 -27847657360002520191210130319=5816274852 -27847657360002520191210130605=5620582918 -27847657360002520191210130313=6194165205 -27847657360002520191210130630=8496106903 -27847657360002520191210130341=9041257315 -27847657360002520191210130507=7607125306 -27847657360002520191210130539=7068176043 -27847657360002520191210130247=3902754670 -27847657360002520191210130532=2439082387 -27847657360002520191210130729=6495603823 -27847657360002520191210130241=4085925023 -27847657360002520191210130404=7685235921 -27847657360002520191210130723=7316754915 -27847657360002520191210130433=9581576038 -27847657360002520191210130334=3107546539 -27847657360002520191210130301=2549530793 -27847657360002520191210130621=7913409756 -27847657360002520191210130525=6197436238 -27847657360002520191210130557=6710695348 -27847657360002520191210130233=9203256095 -27847657360002520191210130747=9025764301 -27847657360002520191210130458=8604857912 -27847657360002520191210130425=7367024978 -27847657360002520191210130740=4158937461 -27847657360002520191210130649=7410283586 -27847657360002520191210130328=9471874067 -27847657360002520191210130613=7415630250 -27847657360002520191210130356=8498695645 -27847657360002520191210130640=9135871905 -27847657360002520191210130518=2308314732 -27847657360002520191210130350=6457159139 -27847657360002520191210130548=6389172945 -27847657360002520191210130224=5035607423 -27847657360002520191210130254=2836817908 -27847657360002520191210130709=8615927168 -27847657360002520191210130418=4159354701 -27847657360002520191210130449=4308376906 -27847657360002520191210130733=5981647369 -27847657360002520191210130700=9214698436 -27847657360002520191210130411=8758142704 +#Mon Dec 16 18:07:27 IST 2019 +27847657360002520191216180339=8910493759 +27847657360002520191216180658=7308215290 +27847657360002520191216180303=4951489457 +27847657360002520191216180622=4769049724 +27847657360002520191216180654=3795104386 +27847657360002520191216180331=2157941082 +27847657360002520191216180527=3519560342 +27847657360002520191216180206=6957314961 +27847657360002520191216180554=6537290582 +27847657360002520191216180233=7691281956 +27847657360002520191216180718=7059157287 +27847657360002520191216180138=3203758435 +27847657360002520191216180423=9680935716 +27847657360002520191216180450=4591346927 +27847657360002520191216180647=7451673590 +27847657360002520191216180614=2178324129 +27847657360002520191216180358=6346035974 +27847657360002520191216180323=2453725418 +27847657360002520191216180517=8603854058 +27847657360002520191216180547=6586183781 +27847657360002520191216180223=8960450870 +27847657360002520191216180708=4974830852 +27847657360002520191216180251=3781975693 +27847657360002520191216180128=5173580167 +27847657360002520191216180414=5018547564 +27847657360002520191216180158=3207381657 +27847657360002520191216180443=3258438546 +27847657360002520191216180639=4271256475 +27847657360002520191216180348=6457487092 +27847657360002520191216180604=6401761281 +27847657360002520191216180312=8157192798 +27847657360002520191216180509=4652859810 +27847657360002520191216180630=3608326931 +27847657360002520191216180538=6472380176 +27847657360002520191216180214=3967537243 +27847657360002520191216180501=8653094372 +27847657360002520191216180243=5164731759 +27847657360002520191216180406=8938574278 +27847657360002520191216180117=8396258614 +27847657360002520191216180149=9034204963 +27847657360002520191216180433=9162501760 diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/runConfiguration.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/runConfiguration.properties index 5fb1610cea..4c63b26f0c 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/runConfiguration.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/runConfiguration.properties @@ -37,12 +37,12 @@ CreateUinRecord.invocationCount=1 CreateVID.testDataPath[1]=ida/TestData/VIDData/VIDGeneration/ CreateVID.testDataFileName[1]=testdata.ida.VIDData.VIDGeneration.mapping.yml CreateVID.invocationCount=1 -BiometricAuthentication.testDataPath[2]=ida/TestData/Bio/Face/ -BiometricAuthentication.testDataFileName[2]=testdata.ida.Bio.Face.mapping.yml +BiometricAuthentication.testDataPath[1]=ida/TestData/Bio/Face/ +BiometricAuthentication.testDataFileName[1]=testdata.ida.Bio.Face.mapping.yml BiometricAuthentication.testDataPath[3]=ida/TestData/Bio/Iris/ BiometricAuthentication.testDataFileName[3]=testdata.ida.bio.AuthWithIris.mapping.yml -BiometricAuthentication.testDataPath[1]=ida/TestData/Bio/FingerPrint/ -BiometricAuthentication.testDataFileName[1]=testdata.ida.bio.AuthWithFingerPrint.mapping.yml +BiometricAuthentication.testDataPath[2]=ida/TestData/Bio/FingerPrint/ +BiometricAuthentication.testDataFileName[2]=testdata.ida.bio.AuthWithFingerPrint.mapping.yml BiometricAuthentication.invocationCount=1 EkycWithBiometricAuthentication.testDataPath[1]=ida/TestData/Ekyc/Bio/ EkycWithBiometricAuthentication.testDataFileName[1]=testdata.ida.Ekyc.AuthWithBiometric.mapping.yml diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/uin.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/uin.properties index 5496df4cd4..15f5496ef5 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/uin.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/uin.properties @@ -1,42 +1,42 @@ -#Tue Dec 10 13:08:05 IST 2019 -8615927168=Update_UIN_Deactivated -4308376906=Authentication_Create_valid_uin_11_record -6389172945=Authentication_Create_valid_uin_18_record -7685235921=Authentication_Create_uin_With_VID_type_temporary_record_5 -9214698436=Authentication_Create_valid_uin_smoke_1_record -6710695348=Authentication_Create_valid_uin_19_record -7316754915=Authentication_Create_valid_uin_smoke_3_record -9025764301=Authentication_OTP_FLOD_record -3107546539=Authentication_Create_uin_With_VID_type_temporary_record_1 -3902754670=Authentication_Create_uin_LOCKUIN_1_record -6495603823=Authentication_Create_withoutBio_record -8758142704=Authentication_Create_uin_With_VID_type_temporary_record_6 -8604857912=Authentication_Create_valid_uin_12_record -5620582918=Authentication_Create_valid_uin_4_record -7607125306=Authentication_Create_valid_uin_13_record -7913409756=Authentication_Create_valid_uin_6_record -7415630250=Authentication_Create_valid_uin_5_record -2836817908=Authentication_Create_uin_LOCKUIN_2_record -4159354701=Authentication_Create_uin_With_VID_type_temporary_record_7 -7068176043=Authentication_Create_valid_uin_17_record -9581576038=Authentication_Create_uin_With_VID_type_temporary_record_9 -5816274852=Authentication_Create_uin_LOCKUIN_5_record -8498695645=Authentication_Create_uin_With_VID_type_temporary_record_4 -6197436238=Authentication_Create_valid_uin_15_record -2308314732=Authentication_Create_valid_uin_14_record -9203256095=Authentication_Create_GenderFLE_record -2549530793=Authentication_Create_uin_LOCKUIN_3_record -7367024978=Authentication_Create_uin_With_VID_type_temporary_record_8 -4158937461=Authentication_OTP_EXCEED_record -4085925023=Authentication_Create_GenderMLE_record -9471874067=Authentication_Create_uin_LOCKUIN_6_record -5981647369=Authentication_IdentityMismatch_OTP_record -2439082387=Authentication_Create_valid_uin_16_record -9041257315=Authentication_Create_uin_With_VID_type_temporary_record_2 -8496106903=Authentication_Create_valid_uin_7_record -6457159139=Authentication_Create_uin_With_VID_type_temporary_record_3 -6194165205=Authentication_Create_uin_LOCKUIN_4_record -7410283586=Authentication_Create_valid_uin_9_record -9135871905=Authentication_Create_valid_uin_8_record -7384126058=Authentication_Create_valid_uin_10_record -5035607423=Authentication_Create_DR_smoke_record +#Mon Dec 16 18:07:39 IST 2019 +3519560342=Authentication_Create_valid_uin_19_record +6586183781=Authentication_Create_valid_uin_5_record +6457487092=Authentication_Create_uin_With_VID_type_temporary_record_8 +8653094372=Authentication_Create_valid_uin_16_record +2178324129=Authentication_Create_valid_uin_8_record +7691281956=Authentication_Create_uin_LOCKUIN_6_record +5173580167=Authentication_Create_GenderFLE_record +3781975693=Authentication_Create_uin_With_VID_type_temporary_record_2 +4769049724=Authentication_Create_valid_uin_9_record +7308215290=Authentication_IdentityMismatch_OTP_record +6957314961=Authentication_Create_uin_LOCKUIN_3_record +6472380176=Authentication_Create_valid_uin_4_record +3795104386=Authentication_Create_withoutBio_record +7451673590=Authentication_Create_valid_uin_smoke_3_record +8960450870=Authentication_Create_uin_LOCKUIN_5_record +8938574278=Update_UIN_Deactivated +4951489457=Authentication_Create_uin_With_VID_type_temporary_record_3 +3258438546=Authentication_Create_valid_uin_14_record +6401761281=Authentication_Create_valid_uin_7_record +3203758435=Authentication_Create_GenderMLE_record +8157192798=Authentication_Create_uin_With_VID_type_temporary_record_4 +8396258614=Authentication_Create_DR_smoke_record +4271256475=Authentication_Create_valid_uin_smoke_2_record +2157941082=Authentication_Create_uin_With_VID_type_temporary_record_6 +5164731759=Authentication_Create_uin_With_VID_type_temporary_record_1 +3608326931=Authentication_Create_valid_uin_smoke_1_record +6346035974=Authentication_Create_uin_With_VID_type_temporary_record_9 +9680935716=Authentication_Create_valid_uin_12_record +9034204963=Authentication_Create_uin_LOCKUIN_1_record +2453725418=Authentication_Create_uin_With_VID_type_temporary_record_5 +4591346927=Authentication_Create_valid_uin_15_record +3207381657=Authentication_Create_uin_LOCKUIN_2_record +8910493759=Authentication_Create_uin_With_VID_type_temporary_record_7 +5018547564=Authentication_Create_valid_uin_11_record +8603854058=Authentication_Create_valid_uin_18_record +7059157287=Authentication_OTP_FLOD_record +4974830852=Authentication_OTP_EXCEED_record +9162501760=Authentication_Create_valid_uin_13_record +4652859810=Authentication_Create_valid_uin_17_record +6537290582=Authentication_Create_valid_uin_6_record +3967537243=Authentication_Create_uin_LOCKUIN_4_record diff --git a/automationtests/src/main/resources/ida/TestData/RunConfig/vid.properties b/automationtests/src/main/resources/ida/TestData/RunConfig/vid.properties index b993928a8d..6d774f06f9 100644 --- a/automationtests/src/main/resources/ida/TestData/RunConfig/vid.properties +++ b/automationtests/src/main/resources/ida/TestData/RunConfig/vid.properties @@ -1,41 +1,41 @@ -#Tue Dec 10 13:08:30 IST 2019 -4308376906=5739423517830862.Perpetual.ACTIVE -6389172945=4271326895362315.Perpetual.REVOKED -7685235921=4084103296837214.Temporary.ACTIVE.1 -9214698436=5762490471397837.Perpetual.DEACTIVATED -6710695348=2894592483270561.Perpetual.ACTIVE -7316754915=4732709206596240.Perpetual.ACTIVE -9025764301=6405902491682312.Perpetual.ACTIVE -3107546539=5285710946915647.Temporary.ACTIVE.1 -3902754670=3691684639478379.Perpetual.ACTIVE -6495603823=5763046938427953.Perpetual.ACTIVE -8758142704=6702871581980932.Temporary.ACTIVE.1 -8604857912=4903981506291025.Perpetual.ACTIVE -5620582918=8675301935482051.Perpetual.ACTIVE -7607125306=5820985483756236.Perpetual.ACTIVE -7913409756=2408134628576420.Perpetual.ACTIVE -7415630250=2078370659015312.Perpetual.INACTIVE -2836817908=5168340612539630.Perpetual.ACTIVE -4159354701=4976143863081034.Temporary.ACTIVE.1 -7068176043=2153278125635247.Perpetual.ACTIVE -9581576038=3469064261721509.Temporary.ACTIVE.1 -5816274852=2713417526950390.Perpetual.ACTIVE -8498695645=4506194315360465.Temporary.ACTIVE.1 -6197436238=2674531085170520.Perpetual.ACTIVE -2308314732=5469357406503841.Perpetual.ACTIVE -9203256095=4369574097235418.Perpetual.ACTIVE -2549530793=6081270289649035.Perpetual.ACTIVE -7367024978=3782572491062083.Temporary.ACTIVE.1 -4158937461=5621587197094730.Perpetual.ACTIVE -4085925023=3128054852306534.Perpetual.ACTIVE -9471874067=2793295043053173.Perpetual.ACTIVE -5981647369=6153124625048520.Perpetual.ACTIVE -2439082387=7957348175378051.Perpetual.ACTIVE -9041257315=2437942182361934.Temporary.ACTIVE.1 -8496106903=4932891359278410.Perpetual.ACTIVE -6457159139=5475386974032042.Temporary.ACTIVE.1 -6194165205=2819657927340762.Perpetual.ACTIVE -7410283586=6328315098605368.Perpetual.ACTIVE -9135871905=3798172315085932.Perpetual.ACTIVE -7384126058=4637507153982703.Perpetual.EXPIRED -5035607423=3206507630516879.Perpetual.ACTIVE +#Mon Dec 16 18:08:10 IST 2019 +3519560342=2675698163245862.Perpetual.ACTIVE +6586183781=6326713916947819.Perpetual.ACTIVE +6457487092=4867162708256097.Temporary.ACTIVE.1 +8653094372=3819470451890352.Perpetual.ACTIVE +2178324129=6496730710269280.Perpetual.ACTIVE +7691281956=3761796583605298.Perpetual.ACTIVE +5173580167=3253914709354968.Perpetual.DEACTIVATED +3781975693=5391751427340867.Temporary.ACTIVE.1 +4769049724=4915081305179462.Perpetual.ACTIVE +7308215290=5621394583425965.Perpetual.ACTIVE +6957314961=4087597493285470.Perpetual.ACTIVE +6472380176=4803253652315729.Perpetual.ACTIVE +3795104386=4109621875316574.Perpetual.ACTIVE +7451673590=5095390867924659.Perpetual.ACTIVE +8960450870=5297143784591582.Perpetual.ACTIVE +4951489457=3256427540963180.Temporary.ACTIVE.1 +3258438546=4691268175078573.Perpetual.ACTIVE +6401761281=2489057364716026.Perpetual.REVOKED +3203758435=3628097630139523.Perpetual.ACTIVE +8157192798=2315814201729452.Temporary.ACTIVE.1 +8396258614=2352438419467159.Perpetual.ACTIVE +4271256475=5342691470258962.Perpetual.ACTIVE +2157941082=5410637421609159.Temporary.ACTIVE.1 +5164731759=5175284536724832.Temporary.ACTIVE.1 +3608326931=4193206130962185.Perpetual.INACTIVE +6346035974=5927198129316805.Temporary.ACTIVE.1 +9680935716=5723084059175263.Perpetual.ACTIVE +9034204963=3728540926913947.Perpetual.ACTIVE +2453725418=8739659489740920.Temporary.ACTIVE.1 +4591346927=2316956051307820.Perpetual.ACTIVE +3207381657=3620610476851824.Perpetual.ACTIVE +8910493759=2018614095324706.Temporary.ACTIVE.1 +5018547564=4517418076927103.Perpetual.EXPIRED +8603854058=5147548672690791.Perpetual.ACTIVE +4974830852=3486429439028468.Perpetual.ACTIVE +7059157287=4956013725719762.Perpetual.ACTIVE +9162501760=2067043847368941.Perpetual.ACTIVE +6537290582=4657436270189124.Perpetual.ACTIVE +4652859810=6591697384061725.Perpetual.ACTIVE +3967537243=5927428367196034.Perpetual.ACTIVE diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForInternalAuth.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForInternalAuth.json similarity index 61% rename from automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForInternalAuth.json rename to automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForInternalAuth.json index f3b2915516..f1480012a4 100644 --- a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForInternalAuth.json +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForInternalAuth.json @@ -2,8 +2,8 @@ "id": "mosip.otpnotification.send", "metadata": {}, "request": { - "clientId": "regproc_app_user", - "secretKey": "80565e06e382d5e8b924123feb6ef43b", + "clientId": "registration-processor", + "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b", "appId": "registrationprocessor" }, "requesttime": "$TIMESTAMPZ$", diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForUinGenerator.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForUinGenerator.json similarity index 61% rename from automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForUinGenerator.json rename to automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForUinGenerator.json index f3b2915516..f1480012a4 100644 --- a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieForUinGenerator.json +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieForUinGenerator.json @@ -2,8 +2,8 @@ "id": "mosip.otpnotification.send", "metadata": {}, "request": { - "clientId": "regproc_app_user", - "secretKey": "80565e06e382d5e8b924123feb6ef43b", + "clientId": "registration-processor", + "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b", "appId": "registrationprocessor" }, "requesttime": "$TIMESTAMPZ$", diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieRequest.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieRequest.json similarity index 54% rename from automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieRequest.json rename to automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieRequest.json index f9fec3ed91..3eae3a22f7 100644 --- a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/getCookieRequest.json +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.getCookieRequest.json @@ -1,8 +1,8 @@ { "id": "string", "request": { - "clientId": "ida_app_user", - "secretKey": "5debb60adbfcf8feea4a6ed6160092ec", + "clientId": "ida", + "secretKey": "bad25866-e6a5-4f93-831a-08923ea6eee0", "appId": "ida" }, "requesttime": "$TIMESTAMPZ$", diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.residentServiceCredential.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.residentServiceCredential.json new file mode 100644 index 0000000000..7f66f6506c --- /dev/null +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/dev.residentServiceCredential.json @@ -0,0 +1,10 @@ +{ + "id": "string", + "request": { + "clientId": "resident", + "secretKey": "dbe554cd-81e8-44c2-b8ec-3d8090aca1f4", + "appId": "resident" + }, + "requesttime": "$TIMESTAMPZ$", + "version": "string" +} \ No newline at end of file diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForInternalAuth.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForInternalAuth.json new file mode 100644 index 0000000000..f1480012a4 --- /dev/null +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForInternalAuth.json @@ -0,0 +1,11 @@ +{ + "id": "mosip.otpnotification.send", + "metadata": {}, + "request": { + "clientId": "registration-processor", + "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b", + "appId": "registrationprocessor" + }, + "requesttime": "$TIMESTAMPZ$", + "version": "v1.0" +} \ No newline at end of file diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForUinGenerator.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForUinGenerator.json new file mode 100644 index 0000000000..f1480012a4 --- /dev/null +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieForUinGenerator.json @@ -0,0 +1,11 @@ +{ + "id": "mosip.otpnotification.send", + "metadata": {}, + "request": { + "clientId": "registration-processor", + "secretKey": "d80ec0be-bba7-4d8e-bf0c-85ab45bb976b", + "appId": "registrationprocessor" + }, + "requesttime": "$TIMESTAMPZ$", + "version": "v1.0" +} \ No newline at end of file diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieRequest.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieRequest.json new file mode 100644 index 0000000000..3eae3a22f7 --- /dev/null +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.getCookieRequest.json @@ -0,0 +1,10 @@ +{ + "id": "string", + "request": { + "clientId": "ida", + "secretKey": "bad25866-e6a5-4f93-831a-08923ea6eee0", + "appId": "ida" + }, + "requesttime": "$TIMESTAMPZ$", + "version": "string" +} \ No newline at end of file diff --git a/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.residentServiceCredential.json b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.residentServiceCredential.json new file mode 100644 index 0000000000..65ed25c3b2 --- /dev/null +++ b/automationtests/src/main/resources/ida/TestData/Security/GetCookie/qa.residentServiceCredential.json @@ -0,0 +1,10 @@ +{ + "request": { + "clientId": "resident", + "secretKey": "9d897adb-e857-419d-818f-65585c98a482", + "appId": "resident" + }, + "requesttime": "$TIMESTAMPZ$", + "id": "string", + "version": "string" +} \ No newline at end of file diff --git a/automationtests/src/main/resources/testngapi.xml b/automationtests/src/main/resources/testngapi.xml index 4d35bf6388..8b90bc131f 100644 --- a/automationtests/src/main/resources/testngapi.xml +++ b/automationtests/src/main/resources/testngapi.xml @@ -10,7 +10,7 @@ class-name="io.mosip.authentication.fw.util.AuthenticationTestsListener" /> - + - + From 899d70d30222a42ee8205059f931928ff808866c Mon Sep 17 00:00:00 2001 From: M1049813 Date: Tue, 17 Dec 2019 15:44:59 +0530 Subject: [PATCH 2/3] Reverting back base test case class --- .../src/main/java/io/mosip/service/BaseTestCase.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/automationtests/src/main/java/io/mosip/service/BaseTestCase.java b/automationtests/src/main/java/io/mosip/service/BaseTestCase.java index 93c6c07a16..d3d4199472 100644 --- a/automationtests/src/main/java/io/mosip/service/BaseTestCase.java +++ b/automationtests/src/main/java/io/mosip/service/BaseTestCase.java @@ -99,11 +99,11 @@ public static String getOSType(){ public static void initialize() { - /*copyDbInTarget(); + copyDbInTarget(); PropertyConfigurator.configure(getLoggerPropertyConfig()); kernelAuthLib = new KernelAuthentication(); kernelCmnLib = new CommonLibrary(); - queries = kernelCmnLib.readProperty("adminQueries");*/ + queries = kernelCmnLib.readProperty("adminQueries"); /** * Make sure test-output is there */ @@ -144,10 +144,10 @@ public static void suiteSetup() { initialize(); logger.info("Done with BeforeSuite and test case setup! BEGINNING TEST EXECUTION!\n\n"); - /*PreRegistrationLibrary pil=new PreRegistrationLibrary(); + PreRegistrationLibrary pil=new PreRegistrationLibrary(); pil.PreRegistrationResourceIntialize(); new PreregistrationDAO().deleteAvailableSlot(); - new PreregistrationDAO().makeAllRegistartionCenterActive();*/ + new PreregistrationDAO().makeAllRegistartionCenterActive(); AuthTestsUtil.removeOldMosipTempTestResource(); AuthTestsUtil.initiateAuthTest(); AdminTestUtil.initiateAdminTest(); @@ -161,8 +161,8 @@ public static void suiteSetup() { * consumedPreRegIds list contain list of consumed pre registration ids * */ - /*expiredPreRegIds=lib.BookExpiredApplication(); - consumedPreRegIds=lib.consumedPreId();*/ + expiredPreRegIds=lib.BookExpiredApplication(); + consumedPreRegIds=lib.consumedPreId(); /** * here we are assuming batch job will run in every 5 min thats why we are giving wait for 10 min From 170bc198d768e53af53ad9cf4d0af5f4e54a0126 Mon Sep 17 00:00:00 2001 From: tabishkhan7 Date: Wed, 18 Dec 2019 11:46:01 +0530 Subject: [PATCH 3/3] MOS-29557 : Updated Pom Version --- automationtests/pom.xml | 2 +- .../registration/tests/CreateUinRecord.java | 254 ++++++++++++++++++ e2etestrig/e2etests/pom.xml | 10 +- e2etestrig/ida-automation/pom.xml | 2 +- e2etestrig/pom.xml | 2 +- e2etestrig/pre-reg-automation/pom.xml | 2 +- e2etestrig/reg-client-automation/pom.xml | 2 +- e2etestrig/reg-proc-automation/pom.xml | 2 +- 8 files changed, 265 insertions(+), 11 deletions(-) create mode 100644 automationtests/src/main/java/io/mosip/registration/tests/CreateUinRecord.java diff --git a/automationtests/pom.xml b/automationtests/pom.xml index 63f1b18414..fb9fc233eb 100644 --- a/automationtests/pom.xml +++ b/automationtests/pom.xml @@ -11,7 +11,7 @@ io.mosip mosip-parent - 1.0.1 + 1.0.2 diff --git a/automationtests/src/main/java/io/mosip/registration/tests/CreateUinRecord.java b/automationtests/src/main/java/io/mosip/registration/tests/CreateUinRecord.java new file mode 100644 index 0000000000..87df712e6f --- /dev/null +++ b/automationtests/src/main/java/io/mosip/registration/tests/CreateUinRecord.java @@ -0,0 +1,254 @@ +package io.mosip.registration.tests; + +import java.io.File; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.log4j.Logger; +import org.testng.Assert; +import org.testng.ITest; +import org.testng.ITestResult; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.testng.internal.BaseTestMethod; +import org.testng.internal.TestResult; + +import io.mosip.authentication.fw.util.DataProviderClass; +import io.mosip.authentication.fw.util.FileUtil; +import io.mosip.authentication.fw.util.IdRepoUtil; +import io.mosip.authentication.fw.util.AuthenticationTestException; +import io.mosip.authentication.fw.dto.OutputValidationDto; +import io.mosip.authentication.fw.dto.RidDto; +import io.mosip.authentication.fw.dto.UinDto; +import io.mosip.authentication.fw.precon.JsonPrecondtion; +import io.mosip.authentication.fw.util.OutputValidationUtil; +import io.mosip.authentication.fw.util.PrerequisteTests; +import io.mosip.authentication.fw.util.ReportUtil; +import io.mosip.authentication.fw.util.RunConfigUtil; +import io.mosip.authentication.fw.util.TestParameters; +import io.mosip.authentication.testdata.TestDataProcessor; +import io.mosip.authentication.testdata.TestDataUtil; + +import org.testng.Reporter; + +/** + * Test to generate uin according to data provided in yml file + * + * @author Vignesh + * + */ +public class CreateUinRecord extends PrerequisteTests implements ITest { + + private static final Logger logger = Logger.getLogger(CreateUinRecord.class); + protected static String testCaseName = ""; + private Map storeUinData = new HashMap(); + private Map storeRidData = new HashMap(); + private String TESTDATA_PATH; + private String TESTDATA_FILENAME; + private String testType; + private int invocationCount = 0; + private String cookieValue; + private int retryCount; + /** + * Set Test Type - Smoke, Regression or Integration + * + * @param testType + */ + @BeforeClass + public void setTestType() { + this.testType = RunConfigUtil.getTestLevel(); + } + + /** + * Method set Test data path and its filename + * + * @param index + */ + public void setTestDataPathsAndFileNames(int index) { + this.TESTDATA_PATH = getTestDataPath(this.getClass().getSimpleName().toString(), index); + this.TESTDATA_FILENAME = getTestDataFileName(this.getClass().getSimpleName().toString(), index); + } + + /** + * Method set configuration + * + * @param testType + */ + public void setConfigurations(String testType) { + RunConfigUtil.getRunConfigObject("ida"); + RunConfigUtil.objRunConfig.setConfig(this.TESTDATA_PATH, this.TESTDATA_FILENAME, testType); + TestDataProcessor.initateTestDataProcess(this.TESTDATA_FILENAME, this.TESTDATA_PATH, "ida"); + } + + /** + * The method set test case name + * + * @param method + * @param testData + */ + @BeforeMethod + public void testData(Method method, Object[] testData) { + String testCase = ""; + if (testData != null && testData.length > 0) { + TestParameters testParams = null; + // Check if test method has actually received required parameters + for (Object testParameter : testData) { + if (testParameter instanceof TestParameters) { + testParams = (TestParameters) testParameter; + break; + } + } + if (testParams != null) { + testCase = testParams.getTestCaseName(); + } + } + CreateUinRecord.testCaseName = String.format("Create UIN"); + invocationCount++; + setTestDataPathsAndFileNames(invocationCount); + setConfigurations(this.testType); + } + + /** + * The test method perform generation of UIN test data + * + * @throws AuthenticationTestException + */ + @Test + public void generateUINTestData() throws AuthenticationTestException { + Object[][] object = DataProviderClass.getDataProvider( + RunConfigUtil.getResourcePath() + RunConfigUtil.objRunConfig.getScenarioPath(), + RunConfigUtil.objRunConfig.getScenarioPath(), this.testType); + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForUinGenerator(), + RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + RunConfigUtil.objRunConfig.getClientidsecretkey(), + AUTHORIZATHION_COOKIENAME); + for (int i = 1; i < object.length; i++) { + cookieValue = getAuthorizationCookie(getCookieRequestFilePathForUinGenerator(), + RunConfigUtil.objRunConfig.getIdRepoEndPointUrl() + + RunConfigUtil.objRunConfig.getClientidsecretkey(), + AUTHORIZATHION_COOKIENAME); + retryCount=0; + createUinDataTest(new TestParameters((TestParameters) object[i][0]), object[i][1].toString(), + object[i][2].toString()); + } + } + + /** + * Set current testcaseName + */ + @Override + public String getTestName() { + return this.testCaseName; + } + + /** + * The method ser current test name to result + * + * @param result + */ + @AfterMethod(alwaysRun = true) + public void setResultTestName(ITestResult result) { + try { + Field method = TestResult.class.getDeclaredField("m_method"); + method.setAccessible(true); + method.set(result, result.getMethod().clone()); + BaseTestMethod baseTestMethod = (BaseTestMethod) result.getMethod(); + Field f = baseTestMethod.getClass().getSuperclass().getDeclaredField("m_methodName"); + f.setAccessible(true); + f.set(baseTestMethod, CreateUinRecord.testCaseName); + } catch (Exception e) { + Reporter.log("Exception : " + e.getMessage()); + } + } + + /** + * The method perform uin test data + * + * @param objTestParameters + * @param testScenario + * @param testcaseName + * @throws AuthenticationTestException + */ + public void createUinDataTest(TestParameters objTestParameters, String testScenario, String testcaseName) + throws AuthenticationTestException { + File testCaseName = objTestParameters.getTestCaseFile(); + int testCaseNumber = Integer.parseInt(objTestParameters.getTestId()); + displayLog(testCaseName, testCaseNumber); + setTestFolder(testCaseName); + setTestCaseId(testCaseNumber); + setTestCaseName(testCaseName.getName()); + String mapping = TestDataUtil.getMappingPath(); + Map tempMap = new HashMap(); + String uin = IdRepoUtil.generateUinNumberForIda(); + DateFormat dateFormatter = new SimpleDateFormat("YYYYMMddHHmmss"); + Calendar cal = Calendar.getInstance(); + String timestampValue = dateFormatter.format(cal.getTime()); + String genRid = "278476573600025" + timestampValue; + tempMap.put("UIN", "LONG:" + uin); + tempMap.put("registrationId", genRid); + logger.info("************* IdRepo UIN request ******************"); + Reporter.log("UIN create request"); + Assert.assertEquals(modifyRequest(testCaseName.listFiles(), tempMap, mapping, "create"), true); + String rid=JsonPrecondtion.getValueFromJson(getContentFromFile(testCaseName.listFiles(),"create"), "request.registrationId"); + logger.info("******Post request Json to EndPointUrl: " + IdRepoUtil.getCreateUinPath() + " *******"); + if (!postRequestAndGenerateOuputFileForUINGeneration(testCaseName.listFiles(), IdRepoUtil.getCreateUinPath(), + "create", "output-1-actual-res", AUTHORIZATHION_COOKIENAME, cookieValue, 0)) + throw new AuthenticationTestException("Failed at HTTP-POST request"); + Map> ouputValid = OutputValidationUtil.doOutputValidation( + FileUtil.getFilePath(testCaseName, "output-1-actual").toString(), + FileUtil.getFilePath(testCaseName, "output-1-expected").toString()); + Reporter.log(ReportUtil.getOutputValiReport(ouputValid)); + if (!OutputValidationUtil.publishOutputResult(ouputValid)) { + if (retryCount <= 2) { + retryCount++; + createUinDataTest(objTestParameters, testScenario, testcaseName); + } + else + throw new AuthenticationTestException("Failed at output response validation"); + + } + wait(3000); + if (OutputValidationUtil.publishOutputResult(ouputValid)) { + storeUinData.put(uin, testcaseName); + storeRidData.put(rid, uin); + } + } + + /** + * The method store UIN numbers in property file + */ + public void storeUinData() { + UinDto.setUinData(storeUinData); + logger.info("Genereated UIN: " + UinDto.getUinData()); + generateMappingDic(new File(RunConfigUtil.getResourcePath() + "ida/" + RunConfigUtil.objRunConfig.getTestDataFolderName() + + "/RunConfig/uin.properties").getAbsolutePath(), UinDto.getUinData()); + generateMappingDic(new File(RunConfigUtil.getResourcePath() + "idRepository/" + RunConfigUtil.objRunConfig.getTestDataFolderName() + + "/RunConfig/uin.properties").getAbsolutePath(), UinDto.getUinData()); + } + + /** + * The method store RID numbers in property file + */ + public void storeRidData() { + RidDto.setRidData(storeRidData); + logger.info("Genereated RID: " + RidDto.getRidData()); + generateMappingDic(new File(RunConfigUtil.getResourcePath() + "ida/" + RunConfigUtil.objRunConfig.getTestDataFolderName() + + "/RunConfig/rid.properties").getAbsolutePath(), RidDto.getRidData()); + generateMappingDic(new File(RunConfigUtil.getResourcePath() + "idRepository/" + RunConfigUtil.objRunConfig.getTestDataFolderName() + + "/RunConfig/rid.properties").getAbsolutePath(), RidDto.getRidData()); + } + + @AfterClass + public void storeUinRidData() { + storeUinData(); + storeRidData(); + } + +} diff --git a/e2etestrig/e2etests/pom.xml b/e2etestrig/e2etests/pom.xml index f698813340..897688dfec 100644 --- a/e2etestrig/e2etests/pom.xml +++ b/e2etestrig/e2etests/pom.xml @@ -5,7 +5,7 @@ io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 e2etests @@ -15,22 +15,22 @@ io.mosip.e2etestrig preregistration - 1.0.1 + 1.0.2 io.mosip.e2etestrig reg-proc-automation - 1.0.1 + 1.0.2 io.mosip.e2etestrig reg-client-automation - 1.0.1 + 1.0.2 io.mosip.e2etestrig ida-automation -1.0.1 +1.0.2 org.apache.logging.log4j diff --git a/e2etestrig/ida-automation/pom.xml b/e2etestrig/ida-automation/pom.xml index db2f5f49e9..28c2aa7512 100644 --- a/e2etestrig/ida-automation/pom.xml +++ b/e2etestrig/ida-automation/pom.xml @@ -3,7 +3,7 @@ io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 ida-automation diff --git a/e2etestrig/pom.xml b/e2etestrig/pom.xml index 58654ed19d..73b71fadf2 100644 --- a/e2etestrig/pom.xml +++ b/e2etestrig/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 pom e2etests diff --git a/e2etestrig/pre-reg-automation/pom.xml b/e2etestrig/pre-reg-automation/pom.xml index 5579ecaef0..c22924a558 100644 --- a/e2etestrig/pre-reg-automation/pom.xml +++ b/e2etestrig/pre-reg-automation/pom.xml @@ -3,7 +3,7 @@ io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 preregistration diff --git a/e2etestrig/reg-client-automation/pom.xml b/e2etestrig/reg-client-automation/pom.xml index 846995e3f5..6a78222191 100644 --- a/e2etestrig/reg-client-automation/pom.xml +++ b/e2etestrig/reg-client-automation/pom.xml @@ -3,7 +3,7 @@ io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 reg-client-automation diff --git a/e2etestrig/reg-proc-automation/pom.xml b/e2etestrig/reg-proc-automation/pom.xml index 3bbf2a6ebc..5a0d0e8d1e 100644 --- a/e2etestrig/reg-proc-automation/pom.xml +++ b/e2etestrig/reg-proc-automation/pom.xml @@ -3,7 +3,7 @@ io.mosip.e2etestrig e2etestrig - 1.0.1 + 1.0.2 reg-proc-automation