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

Revert redundant changes to static js

pull/5422/head
Richard van der Hoff 2019-06-26 22:46:23 +01:00
parent a4daa899ec
commit 0ade403f55
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,6 @@ var show_login = function() {
} }
if (matrixLogin.serverAcceptsSso) { if (matrixLogin.serverAcceptsSso) {
$("#sso_form").attr("action", "/_matrix/client/r0/login/sso/redirect");
$("#sso_flow").show(); $("#sso_flow").show();
} else if (matrixLogin.serverAcceptsCas) { } else if (matrixLogin.serverAcceptsCas) {
$("#sso_form").attr("action", "/_matrix/client/r0/login/cas/redirect"); $("#sso_form").attr("action", "/_matrix/client/r0/login/cas/redirect");
@ -80,7 +79,7 @@ var fetch_info = function(cb) {
$.get(matrixLogin.endpoint, function(response) { $.get(matrixLogin.endpoint, function(response) {
var serverAcceptsPassword = false; var serverAcceptsPassword = false;
var serverAcceptsCas = false; var serverAcceptsCas = false;
for (var i = 0; i < response.flows.length; i++) { for (var i=0; i<response.flows.length; i++) {
var flow = response.flows[i]; var flow = response.flows[i];
if ("m.login.cas" === flow.type) { if ("m.login.cas" === flow.type) {
matrixLogin.serverAcceptsCas = true; matrixLogin.serverAcceptsCas = true;
@ -122,7 +121,6 @@ matrixLogin.onLogin = function(response) {
// clobber this function // clobber this function
console.log("onLogin - This function should be replaced to proceed."); console.log("onLogin - This function should be replaced to proceed.");
console.log(response); console.log(response);
alert("Login successful!");
}; };
var parseQsFromUrl = function(query) { var parseQsFromUrl = function(query) {
@ -145,7 +143,7 @@ var try_token = function() {
if (pos == -1) { if (pos == -1) {
return false; return false;
} }
var qs = parseQsFromUrl(window.location.href.substr(pos + 1)); var qs = parseQsFromUrl(window.location.href.substr(pos+1));
var loginToken = qs.loginToken; var loginToken = qs.loginToken;