Skip to content

OCLOMRS-1122: Decode any HTML-encoding of the key #124

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

Merged
ibacher merged 1 commit into from
Apr 2, 2026
Merged

OCLOMRS-1122: Decode any HTML-encoding of the key #124

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
5 changes: 3 additions & 2 deletions api/src/main/java/org/openmrs/module/openconceptlab/ImportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
package org.openmrs.module.openconceptlab;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
Comment thread
ibacher marked this conversation as resolved.
import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.criterion.Order;
Expand Down Expand Up @@ -363,13 +364,13 @@ public Subscription getSubscription() {
return null;
}
Subscription subscription = new Subscription();
subscription.setUrl(url);
subscription.setUrl(StringEscapeUtils.unescapeHtml4(url));

String uuid = adminService.getGlobalProperty(OpenConceptLabConstants.GP_SUBSCRIPTION_UUID);
subscription.setUuid(uuid);

String token = adminService.getGlobalProperty(OpenConceptLabConstants.GP_TOKEN);
subscription.setToken(token);
subscription.setToken(StringEscapeUtils.unescapeHtml4(token));

String validationType = adminService.getGlobalProperty(OpenConceptLabConstants.GP_VALIDATION_TYPE);
if (StringUtils.isNotBlank(validationType)) {
Expand Down
21 changes: 21 additions & 0 deletions api/src/test/java/org/openmrs/module/openconceptlab/ImportServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,27 @@ public void saveSubscription_shouldSaveSubscription() throws Exception {
assertThat(subscription, is(newSubscription));
}

/**
* @see ImportServiceImpl#getSubscription()
* @Verifies unescapes HTML entities in token and URL from global properties
*/
@Test
public void getSubscription_shouldUnescapeHtmlEntitiesInTokenAndUrl() throws Exception {
String escapedToken = "abc&def<ghi";
String expectedToken = "abc&def<ghi";
String escapedUrl = "http://api.openconceptlab.com/orgs/test?a=1&amp;b=2";
String expectedUrl = "http://api.openconceptlab.com/orgs/test?a=1&b=2";

Context.getAdministrationService()
.setGlobalProperty(OpenConceptLabConstants.GP_SUBSCRIPTION_URL, escapedUrl);
Context.getAdministrationService()
.setGlobalProperty(OpenConceptLabConstants.GP_TOKEN, escapedToken);

Subscription subscription = importService.getSubscription();
assertThat(subscription.getUrl(), is(expectedUrl));
assertThat(subscription.getToken(), is(expectedToken));
}

/*
* These ignored tests are working fine,
* but it takes too much time to finish them
Expand Down
Loading