Skip to content

fix request links for https #3

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

Open
petershale21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix request links for https #3

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
3 changes: 2 additions & 1 deletion api/src/main/java/org/openmrs/module/dhisconnector/api/impl/DHISConnectorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public class DHISConnectorServiceImpl extends BaseOpenmrsService implements DHIS

public static final String ZIP_FILE_SUFFIX = ".zip";

public static final String DHISCONNECTOR_ORGUNIT_RESOURCE = "/api/organisationUnits.json?paging=false&fields=:identifiable,displayName";
public static final String DHISCONNECTOR_ORGUNIT_RESOURCE = "/api/organisationUnits.json?paging=false&fields=identifiable,displayName";

public static final String DATAVALUESETS_PATH = "/api/dataValueSets";

Expand Down Expand Up @@ -266,6 +266,7 @@ private void saveToBackUp(String path, String jsonResponse) {

@Override
public String getDataFromDHISEndpoint(String endpoint) {
endpoint = endpoint.replaceAll("//+", "/"); //remove any double slash in endpoint link because DHIS2 rejects it since switching to https
String url = Context.getAdministrationService().getGlobalProperty("dhisconnector.url");
String user = Context.getAdministrationService().getGlobalProperty("dhisconnector.user");
String pass = Context.getAdministrationService().getGlobalProperty("dhisconnector.pass");
Expand Down