OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid redundant URL encoding (#4555) 

* Do not double encode fallback redirect URL

Signed-off-by: Marcel Fabian Krüger <zauguin@gmail.com>
pull/5009/head
Marcel Krüger 2019-04-04 13:05:56 +02:00 committed by Richard van der Hoff
parent 43c707a010
commit 9f5d206c4a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4555.bugfix Normal file
View File

@ -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)").

2
synapse/static/client/login/js/login.js
View File

@ -49,7 +49,7 @@ var show_login = function() {
$("#loading").hide(); $("#loading").hide();
var this_page = window.location.origin + window.location.pathname; 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) { if (matrixLogin.serverAcceptsPassword) {
$("#password_flow").show(); $("#password_flow").show();