Merge pull request #3 from Jacob-Gray/development

Finally fixed the issue that was breaking the library

Author: Jacob Gray

ChatExchangeJS/browser.js

@@ -1,7 +1,16 @@
-var request_lib = require("request"),
-	_ = require('cheerio'),
+var Request = require("request"),
+	{
+		URL
+	} = require("url"),
+	cheerio = require('cheerio'),
 	WebSocket = require('ws');
 
+const session = Request.jar(),
+	request = Request.defaults({
+		jar: session,
+		followAllRedirects: true,
+	});
+
 const https = require("https"),
 	querystring = require("querystring");
 
@@ -304,8 +313,6 @@ function Browser(client) {
 		this.stackexchange.submit = config.login.stackexchange.submit(host);
 		this.stackexchange.confirm = config.login.stackexchange.confirm(host);
 
-		this.request()
-
 		return this.openid_login().then(this.site_login);
 
 
@@ -319,62 +326,117 @@ class Browser2 {
 		this.client = client;
 	}
 
-	request(uri, method, data = {}, urlargs = {}) {
+	request(options) {
 
 		return new Promise((resolve, reject) => {
 
-			if (method === "GET") urlargs = data;
+			request(options, (err, res, body) => {
+				if (err) reject(err);
+				resolve(res);
+			});
+		});
+	}
 
-			const postData = querystring.stringify(data),
-				args = querystring.stringify(urlargs),
-				options = new URL(uri + "?" + args);
+	cookies(host) {
+		let cookies = session.getCookies(host),
+			output = {};
 
+		cookies.forEach(cookie => {
+			output[cookie.key] = cookie;
+		});
 
-			options.method = method;
-			options.headers = {
-				'Content-Type': 'application/x-www-form-urlencoded',
-				'Content-Length': Buffer.byteLength(postData)
-			}
+		return output;
+	}
 
-			const req = https.request(options, res => {
+	async html(url) {
 
-				res.setEncoding('utf8');
+		let responseHTML = await this.request({
+			method: "GET",
+			url: url
+		});
 
-				let data = [];
+		return cheerio.load(responseHTML.body);
+	}
 
-				res.on('data', chunk => {
-					data.push(chunk);
-				});
+	async getValues(url, els) {
 
-				res.on('end', () => {
-					let body = data.join(""),
-						output;
+		let $ = await this.html(url),
+			output = {};
 
-					try {
-						output = JSON.parse(body);
-					} catch (e) {
-						output = body;
-					}
+		for (let el of els) {
 
-					resolve(output);
-				});
-			});
+			el = $(`[name="${el}"]`);
 
-			req.on('error', e => {
-				reject(e);
+			output[el.attr("name")] = el.val();
+		}
+
+		return output;
+	}
+
+	async handleAccountConfirmation(response) {
+
+		if (response.request.uri.href.indexOf("https://openid.stackexchange.com/account/prompt") > -1) {
+
+			console.log("NEEDS ACCOUNT CONFIRMATION")
+
+			let data = await this.getValues(response.request.uri.href, ["fkey", "session"]);
+
+			console.log(data)
+
+			let openid_response = await this.request({
+				method: "POST",
+				url: "https://openid.stackexchange.com/account/prompt/submit",
+				form: data
 			});
 
-			// write data to request body
-			req.write(postData);
-			req.end();
+			console.log(openid_response.request.uri.href)
+		}
+	}
+
+	async openid(email, password) {
+
+		let fkey = (await this.getValues(config.openid.key, ["fkey"])).fkey;
+
+		let openid_response = await this.request({
+			method: "POST",
+			url: config.openid.submit,
+			form: {
+				email: email,
+				password: password,
+				fkey: fkey
+			}
+		});
+
+		if (!this.cookies(config.openid.submit).usr) throw new Error("Was unable to login with the provided credentials, please verify them.");
+	}
+
+	async siteLogin(host) {
+
+		let stackexchange = config.stackexchange(host),
+			fkey = (await this.getValues(stackexchange.key, ["fkey"])).fkey;
+
+		let site_response = await this.request({
+			method: "POST",
+			url: stackexchange.submit,
+			form: {
+				'oauth_version': '',
+				'oauth_server': '',
+				'openid_identifier': 'https://openid.stackexchange.com/',
+				fkey: fkey
+			}
 		});
+
+		this.handleAccountConfirmation(site_response);
 	}
 
-	async login(host, email, password){
+	async login(host, email, password) {
+
+		let x = await this.getValues(config.openid.key, ["fkey"])
 
-		let links = config.stackexchange(host);
+		console.log(x)
 
-		console.log(links)
+		await this.openid(email, password);
+		await this.siteLogin(host);
 	}
 }
 

ChatExchangeJS/client.js

@@ -1,11 +1,17 @@
 const Browser = require("./browser"),
+	Request = require("request"),
 	Room = require("./room");
 
 class Client {
 
 	constructor(host) {
 		this.host = host;
 
+		/**
+		 * Store cookies separately for each client
+		 */
+		this.jar = Request.jar();
+
 		this._br = new Browser(this);
 	}
 
@@ -19,7 +25,7 @@ class Client {
 		if (this._br.loggedIn) {
 			return new Room(this, room_id).join();
 		}
-		
+
 		throw new Error("Cannot join room " + room_id + "@" + this.host + ": Not logged in!");
 	}
 }

ChatExchangeJS/config.js

@@ -3,14 +3,19 @@ var config = {
 
 		return {
 			"key": "https://" + host + "/users/login?returnurl=%2f%2f" + host,
-			"submit": "https://" + host + "/users/authenticate",
+			"submit": "https://" + host + "/users/login",
 			"confirm": "https://" + host + "/"
 		}
 	},
-	"chat": {
-		"sendMessage": (host, room) => "http://chat." + host + "/chats/" + room + "/messages/new",
-		"editMessage": (host, id) => "http://chat." + host + "/messages/" + id,
-		"deleteMessage": (host, id) => "http://chat." + host + "/messages/" + id + "/delete",
+	openid: {
+		key: "https://openid.stackexchange.com/account/login/",
+		submit: "https://openid.stackexchange.com/account/login/submit",
+		confirm: "https://openid.stackexchange.com/user",
+	},
+	chat: {
+		sendMessage: (host, room) => "http://chat." + host + "/chats/" + room + "/messages/new",
+		editMessage: (host, id) => "http://chat." + host + "/messages/" + id,
+		deleteMessage: (host, id) => "http://chat." + host + "/messages/" + id + "/delete",
 	}
 }
 module.exports = config;

demo.js

@@ -66,7 +66,7 @@ function Session(me) {
 
 async function main() {
 	//Create new client for site
-	var me = new Client("stackoverflow.com");
+	var me = new Client("3dprinting.stackexchange.com");
 
 	console.log("Logging in")
 

package-lock.json

@@ -6,7 +6,13 @@
 	"repository": "git@github.com:Jacob-Gray/ChatExchangeJS.git",
 	"author": "Jacob Gray <jacob@jacobgray.me>",
 	"license": "GPL-3.0",
-	"keywords": ["stackexchange", "chat", "chatexchange", "api", "chatexchangejs"],
+	"keywords": [
+		"stackexchange",
+		"chat",
+		"chatexchange",
+		"api",
+		"chatexchangejs"
+	],
 	"scripts": {
 		"up": "up.cmd",
 		"build": "docker build --no-cache -t chatexchangejs ."
@@ -17,4 +23,4 @@
 		"request": "^2.79.0",
 		"ws": "^1.1.1"
 	}
-}
+}