Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-33845 #1530

Merged
merged 1 commit into from
Jul 18, 2024
Merged

MOSIP-33845 #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/CertificateGenerationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public class CertificateGenerationUtil extends AdminTestUtil {
lOGGER.setLevel(Level.ALL);
else
lOGGER.setLevel(Level.ERROR);
lOGGER.info("EncryptUtilBaseUrl " + ConfigManager.getAuthDemoServiceUrl());
getThumbprints();
}

Expand Down
27 changes: 0 additions & 27 deletions apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/ConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ public class ConfigManager {
private static String USE_EXTERNAL_SCENARIO_SHEET = "useExternalScenarioSheet";
private static String useExternalScenario_sheet;

private static String AUTH_DEMO_SERVICE_PORT = "authDemoServicePort";
private static String AUTH_DEMO_SERVICE_BASE_URL = "authDemoServiceBaseURL";
private static String MOUNT_PATH = "mountPath";
private static String AUTHCERTS_PATH = "authCertsPath";
private static String MOUNT_PATH_FOR_SCENARIO = "mountPathForScenario";
Expand Down Expand Up @@ -240,8 +238,6 @@ public class ConfigManager {

private static String iamUsersToCreate;
private static String iamUsersPassword;
private static String authDemoServicePort;
private static String authDemoServiceBaseUrl;

private static String serverErrorsToMonitor;

Expand Down Expand Up @@ -347,11 +343,6 @@ public static void init() {
: System.getenv(MOSIP_ADMIN_CLIENT_SECRET);

propsKernel.setProperty(MOSIP_ADMIN_CLIENT_SECRET, admin_client_secret);

authDemoServicePort = System.getenv(AUTH_DEMO_SERVICE_PORT) == null
? propsKernel.getProperty(AUTH_DEMO_SERVICE_PORT)
: System.getenv(AUTH_DEMO_SERVICE_PORT);
propsKernel.setProperty(AUTH_DEMO_SERVICE_PORT, authDemoServicePort);

serverErrorsToMonitor = System.getenv(SERVER_ERRORS_TO_MONITOR) == null
? propsKernel.getProperty(SERVER_ERRORS_TO_MONITOR)
Expand All @@ -363,11 +354,6 @@ public static void init() {
: System.getenv(REPORT_EXPIRATION_IN_DAYS);
propsKernel.setProperty(REPORT_EXPIRATION_IN_DAYS, reportExpirationInDays);

authDemoServiceBaseUrl = System.getenv(AUTH_DEMO_SERVICE_BASE_URL) == null
? propsKernel.getProperty(AUTH_DEMO_SERVICE_BASE_URL)
: System.getenv(AUTH_DEMO_SERVICE_BASE_URL);
propsKernel.setProperty(AUTH_DEMO_SERVICE_BASE_URL, authDemoServiceBaseUrl);

mountPath = System.getenv(MOUNT_PATH) == null ? propsKernel.getProperty(MOUNT_PATH) : System.getenv(MOUNT_PATH);
propsKernel.setProperty(MOUNT_PATH, mountPath);

Expand Down Expand Up @@ -555,19 +541,10 @@ public static Boolean reportIgnoredTestCases() {
return reportIgnoredTestCases.equalsIgnoreCase("yes");
}

public static String getAuthDemoServicePort() {
return authDemoServicePort;
}

public static String getReportExpirationInDays() {
return reportExpirationInDays;
}

public static String getAuthDemoServiceBaseUrl() {
return authDemoServiceBaseUrl;

}

public static int getLangselect() {
return Integer.parseInt(langselect);

Expand Down Expand Up @@ -925,8 +902,4 @@ private static Properties getproperty(String path) {
}
return prop;
}

public static String getAuthDemoServiceUrl() {
return ConfigManager.getAuthDemoServiceBaseUrl() + ":" + ConfigManager.getAuthDemoServicePort();
}
}
7 changes: 0 additions & 7 deletions apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/EncryptionDecrptionUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ public class EncryptionDecrptionUtil extends AdminTestUtil{
private Encrypt encrypt;

static {
if(EncryptUtilBaseUrl==null)
EncryptUtilBaseUrl = getEncryptUtilBaseUrl();
lOGGER.info("EncryptUtilBaseUrl " + EncryptUtilBaseUrl);
getThumbprints();
}
public static void getThumbprints() {
Expand All @@ -76,10 +73,6 @@ public static void getThumbprints() {
}
}

public static String getEncryptUtilBaseUrl() {
return ConfigManager.getAuthDemoServiceUrl() + "/";
}

/**
* The method get encrypted json for identity request
*
Expand Down
4 changes: 0 additions & 4 deletions ...mmons/src/main/java/io/mosip/testrig/apirig/utils/MispPartnerAndLicenseKeyGeneration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ public static String getAndUploadCertificatesAndGenerateMispLicKey() {

return mispLicKey;
}

private static String getLocalHostUrl() {
return ConfigManager.getAuthDemoServiceUrl() + "/";
}

public static void mispPartnerGeneration() {
String url = ApplnURI + "/v1/partnermanager/partners";
Expand Down
10 changes: 0 additions & 10 deletions apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/PartnerRegistration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ public static String generateAndGetEkycPartnerKeyUrl() {
}

public static void getAndUploadCertificates() {
if (localHostUrl == null) {
localHostUrl = getLocalHostUrl();
}

partnerGeneration();
JSONObject certificateValue = getCertificates(partnerId, getPartnerType);
Expand All @@ -149,9 +146,6 @@ public static void getAndUploadCertificates() {
}

public static void getAndUploadEkycCertificates() {
if (localHostUrl == null) {
localHostUrl = getLocalHostUrl();
}

partnerKycGeneration();
JSONObject certificateValue = getCertificates(ekycPartnerId, getEkycPartnerTypeForCert);
Expand All @@ -173,10 +167,6 @@ public static void getAndUploadEkycCertificates() {

}

private static String getLocalHostUrl() {
return ConfigManager.getAuthDemoServiceUrl() + "/";
}

public static void partnerGeneration() {
String url = ApplnURI + properties.getProperty("putPartnerRegistrationUrl");

Expand Down
Loading