From ab3dd208c3cd418c96ed0747eec199212dbda6f0 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Wed, 1 May 2013 13:02:06 -0500 Subject: [PATCH] Alert on wrong credentials (#76) --- api.js | 1 + www/assets/js/functions.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api.js b/api.js index 994e215e..1c8889e3 100644 --- a/api.js +++ b/api.js @@ -156,6 +156,7 @@ function handleLogin(params, req, res) { } else { sendJSON(res, { + error: "Invalid session", success: false }); } diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js index 179bc090..9d41b20a 100644 --- a/www/assets/js/functions.js +++ b/www/assets/js/functions.js @@ -949,7 +949,13 @@ function showLoginFrame() { var data = e.data.substring(e.data.indexOf(":")+1); data = JSON.parse(data); if(data.error) { - alert(data.error); + // Since this is the login page, invalid session implies bad credentials + if(data.error == "Invalid session") { + alert("Invalid username/password"); + } + else { + alert(data.error); + } } else if(data.success) { session = data.session || "";