Merge remote-tracking branch 'refs/remotes/origin/master'

docs/admin-gui/resource-wizard/index.adoc

@@ -232,7 +232,7 @@ More complex configuration is possible by clicking btn:[Edit] button:
 [#use_inbound_for_correlation]
 You can define the inbound mapping as ordinary (default), or you can specify *Use for* parameter with value `Correlation` in the *Optional configuration* of the mapping to use the mapping only during the correlation.
 This is how you can define inbound mappings to be used in <<Correlation>> when item correlator is used, even for target resources where you normally have no inbound mappings at all.
-For more information, please refer to xref:/midpoint/reference/correlation/example-4-correlation-for-outbound-resources[this example for correlation-only inbound mapping].
+For more information, please refer to xref:/midpoint/reference/correlation/#example-4-correlation-for-outbound-resources[this example for correlation-only inbound mapping].
 
 Mapping can be deleted by clicking btn:[Delete] button.
 

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java

@@ -22,6 +22,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Serial;
+import java.net.URLEncoder;
+import java.nio.charset.CharacterCodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1784,7 +1786,12 @@ private String createBaseConfirmationLink(String prefix, String oid) {
     }
 
     private String createTokenConfirmationLink(String prefix, UserType userType) {
-        return createBaseConfirmationLink(prefix, userType) + "&" + SchemaConstants.TOKEN + "=" + getNonce(userType);
+        try {
+            var urlEncodedNonce = URLEncoder.encode(getNonce(userType), StandardCharsets.UTF_8);
+            return createBaseConfirmationLink(prefix, userType) + "&" + SchemaConstants.TOKEN + "=" + urlEncodedNonce;
+        } catch (Exception e) {
+            throw new SystemException(e);
+        }
     }
 
     private String createPrefixLinkByAuthSequence(String channel, String nameOfSequence,