Cherry pick branch 'genexuslabs:gamutils_eo' into beta

Author: sgrampone

gamutils/src/main/java/com/genexus/gam/utils/Encoding.java

@@ -17,7 +17,7 @@ public class Encoding {
 	public static String b64ToB64Url(String input) {
 		logger.debug("b64ToB64Url");
 		try {
-			return new String(UrlBase64.encode(Base64.decode(input)), "UTF-8").replaceAll("[\ufffd]", "");
+			return java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(Base64.decode(input));
 		} catch (Exception e) {
 			logger.error("b64ToB64Url", e);
 			return "";
@@ -40,7 +40,7 @@ public static String toBase64Url(String input)
 	{
 		logger.debug("UTF8toBase64Url");
 		try{
-			return new String(UrlBase64.encode(input.getBytes(StandardCharsets.UTF_8)));
+			return java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(input.getBytes(StandardCharsets.UTF_8));
 		}catch (Exception e)
 		{
 			logger.error("UTF8toBase64Url", e);
@@ -52,7 +52,7 @@ public static String fromBase64Url(String base64Url)
 	{
 		logger.debug("fromBase64Url");
 		try{
-			return new String(UrlBase64.decode(base64Url), StandardCharsets.UTF_8);
+			return new String(java.util.Base64.getUrlDecoder().decode(base64Url), StandardCharsets.ISO_8859_1);
 		}catch (Exception e)
 		{
 			logger.error("fromBase64Url", e);

gamutils/src/test/java/com/genexus/gam/utils/test/EncodingTest.java

@@ -5,11 +5,11 @@
 import com.genexus.gam.utils.Random;
 import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.encoders.UrlBase64;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.nio.charset.StandardCharsets;
+import java.text.MessageFormat;
 
 public class EncodingTest {
 
@@ -26,14 +26,23 @@ public void testB64ToB64Url() {
 
 	private static String b64UrlToUtf8(String base64Url) {
 		try {
-			byte[] bytes = UrlBase64.decode(base64Url);
-			return new String(bytes, StandardCharsets.UTF_8).replaceAll("[\ufffd]", "");
+			return new String(java.util.Base64.getUrlDecoder().decode(base64Url), StandardCharsets.ISO_8859_1);
 		} catch (Exception e) {
 			e.printStackTrace();
 			return "";
 		}
 	}
 
+	@Test
+	public void testBase64Url() {
+		String[] utf8 = new String[]{"GQTuYnnS9AbcKXndwxiZbxk4Q60nhuEd", "rf7tZx8aWO28YOKLISDWY33HuarNHkIZ", "sF7Ic0iuZxE50nz3W5Jnj7R0nQlRD0b1", "GGKmW2ubkhnA9ASaVlVAKM6FQdPCQ1pj", "LMW0GSCVyeGiGzf84eIwuX6OHAfur9fp", "zq9Kni7W1r0UIzG9hjYeiqJhSYlWVZSa", "WcyhGLQNyQkP2YmOjVtIilpqcHgYCzjq", "DuhO4PBiXRDDj50RBRo8wNUU8R3UXbp0", "pkPfYXOyoLUsEwm4HjjDB6E2c3aUjYNh", "fgbrZoKKMym9HN5zlKj0a8ohgQlJm3PM", "owGXQ7p6BeFeK1KFVOsdbSRd0sMwgFRU"};
+		String[] b64 = new String[]{"R1FUdVlublM5QWJjS1huZHd4aVpieGs0UTYwbmh1RWQ", "cmY3dFp4OGFXTzI4WU9LTElTRFdZMzNIdWFyTkhrSVo", "c0Y3SWMwaXVaeEU1MG56M1c1Sm5qN1IwblFsUkQwYjE", "R0dLbVcydWJraG5BOUFTYVZsVkFLTTZGUWRQQ1ExcGo", "TE1XMEdTQ1Z5ZUdpR3pmODRlSXd1WDZPSEFmdXI5ZnA", "enE5S25pN1cxcjBVSXpHOWhqWWVpcUpoU1lsV1ZaU2E", "V2N5aEdMUU55UWtQMlltT2pWdElpbHBxY0hnWUN6anE", "RHVoTzRQQmlYUkREajUwUkJSbzh3TlVVOFIzVVhicDA", "cGtQZllYT3lvTFVzRXdtNEhqakRCNkUyYzNhVWpZTmg", "ZmdiclpvS0tNeW05SE41emxLajBhOG9oZ1FsSm0zUE0", "b3dHWFE3cDZCZUZlSzFLRlZPc2RiU1JkMHNNd2dGUlU"};
+		for (int i = 0; i < utf8.length; i++) {
+			Assert.assertEquals(MessageFormat.format("testBase64Url toBase64Url fail index: {0}", i), b64[i], Encoding.toBase64Url(utf8[i]));
+			Assert.assertEquals(MessageFormat.format("testBase64Url fromBase64Url fail index: {0}", i), utf8[i], Encoding.fromBase64Url(b64[i]));
+		}
+	}
+
 	@Test
 	public void testToBase64Url() {
 		int i = 0;