Merge remote-tracking branch 'origin/dev-4.3.x' into dev

Author: ppiernik

engine-api/src/main/java/pl/edu/icm/unity/engine/api/utils/NameToURLEncoder.java

@@ -5,6 +5,9 @@
 
 package pl.edu.icm.unity.engine.api.utils;
 
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.Set;
 
@@ -21,7 +24,7 @@ public static String encode(String name)
 			return Base64.getUrlEncoder()
 					.encodeToString(name.getBytes()) + ENCODED_NAME_SUFFIX;
 		}
-		return name;
+		return URLEncoder.encode(name, StandardCharsets.UTF_8);
 	}
 
 	public static String decode(String name)
@@ -31,6 +34,6 @@ public static String decode(String name)
 			return new String(Base64.getUrlDecoder()
 					.decode(name.substring(0, name.length() - ENCODED_NAME_SUFFIX.length())));
 		}
-		return name;
+		return URLDecoder.decode(name, StandardCharsets.UTF_8);
 	}
 }

engine-api/src/test/java/pl/edu/icm/unity/engine/api/utils/NameToURLEncoderTest.java

@@ -14,7 +14,7 @@
 public class NameToURLEncoderTest
 {
 	@Test
-	public void shouldNotEncodeSafeName()
+	public void shouldNotEncodeToBase64SafeName()
 	{
 		assertThat(NameToURLEncoder.encode("name")).isEqualTo("name");
 	}
@@ -38,4 +38,16 @@ public void shouldDecodeUnsafeName()
 		assertThat(NameToURLEncoder.decode(new String(Base64.getUrlEncoder()
 				.encode("/name".getBytes())) + NameToURLEncoder.ENCODED_NAME_SUFFIX)).isEqualTo("/name");
 	}
+	
+	@Test
+	public void shouldEncodeSafeNameWithSpace()
+	{
+		assertThat(NameToURLEncoder.encode("name name")).isEqualTo("name+name");
+	}
+	
+	@Test
+	public void shouldDecodeSafeNameWithSpace()
+	{
+		assertThat(NameToURLEncoder.decode("name+name")).isEqualTo("name name");
+	}
 }

vaadin-endpoint-common/src/main/java/io/imunity/vaadin/endpoint/common/plugins/attributes/ext/VerifiableEmailAttributeHandler.java

@@ -234,7 +234,7 @@ public ComponentsContainer getEditor(AttributeEditContext context)
 
 			binder = new SingleStringFieldBinder(msg);
 			binder.forField(editor, context.isRequired())
-				.withValidator((v,c) -> validate(v, context))
+				.withValidator((v,c) -> validate(v, context.isRequired()))
 				.bind("value");
 			binder.setBean(new StringBindingValue(value == null ? "" : value.getValue()));
 
@@ -261,9 +261,9 @@ private void onVerifyButtonClick(AttributeEditContext context)
 			confirm.open();
 		}
 
-		private ValidationResult validate(String value, AttributeEditContext context)
+		private ValidationResult validate(String value, boolean required)
 		{
-			if (!context.isRequired() && (value == null || value.isEmpty()))
+			if (!required && (value == null || value.isEmpty()))
 				return ValidationResult.ok();
 			try
 			{

vaadin-endpoint-common/src/main/java/io/imunity/vaadin/endpoint/common/plugins/credentials/sms/SMSCredentialEditor.java

@@ -19,6 +19,8 @@
 import io.imunity.vaadin.endpoint.common.plugins.attributes.components.SingleStringFieldBinder;
 import io.imunity.vaadin.endpoint.common.plugins.credentials.CredentialEditor;
 import io.imunity.vaadin.endpoint.common.plugins.credentials.CredentialEditorContext;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import pl.edu.icm.unity.base.attribute.AttributeExt;
 import pl.edu.icm.unity.base.attribute.AttributeType;
@@ -201,7 +203,7 @@ private void updateConfirmationStatusIconAndButtons()
 				formatter.getSimpleConfirmationStatusString(confirmationInfo),
 				confirmationInfo.isConfirmed());
 		editor.setVerifyButtonVisible(
-				!confirmationInfo.isConfirmed() && !(editor.getValue() == null ||  editor.getValue().isEmpty()));
+				!confirmationInfo.isConfirmed() && StringUtils.isNotEmpty(editor.getValue()));
 		skipUpdate = true;
 		editor.setAdminCheckBoxValue(confirmationInfo.isConfirmed());
 		skipUpdate = false;

vaadin-endpoint-common/src/main/java/io/imunity/vaadin/endpoint/common/plugins/identities/email/EmailIdentityEditor.java

@@ -16,6 +16,8 @@
 import io.imunity.vaadin.endpoint.common.plugins.attributes.components.SingleStringFieldBinder;
 import io.imunity.vaadin.endpoint.common.plugins.identities.IdentityEditor;
 import io.imunity.vaadin.endpoint.common.plugins.identities.IdentityEditorContext;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import pl.edu.icm.unity.base.confirmation.ConfirmationInfo;
 import pl.edu.icm.unity.base.entity.EntityParam;
@@ -160,7 +162,7 @@ private void updateConfirmationStatusIcon()
 					confirmationInfo.isConfirmed());
 		}
 		editor.setVerifyButtonVisible(!confirmationInfo.isConfirmed()
-				&& !(editor.getValue() == null || editor.getValue().isEmpty()) 
+				&& StringUtils.isNotEmpty(editor.getValue())
 				&& value != null
 				&& editor.getValue().equals(value.getValue()));
 		skipUpdate = true;