Re-encode the auth cookie with the properly formatted user name. This makes the...

[citadel.git] / webcit-ng / static / js / login.js

diff --git a/webcit-ng/static/js/login.js b/webcit-ng/static/js/login.js
index 7f35b8ea39ef7d31bb8a97dc49e789ba6582f403..bc13e00f2ffbebb226bf78a8e7f971c5a63e2642 100644 (file)
--- a/webcit-ng/static/js/login.js
+++ b/webcit-ng/static/js/login.js
@@ -52,20 +52,23 @@ function login_button(username) {
        var request = new XMLHttpRequest();
        request.open("POST", "/ctdl/a/login", true);
        request.onreadystatechange = function() {
-               login_result(this.responseText);
+               if (this.readyState === XMLHttpRequest.DONE) {
+                       login_result(JSON.parse(this.responseText));
+               }
        };
        request.send(parms);
        request = null;
 }
 
 
+// Feed this a JSON output from login_button() or a similar function
 function login_result(data) {
-       if (data.substring(0,1) == "2") {
+       if (data.result) {
                document.getElementById("ctdl_big_modal").style.display = "none";
                ctdl_startup();                         // let the regular startup code take care of everything else
        }
        else {
-               display_login_screen(data.substring(4));
+               display_login_screen(data.message);
        }
 }