SAK-49079 Samigo test password does not validate special characters (s…

…akaiproject#12396)
susowrc · Feb 29, 2024 · db00981 · db00981
1 parent 0834919
commit db00981
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java b/...o/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/delivery/DeliveryBean.java
@@ -125,6 +125,7 @@ public class DeliveryBean implements Serializable {
   //SAM-2517
   private UserTimeService userTimeService = ComponentManager.get(UserTimeService.class);
   private PreferencesService preferencesService = ComponentManager.get(PreferencesService.class);
+  private FormattedText formattedText = ComponentManager.get(FormattedText.class);
 
   private static final String MATHJAX_SRC_PATH_SAKAI_PROP = "portal.mathjax.src.path";
   private static final String MATHJAX_SRC_PATH = ServerConfigurationService.getString(MATHJAX_SRC_PATH_SAKAI_PROP);
@@ -1284,7 +1285,7 @@ public String validatePassword() {
     if (StringUtils.isBlank(password)) {
     	return "passwordAccessError";
     }
-    if(StringUtils.isNotBlank(getSettings().getPassword()) && !StringUtils.equals(StringUtils.trim(password), StringUtils.trim(getSettings().getPassword()))) {
+    if(StringUtils.isNotBlank(getSettings().getPassword()) && !StringUtils.equals(StringUtils.trim(password), formattedText.convertFormattedTextToPlaintext(StringUtils.trim(getSettings().getPassword())))) {
     	return "passwordAccessError";
     }
 
@@ -1532,7 +1533,7 @@ public void updatEventLog(String errorMsg) {
 		  agentEid= "N/A";
 	  }
 	  eventLogData.setUserEid(agentEid);
-	  eventLogData.setTitle(ComponentManager.get(FormattedText.class).convertFormattedTextToPlaintext(publishedAssessment.getTitle()));
+	  eventLogData.setTitle(formattedText.convertFormattedTextToPlaintext(publishedAssessment.getTitle()));
 	  String site_id= AgentFacade.getCurrentSiteId();
 	  if(site_id == null) {
 		  //take assessment via url