From c63f50b3b33887f6d58ecba59b7636386b27033a Mon Sep 17 00:00:00 2001 From: Marnanel Thurman Date: Sat, 4 Dec 2021 21:49:57 +0000 Subject: [PATCH] Display appropriate error messages on login failure. --- src/grok.js | 25 ++++++++++++++++++++++++- src/index.js | 9 ++++++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/grok.js b/src/grok.js index 3ba5d67..c2c04c7 100644 --- a/src/grok.js +++ b/src/grok.js @@ -86,7 +86,30 @@ export function grok_login2(callback, auth, username, password) { console.log(response.headers); console.log('----'); console.log(response.data); - result['success'] = true; + + var html = $('').append( + $.parseHTML(response.data)); + + var h1 = html.find('h1').html() + + if (h1.includes('Welcome back')) { + result['success'] = true; + } else { + result['success'] = false; + + var blockquote = html.find('blockquote').html(); + + if (blockquote.includes('wrong password')) { + result['message'] = 'Wrong password.'; + } else if (blockquote.includes('This account name')) { + result['message'] = 'Unknown username.'; + } else { + result['message'] = 'Unknown error from site.'; + } + + console.log('Error from site:'); + console.log(blockquote); + } callback(result); }, diff --git a/src/index.js b/src/index.js index 9bd3cfc..6c48ea8 100644 --- a/src/index.js +++ b/src/index.js @@ -30,7 +30,6 @@ function onDeviceReady() { function handle_login1(login1) { ui_login_show_message("Logging in..."); - console.log("login: part 2"); grok_login2( handle_login2, login1['auth'], @@ -40,6 +39,10 @@ function handle_login1(login1) { } function handle_login2(login2) { - ui_login_show_message("Success!"); - console.log(login2); + + if (login2['success']) { + ui_login_show_message("Success!"); + } else { + ui_login_show_message(login2['message']); + } } -- 2.30.2