From 592c0a083a3160153331111151293ed9decd4173 Mon Sep 17 00:00:00 2001 From: Joe Wicentowski Date: Wed, 28 Aug 2019 10:06:28 -0400 Subject: [PATCH] Switch login from GET to POST --- resources/scripts/eXide.min.js | 18 +++++++++--------- src/eXide.js | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/resources/scripts/eXide.min.js b/resources/scripts/eXide.min.js index c9824199..4dfbc9ae 100644 --- a/resources/scripts/eXide.min.js +++ b/resources/scripts/eXide.min.js @@ -225,16 +225,16 @@ c.win.focus()})}else!b.isNew()&&"xquery"==b.getSyntax()&&i.ensureSaved(function( b.restoreState(f);var h={};(f=localStorage["eXide.documents"])||(f=0);for(var j=[],l=0;l

Searching ...

");c.contentWindow.document.close();c.src="modules/search.xql?"+b})})},liveReload:function(){var b=a.getActiveDocument();d.findProject(b.getBasePath(),function(a){if(null!=a&&($.log("live reload: %s %s",a.liveReload,a.abbrev),a.liveReload)){var b=a.url.replace(/\/{2,}/,"/"); -a.win=window.open(eXide.configuration.context+b+"/",a.abbrev);a.win&&!a.win.closed?a.win.location.reload():$.log("app window not found: %s",a.abbrev)}})},toggleLiveReload:function(){var b=a.getActiveDocument();d.findProject(b.getBasePath(),function(a){a&&(a.liveReload=!a.liveReload,$("#menu-deploy-live span").attr("class",a.liveReload?"fa fa-check-square-o":"fa fa-square-o"),a.liveReload&&(!a.win||a.win.closed)&&i.openApp(!0))})},initGUI:function(e){c.supportsHtml5Storage&&localStorage.getItem("eXide.firstTime")&& +c.error("Warning: you are not logged in.");return!1},requireLogin:function(a){i.login?a():($("#login-dialog").dialog("option","close",function(){i.login?a():c.error("Warning: you are not logged in!")}),$("#login-dialog").dialog("open"),$("#login-dialog input:first").focus())},showPreferences:function(){g.show()},getPreference:function(a){return g.get(a)},startDebug:function(){var b=$("#debug span.ui-icon");b.hasClass("ui-icon-stop")?(b.removeClass("ui-icon-stop"),b.addClass("ui-icon-play")):(b.removeClass("ui-icon-play"), +b.addClass("ui-icon-stop"));a.exec("debug");$.log("start debugging click")},stepOver:function(){a.exec("stepOver")},stepInto:function(){a.exec("stepInto")},setTheme:function(a){$("#outline-body,#directory-body,#results-body ").removeClass().addClass(a.cssClass)},updateStatus:function(a){$("#syntax").val(a.getSyntax());$("#status .path").text(c.normalizePath(a.getPath()));!a.isNew()&&("xquery"==a.getSyntax()||"html"==a.getSyntax()||"xml"==a.getSyntax())?($("#status a").attr("href",a.getExternalLink()), +$("#status a").css("visibility","visible")):$("#status a").css("visibility","hidden")},showResultsPanel:function(){b.show(r,!0);i.resize(!0)},toggleResultsPanel:function(){b.toggle(r);i.resize(!0)},prepareResultsPanel:function(a,b){var c=document.getElementById("results-iframe");$("#results-body").parent().children(":not(.resize-handle)").detach().appendTo(".panel-"+a);"html"==$("#serialization-mode").val()?($(c).show(),$("#serialization-mode").attr("disabled","disabled").val("html"),b&&i.runQuery()): +$("#results-iframe").hide()},switchResultsPanel:function(){var a="south"===r?"east":"south";i.prepareResultsPanel(a,!0);b.hide(r);r=a;"south"===r?$(".layout-switcher").attr("src","resources/images/layouts_split.png"):$(".layout-switcher").attr("src","resources/images/layouts_split_vertical.png");i.showResultsPanel()},initStatus:function(a){$("#splash-status").text(a)},git:{branch:function(a){console.info("git.branch");i.login.isAdmin&&$.ajax({type:"GET",url:"modules/git.xql",data:{target:a.root,"git-command":"branch"}, +dataType:"json",success:function(b){b=b.stdout?$.isArray(b.stdout.line)?b.stdout.line:[b.stdout.line]:[];a.gitBranch=$.map(b,function(b,c){var d=b.split(" ").pop();/^\*/.test(b)&&(a.gitCurrentBranch=d,a.gitCurrentBranchIndex=c);return d});$("#toolbar-current-branch").text(a.gitCurrentBranch);$("#menu-git-active").text(a.gitCurrentBranch);$("#menu-git-working-dir").text(a.workingDir)},error:s})},command:function(b,c,d,e){i.login.isAdmin&&$.ajax({type:"GET",url:"modules/git.xql",data:{target:b.root, +"git-command":c,"git-option":d},dataType:"json",success:function(b){"function"==typeof e&&e(b);a.updateStatus("");a.clearErrors();i.showResultsPanel();q=n=1;var c=document.getElementById("results-iframe");$(c).show();c.contentWindow.document.open("text/html","replace");c.contentWindow.document.write(JSON.stringify(b));c.contentWindow.document.close()},error:s})}},findFiles:function(){var b=a.getActiveDocument();d.findProject(b.getBasePath(),function(c){eXide.find.Files.open(b,c,function(b){a.updateStatus(""); +a.clearErrors();q=n=1;var c=document.getElementById("results-iframe");$(c).show();eXide.app.showResultsPanel();c.contentWindow.document.open("text/html","replace");c.contentWindow.document.write("

Searching ...

");c.contentWindow.document.close();c.src="modules/search.xql?"+b})})},liveReload:function(){var b=a.getActiveDocument();d.findProject(b.getBasePath(),function(a){if(null!=a&&($.log("live reload: %s %s",a.liveReload,a.abbrev),a.liveReload)){var b=a.url.replace(/\/{2,}/, +"/");a.win=window.open(eXide.configuration.context+b+"/",a.abbrev);a.win&&!a.win.closed?a.win.location.reload():$.log("app window not found: %s",a.abbrev)}})},toggleLiveReload:function(){var b=a.getActiveDocument();d.findProject(b.getBasePath(),function(a){a&&(a.liveReload=!a.liveReload,$("#menu-deploy-live span").attr("class",a.liveReload?"fa fa-check-square-o":"fa fa-square-o"),a.liveReload&&(!a.win||a.win.closed)&&i.openApp(!0))})},initGUI:function(e){c.supportsHtml5Storage&&localStorage.getItem("eXide.firstTime")&& (r=localStorage["eXide.layout.resultPanel"]||"south");b=new i.Layout(a);"south"==r?b.hide("east"):b.hide("south");i.prepareResultsPanel(r);$("#open-dialog").dialog({appendTo:"#layout-container",title:"Open file",modal:!1,autoOpen:!1,height:480,width:600,open:function(){f.init()},resize:function(){f.resize()}});$("#login-dialog").dialog({appendTo:"#layout-container",title:"Login",modal:!0,autoOpen:!1,buttons:[{text:"Login",click:function(){var b=$('#login-form input[name="user"]').val(),c=$('#login-form input[name="password"]').val(), -b={user:b,password:c};$('#login-form input[name="duration"]').is(":checked")&&(b.duration="P14D");$.ajax({url:"login",data:b,dataType:"json",success:function(b){if(b.user){i.login=b;$.log("Logged in as %o. Is dba: %s",b,i.login.isAdmin);$("#login-dialog").dialog("close");$("#user").text("Logged in as "+i.login.user+". ");a.focus()}else{$("#login-error").text("Login failed.");$("#login-dialog input:first").focus()}},error:function(a,b,c){$("#login-error").text("Login failed. "+c);$("#login-dialog input:first").focus()}})}, +b={user:b,password:c};$('#login-form input[name="duration"]').is(":checked")&&(b.duration="P14D");$.ajax({url:"login",type:"POST",data:b,dataType:"json",success:function(b){if(b.user){i.login=b;$.log("Logged in as %o. Is dba: %s",b,i.login.isAdmin);$("#login-dialog").dialog("close");$("#user").text("Logged in as "+i.login.user+". ");a.focus()}else{$("#login-error").text("Login failed.");$("#login-dialog input:first").focus()}},error:function(a,b,c){$("#login-error").text("Login failed. "+c);$("#login-dialog input:first").focus()}})}, icons:{primary:"fa fa-sign-in"}},{text:"Cancel",icons:{primary:"fa fa-times"},click:function(){$(this).dialog("close");a.focus()}}],open:function(){$(this).find("input").val("");$(this).find("input:first").focus();$("#login-error").empty();var a=$(this);a.find("input").keyup(function(b){13==b.keyCode&&a.parent().find(".ui-dialog-buttonpane button:first").trigger("click")})}});$("#keyboard-help").dialog({appendTo:"#layout-container",title:"Keyboard Shortcuts",modal:!1,autoOpen:!1,height:400,width:350, buttons:{Close:function(){$(this).dialog("close")}},open:function(){eXide.edit.commands.help($("#keyboard-help"),a)}});$("#about-dialog").dialog({appendTo:"#layout-container",title:"About",modal:!1,autoOpen:!1,height:300,width:450,buttons:{Close:function(){$(this).dialog("close")}}});$("#version-warning").dialog({appendTo:"#layout-container",modal:!1,autoOpen:!1,height:300,width:450,buttons:{Close:function(){$(this).dialog("close")}}});$("#dialog-templates").dialog({appendTo:"#layout-container",title:"New document", modal:!1,autoOpen:!1,height:280,width:550,dataType:"json",open:function(){$.ajax({url:"modules/get-template.xql",type:"POST",success:function(a){l=a;$("#dialog-templates .templates").hide();$("#dialog-templates .type-select").val("")}})},buttons:{Cancel:function(){$(this).dialog("close");a.focus()},Create:function(){var b=$(this).find(".type-select").val(),c=$(this).find(".templates select").val();$.log("creating new doc with mode: %s and template: %s",b,c);a.newDocumentFromTemplate(b,c);$(this).dialog("close"); diff --git a/src/eXide.js b/src/eXide.js index 081f90ee..7bc857fb 100644 --- a/src/eXide.js +++ b/src/eXide.js @@ -920,6 +920,8 @@ eXide.app = (function(util) { } }); $("#login-dialog").dialog("open"); + // Why doesn't this set focus when login dialog is opened? + $("#login-dialog input:first").focus(); } else callback(); }, @@ -1178,6 +1180,7 @@ eXide.app = (function(util) { } $.ajax({ url: "login", + type: "POST", data: params, dataType: "json", success: function (data) {