summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarcel Krüger <zauguin@gmail.com>2019-04-04 13:05:56 +0200
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-04-04 12:05:56 +0100
commit9f5d206c4a236eb33d6baa70a4838d7391b0254c (patch)
tree5ef628f422ad329818e06ff660d80f6a86d9d2e9
parentMerge pull request #5004 from ajensenwaud/develop (diff)
downloadsynapse-9f5d206c4a236eb33d6baa70a4838d7391b0254c.tar.xz
Avoid redundant URL encoding (#4555)
* Do not double encode fallback redirect URL

Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com>

-rw-r--r--changelog.d/4555.bugfix1
-rw-r--r--synapse/static/client/login/js/login.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4555.bugfix b/changelog.d/4555.bugfix
new file mode 100644
index 0000000000..d596022c3f
--- /dev/null
+++ b/changelog.d/4555.bugfix
@@ -0,0 +1 @@
+Avoid redundant URL encoding of redirect URL for SSO login in the fallback login page. Fixes a regression introduced in [#4220](https://github.com/matrix-org/synapse/pull/4220). Contributed by Marcel Fabian Krüger ("[zaugin](https://github.com/zauguin)").
diff --git a/synapse/static/client/login/js/login.js b/synapse/static/client/login/js/login.js
index 3a958749a1..e02663f50e 100644
--- a/synapse/static/client/login/js/login.js
+++ b/synapse/static/client/login/js/login.js
@@ -49,7 +49,7 @@ var show_login = function() {
     $("#loading").hide();
 
     var this_page = window.location.origin + window.location.pathname;
-    $("#sso_redirect_url").val(encodeURIComponent(this_page));
+    $("#sso_redirect_url").val(this_page);
 
     if (matrixLogin.serverAcceptsPassword) {
         $("#password_flow").show();