diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java index 1646e62262..65aa07e3fb 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java @@ -72,10 +72,11 @@ public class BaseTestCase { public String adminCookie = null; public String testrigCookie = null; public String partnerCookie = null; - public String partnerrevampCookie = null; + public String partnerauthCookie = null; public String deviceproviderCookie = null; - public String partnerrevampdeviceCookie = null; - public String partnerrevampftmCookie = null; + public String partnerdeviceCookie = null; + public String partnerftmCookie = null; + public String partneradminCookie = null; public String partnerNewCookie = null; public String withoutpartnerCookie = null; public String withoutpolicyCookie = null; diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java index efe4b15d8b..139f588a54 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java @@ -34,10 +34,11 @@ public class KernelAuthentication extends BaseTestCase { private String partner_password = props.get("partner_user_password"); private String partner_userName = props.get("partner_userName"); - private String partner_revamp_userName = props.get("partner_revamp_userName"); + private String partner_auth_userName = props.get("partner_auth_userName"); private String device_provider_userName = props.get("device_provider_userName"); - private String partner_revamp_device_userName = props.get("partner_revamp_device_userName"); - private String partner_revamp_ftm_userName = props.get("partner_revamp_ftm_userName"); + private String partner_device_userName = props.get("partner_device_userName"); + private String partner_ftm_userName = props.get("partner_ftm_userName"); + private String partner_admin_userName = props.get("partner_admin_userName"); private String partner_userName_without_role = props.get("policytest_userName"); private String partner_userName_without_pm_role = props.get("policytest_without_pmrole_userName"); @@ -119,24 +120,29 @@ public String getTokenByRole(String role, String tokenType) { if (!AdminTestUtil.isValidToken(zonalApproverCookie)) zonalApproverCookie = kernelAuthLib.getAuthForZonalApprover(); return zonalApproverCookie; - case "partnerrevamp": - if (!AdminTestUtil.isValidToken(partnerrevampCookie)) - partnerrevampCookie = kernelAuthLib.getAuthForPartnerRevamp(); - return partnerrevampCookie; + case "partnerauth": + if (!AdminTestUtil.isValidToken(partnerauthCookie)) + partnerauthCookie = kernelAuthLib.getAuthForPartnerAuth(); + return partnerauthCookie; case "deviceprovider": if (!AdminTestUtil.isValidToken(deviceproviderCookie)) deviceproviderCookie = kernelAuthLib.getAuthForDeviceProvider(); return deviceproviderCookie; - case "partnerrevampdevice": - if (!AdminTestUtil.isValidToken(partnerrevampdeviceCookie)) - partnerrevampdeviceCookie = kernelAuthLib.getAuthForPartnerRevampDevice(); - return partnerrevampdeviceCookie; - case "partnerrevampftm": - if (!AdminTestUtil.isValidToken(partnerrevampftmCookie)) - partnerrevampftmCookie = kernelAuthLib.getAuthForPartnerRevampFtm(); - return partnerrevampftmCookie; + case "partnerdevice": + if (!AdminTestUtil.isValidToken(partnerdeviceCookie)) + partnerdeviceCookie = kernelAuthLib.getAuthForPartnerRevampDevice(); + return partnerdeviceCookie; + case "partnerftm": + if (!AdminTestUtil.isValidToken(partnerftmCookie)) + partnerftmCookie = kernelAuthLib.getAuthForPartnerRevampFtm(); + return partnerftmCookie; + + case "partneradmin": + if (!AdminTestUtil.isValidToken(partneradminCookie)) + partneradminCookie = kernelAuthLib.getAuthForPartnerRevampAdmin(); + return partneradminCookie; case "partner": if (!AdminTestUtil.isValidToken(partnerCookie)) partnerCookie = kernelAuthLib.getAuthForPartner(); @@ -309,13 +315,13 @@ public String getAuthForPartner() { } @SuppressWarnings({ "unchecked" }) - public String getAuthForPartnerRevamp() { + public String getAuthForPartnerAuth() { JSONObject request = new JSONObject(); request.put(GlobalConstants.APPID, ConfigManager.getPmsAppId()); request.put(GlobalConstants.PASSWORD, partner_password); - request.put(GlobalConstants.USER_NAME, partner_revamp_userName); + request.put(GlobalConstants.USER_NAME, partner_auth_userName); JSONObject actualInternalrequest = getRequestJson(authInternalRequest); if (BaseTestCase.isTargetEnvLTS()) { request.put(GlobalConstants.CLIENTID, ConfigManager.getPmsClientId()); @@ -364,7 +370,7 @@ public String getAuthForPartnerRevampDevice() { request.put(GlobalConstants.APPID, ConfigManager.getPmsAppId()); request.put(GlobalConstants.PASSWORD, partner_password); - request.put(GlobalConstants.USER_NAME, partner_revamp_device_userName); + request.put(GlobalConstants.USER_NAME, partner_device_userName); JSONObject actualInternalrequest = getRequestJson(authInternalRequest); if (BaseTestCase.isTargetEnvLTS()) { request.put(GlobalConstants.CLIENTID, ConfigManager.getPmsClientId()); @@ -388,7 +394,30 @@ public String getAuthForPartnerRevampFtm() { request.put(GlobalConstants.APPID, ConfigManager.getPmsAppId()); request.put(GlobalConstants.PASSWORD, partner_password); - request.put(GlobalConstants.USER_NAME, partner_revamp_ftm_userName); + request.put(GlobalConstants.USER_NAME, partner_ftm_userName); + JSONObject actualInternalrequest = getRequestJson(authInternalRequest); + if (BaseTestCase.isTargetEnvLTS()) { + request.put(GlobalConstants.CLIENTID, ConfigManager.getPmsClientId()); + request.put(GlobalConstants.CLIENTSECRET, ConfigManager.getPmsClientSecret()); + } else { + request.put(GlobalConstants.CLIENTID, ConfigManager.getPartnerClientId()); + request.put(GlobalConstants.CLIENTSECRET, ConfigManager.getPartnerClientSecret()); + } + request.put(GlobalConstants.CLIENTID, ConfigManager.getPmsClientId()); + + actualInternalrequest.put(GlobalConstants.REQUEST, request); + Response reponse = AdminTestUtil.postWithJson(authenticationInternalEndpoint, actualInternalrequest); + String responseBody = reponse.getBody().asString(); + return new org.json.JSONObject(responseBody).getJSONObject(dataKey).getString(GlobalConstants.TOKEN); + } + + public String getAuthForPartnerRevampAdmin() { + + JSONObject request = new JSONObject(); + + request.put(GlobalConstants.APPID, ConfigManager.getPmsAppId()); + request.put(GlobalConstants.PASSWORD, partner_password); + request.put(GlobalConstants.USER_NAME, partner_admin_userName); JSONObject actualInternalrequest = getRequestJson(authInternalRequest); if (BaseTestCase.isTargetEnvLTS()) { request.put(GlobalConstants.CLIENTID, ConfigManager.getPmsClientId()); diff --git a/apitest-commons/src/main/resources/config/Kernel.properties b/apitest-commons/src/main/resources/config/Kernel.properties index 17ce8cdab6..21bcc18907 100644 --- a/apitest-commons/src/main/resources/config/Kernel.properties +++ b/apitest-commons/src/main/resources/config/Kernel.properties @@ -174,18 +174,18 @@ keycloak_UserName = admin keycloak_Password = keycloak-external-url = https://iam.camdgc-qa1.mosip.net keycloak-realm-id = mosip -iam-users-to-create=111997,111998,220005,111992,globaladmin,111999,111887,111888,111889 +iam-users-to-create=111997,111998,220005,111992,globaladmin,111999,111887,111888,111777 iam-users-password=mosip123,mosip123,mosip123,mosip123,mosip123,mosip123,mosip123,mosip123,mosip123 roles.220005=GLOBAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ZONAL_ADMIN roles.111997=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR -roles.111999=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR +roles.111999=AUTH_PARTNER +roles.111777=PARTNER_ADMIN,POLICYMANAGER roles.111887=AUTH_PARTNER,PARTNER_ADMIN,PMS_ADMIN,REGISTRATION_SUPERVISOR roles.111998=POLICYMANAGER roles.111992=GLOBAL_ADMIN -roles.111998=DEVICE_PROVIDER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR -roles.111888= FTM_PROVIDER,PARTNER_ADMIN,PMS_ADMIN,POLICYMANAGER,REGISTRATION_SUPERVISOR +roles.111998=DEVICE_PROVIDER +roles.111888= FTM_PROVIDER roles.globaladmin = GLOBAL_ADMIN,REGISTRATION_ADMIN,uma_authorization,ZONAL_ADMIN,default-roles-mosip -roles.111889= DEVICE_PROVIDER #------------------------- DB Connectivity proprties ------------------------# @@ -237,10 +237,10 @@ serverErrorsToMonitor=IDA-MLC-018 pmsAuthInternal=true partner_password=mosip123 partner_userName=111997 -partner_revamp_userName=pms-111999 -device_provider_userName=pms-111889 -partner_revamp_device_userName=pms-111998 -partner_revamp_ftm_userName=pms-111888 +partner_auth_userName=pms-111999 +partner_device_userName=pms-111998 +partner_ftm_userName=pms-111888 +partner_admin_userName=pms-111777 partner_user_password=mosip123 policytest_password=mosip123 policytest_userName=111998