From 6ee4036eb1521549ff928fa20aff532e358234c0 Mon Sep 17 00:00:00 2001 From: Marnanel Thurman Date: Fri, 3 Dec 2021 22:47:38 +0000 Subject: [PATCH] Added grok_set_url() for encapsulation. If you're using the browser, add a message to tell you you're using the browser. --- src/grok.js | 16 +++++++++++----- src/index.js | 26 +++++++++++++++++++++----- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/grok.js b/src/grok.js index bb0da42..3ba5d67 100644 --- a/src/grok.js +++ b/src/grok.js @@ -1,6 +1,12 @@ var tough = require('tough-cookie'); -var url = 'http://127.0.0.1:6887/login'; +var DREAMWIDTH_URL = 'https://dreamwidth.org'; +export var grok_url = DREAMWIDTH_URL; + +export function grok_set_url(url) { + console.log("Requests will go to: "+url); + grok_url = url; +} function set_cookies(url, response) { @@ -27,7 +33,7 @@ function set_cookies(url, response) { for (var cookie of cookies) { console.log("Setting cookie: "+cookie.key+" = "+cookie.value) cordova.plugin.http.setCookie( - url, + grok_url, cookie, ) } @@ -37,7 +43,7 @@ export function grok_login1(callback) { var result = {}; - cordova.plugin.http.get(url, + cordova.plugin.http.get(grok_url, {}, {}, function(response) { @@ -48,7 +54,7 @@ export function grok_login1(callback) { result['auth'] = html.find('[name="lj_form_auth"]'). attr('value'); - set_cookies(url, response); + set_cookies(grok_url, response); result['success'] = true; @@ -66,7 +72,7 @@ export function grok_login2(callback, auth, username, password) { var result = {}; - cordova.plugin.http.post(url, + cordova.plugin.http.post(grok_url, { 'lj_form_auth': auth, 'user': username, diff --git a/src/index.js b/src/index.js index d69ebc1..9bd3cfc 100644 --- a/src/index.js +++ b/src/index.js @@ -1,29 +1,45 @@ import { grok_login1, grok_login2, + grok_set_url, + grok_url, } from './grok.js'; +var FAKE_DW_URL = 'http://127.0.0.1:6887/login'; + document.addEventListener('deviceready', onDeviceReady, false); +function ui_login_show_message(message) { + $("#login-message").show().text(message); + console.log(message); +} + function onDeviceReady() { console.log('Running cordova-' + cordova.platformId + '@' + cordova.version); - $("#submitlogin").click(function() { - console.log("login: part 1: here we go!"); + + if (cordova.platformId=='browser') { + ui_login_show_message("Running on browser; connections will go to localhost"); + grok_set_url(FAKE_DW_URL); + } + + $("#submit-login").click(function() { + ui_login_show_message("Connecting..."); grok_login1(handle_login1); }); } function handle_login1(login1) { + ui_login_show_message("Logging in..."); console.log("login: part 2"); grok_login2( handle_login2, login1['auth'], - 'wombat', - 'hunter2', + $('#username').val(), + $('#password').val(), ) } function handle_login2(login2) { - console.log("login: done"); + ui_login_show_message("Success!"); console.log(login2); } -- 2.30.2