add an indicator when login fails

[lantea.git] / js / ui.js

diff --git a/js/ui.js b/js/ui.js
index 263a139387e3ff37a45b43e290cca2cbced159e0..92dd488e051e1c185707ccca347a9c8a621ea7bd 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -13,15 +13,11 @@ var gUIHideCountdown = 0;
 var gWaitCounter = 0;
 var gTrackUpdateInterval;
 var gAction, gActionLabel;
-var gBackendURL = "https://backend.lantea.kairo.at";
+var authData = null, userData = null;
+var gBackendURL = "https://backend.lantea.kairo.at/";
 var gAuthClientID = "lantea";
 
 window.onload = function() {
-  if (/\/login\.html/.test(window.location)) {
-    // If we are in the login window, call a function to complete the process and don't do anything else here.
-    completeLoginWindow();
-    return;
-  }
   gAction = document.getElementById("action");
   gActionLabel = document.getElementById("actionlabel");
 
@@ -73,13 +69,9 @@ window.onload = function() {
   // Set up the login area.
   document.getElementById("loginbtn").onclick = startLogin;
   document.getElementById("logoutbtn").onclick = doLogout;
-  prepareLoginButton(function() {
-    // Anything that needs the backend should only be triggered from in here.
-    // That makes sure that the first call the the backend is oauth_state and no other is running in parallel.
-    // If we call multiple backend methods at once and no session is open, we create multiple sessions, which calls for confusion later on.
-
-    // Call any UI preparation that needs the backend.
-  });
+  // Put in a logged-out state by default.
+  // Opening the track drawer will update this correctly.
+  displayLogout();
 
   gAction.addEventListener("dbinit-done", initMap, false);
   gAction.addEventListener("mapinit-done", postInit, false);
@@ -120,6 +112,24 @@ window.onresize = function() {
 }
 
 function startLogin() {
+  var logerr = document.getElementById("loginerror");
+  logerr.classList.add("hidden");
+  logerr.title = "";
+  if (!authData || !authData["state"]) {
+    // We have no oAuth state, try to fetch it and call ourselves again if it worked.
+    prepareLoginButton(function() {
+      if (authData && authData["state"]) {
+        startLogin();
+      }
+      else if (!userData) {
+        // Only warn if we didn't actually end up being logged in.
+        console.log("No OAuth state and fetching fails, client or server may be offline.");
+        logerr.classList.remove("hidden");
+        logerr.title = "Client or server may be offline.";
+      }
+    });
+    return;
+  }
   var authURL = authData["url"] + "authorize?response_type=code&client_id=" + gAuthClientID + "&scope=email" +
                 "&state=" + authData["state"] + "&redirect_uri=" + encodeURIComponent(getRedirectURI());
   if (window.open(authURL, "KaiRoAuth", 'height=450,width=600')) {
@@ -127,6 +137,8 @@ function startLogin() {
   }
   else {
     console.log("Opening Sign In window failed.");
+    logerr.classList.remove("hidden");
+    logerr.title = "Opening Sign-In window failed.";
   }
 }
 
@@ -175,16 +187,6 @@ function prepareLoginButton(aCallback) {
   );
 }
 
-function completeLoginWindow() {
-  if (window.opener) {
-    window.opener.finishLogin(getParameterByName("code"), getParameterByName("state"));
-    window.close();
-  }
-  else {
-    document.getElementById("logininfo").textContent = "You have called this document outside of the login flow, which is not supported.";
-  }
-}
-
 function finishLogin(aCode, aState) {
   if (aState == authData["state"]) {
     fetchBackend("login?code=" + aCode + "&state=" + aState + "&redirect_uri=" + encodeURIComponent(getRedirectURI()), "GET", null,
@@ -543,7 +545,7 @@ function reportUploadStatus(aSuccess, aResponse) {
   if (aSuccess) {
     document.getElementById("uploadSuccess").style.display = "block";
   }
-  else if (aResponse["message"]) {
+  else if (aResponse && aResponse["message"]) {
     document.getElementById("uploadErrorMsg").textContent = aResponse["message"];
     if (aResponse["errortype"]) {
       document.getElementById("uploadErrorMsg").textContent += " (" + aResponse["errortype"] + ")";
@@ -729,11 +731,3 @@ function fetchBackend(aEndpoint, aMethod, aSendData, aCallback, aCallbackForward
     aCallback(e, 500, aCallbackForwards);
   }
 }
-
-function getParameterByName(aName) {
-  // from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
-  name = aName.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-  var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-      results = regex.exec(location.search);
-  return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}