3.19.7

https://github.com/DoctorMcKay/node-steam-tradeoffer-manager/issues/120#issuecomment-200179648

CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# Contributing to SteamCommunity
+
+Thanks for your interest in making `SteamCommunity` better! I'd appreciate it if you read over this document quickly
+before you submit your issue or pull request. It'll make things go much smoother.
+
+# Issues
+
+Submitting an issue?
+
+- If you're **reporting a bug**, please include all relevant details.
+	- A descriptive title helps for one. Titles of just "Error" or "It doesn't work" really don't help.
+	- Please describe what you're trying to do, what actually happens, and what you can do to reproduce the problem.
+	- If you have an error message or a crash, please include the full text of the error message and the stack trace.
+	- Include the relevant snippet of your code. Wrap it in \`\`\`js /* code */ \`\`\` and GitHub [will format it nicely for you](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting).
+- If you're **requesting a feature**, please be descriptive and understanding.
+	- A good title makes a difference. Please briefly describe what you're requesting in the title.
+	- Be descriptive in the issue body, too. Say what you want to do, and ideally what the method should be named.
+	- Be understanding if I don't think that your feature request falls within the scope of this module.
+- If you're **asking a question** or **requesting support**, please don't submit a GitHub issue.
+	- Issues are only for problems directly relating to the module's code.
+	- Please [post a thread in the dedicated forum](https://dev.doctormckay.com/forum/8-node-steamcommunity/) instead.
+
+# Pull Requests
+
+Submitting a pull request? Great! Thanks for contributing your time and code! Please keep the following in mind.
+
+- Please follow the existing code style.
+	- Tabs for indentation
+	- camelCase for variables and functions
+	- Opening braces on the same line as the if/for/while statement
+	- etc.
+- Please avoid breaking changes. If you make a breaking change that can be done in a backwards-compatible manner, I won't accept it.
+- Please don't increment the version number in `package.json`. I'll do that myself when I publish it to npm.
+- Please include a brief description of your change in the pull request if it's not immediately apparent from the code.
+- Be understanding if I don't think that your change falls within the scope of this module.

components/confirmations.js

@@ -18,10 +18,10 @@ SteamCommunity.prototype.getConfirmations = function(time, key, callback) {
 		if(err) {
 			if (err.message == "Invalid protocol: steammobile:") {
 				err.message = "Not Logged In";
+				self._notifySessionExpired(err);
 			}
 
 			callback(err);
-			self._notifySessionExpired(err);
 			return;
 		}
 

components/profile.js

@@ -114,6 +114,10 @@ SteamCommunity.prototype.editProfile = function(settings, callback) {
 		}
 		
 		self._myProfile("edit", values, function(err, response, body) {
+			if (values.customURL) {
+				delete self._profileURL;
+			}
+
 			if(err || response.statusCode != 200) {
 				if(callback) {
 					callback(err || new Error("HTTP error " + response.statusCode));

components/twofactor.js

@@ -61,7 +61,15 @@ SteamCommunity.prototype.finalizeTwoFactor = function(secret, activationCode, ca
 			return;
 		}
 
-		finalize(token);
+		SteamTotp.getTimeOffset(function(err, offset, latency) {
+			if (err) {
+				callback(err);
+				return;
+			}
+
+			diff = offset;
+			finalize(token);
+		});
 	});
 
 	function finalize(token) {
@@ -144,14 +152,8 @@ SteamCommunity.prototype.disableTwoFactor = function(revocationCode, callback) {
 				return;
 			}
 
-			if(body.response.status == 1) {
-				callback(null);
-				return;
-			}
-
-			var error = new Error("Cannot remove authenticator (" + body.response.status + ")");
-			error.eresult = body.response.status;
-			callback(error);
+			// success = true means it worked
+			callback(null);
 		}, "steamcommunity");
 	});
 };

examples/disable_twofactor.js

@@ -0,0 +1,61 @@
+var SteamCommunity = require('../index.js');
+var ReadLine = require('readline');
+var fs = require('fs');
+
+var community = new SteamCommunity();
+var rl = ReadLine.createInterface({
+	"input": process.stdin,
+	"output": process.stdout
+});
+
+rl.question("Username: ", function(accountName) {
+	rl.question("Password: ", function(password) {
+		rl.question("Two-Factor Auth Code: ", function(authCode) {
+			rl.question("Revocation Code: R", function(rCode) {
+				doLogin(accountName, password, authCode, "", rCode);
+			});
+		});
+	});
+});
+
+function doLogin(accountName, password, authCode, captcha, rCode) {
+	community.login({
+		"accountName": accountName,
+		"password": password,
+		"twoFactorCode": authCode,
+		"captcha": captcha
+	}, function(err, sessionID, cookies, steamguard) {
+		if(err) {
+			if(err.message == 'SteamGuard') {
+				console.log("This account does not have two-factor authentication enabled.");
+				process.exit();
+				return;
+			}
+
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, captchaInput);
+				});
+
+				return;
+			}
+
+			console.log(err);
+			process.exit();
+			return;
+		}
+
+		console.log("Logged on!");
+		community.disableTwoFactor("R" + rCode, function(err) {
+			if(err) {
+				console.log(err);
+				process.exit();
+				return;
+			}
+
+			console.log("Two-factor authentication disabled!");
+			process.exit();
+		});
+	});
+}

examples/edit-group-announcement.js

@@ -14,12 +14,13 @@ rl.question("Username: ", function(accountName) {
 	});
 });
 
-function doLogin(accountName, password, authCode, twoFactorCode) {
+function doLogin(accountName, password, authCode, twoFactorCode, captcha) {
 	community.login({
 		"accountName": accountName,
 		"password": password,
 		"authCode": authCode,
-		"twoFactorCode": twoFactorCode
+		"twoFactorCode": twoFactorCode,
+		"captcha": captcha
 	}, function(err, sessionID, cookies, steamguard) {
 		if(err) {
 			if(err.message == 'SteamGuardMobile') {
@@ -39,6 +40,15 @@ function doLogin(accountName, password, authCode, twoFactorCode) {
 				return;
 			}
 
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, twoFactorCode, captchaInput);
+				});
+
+				return;
+			}
+
 			console.log(err);
 			process.exit();
 			return;

examples/enable_twofactor.js

@@ -14,11 +14,12 @@ rl.question("Username: ", function(accountName) {
 	});
 });
 
-function doLogin(accountName, password, authCode) {
+function doLogin(accountName, password, authCode, captcha) {
 	community.login({
 		"accountName": accountName,
 		"password": password,
-		"authCode": authCode
+		"authCode": authCode,
+		"captcha": captcha
 	}, function(err, sessionID, cookies, steamguard) {
 		if(err) {
 			if(err.message == 'SteamGuardMobile') {
@@ -29,13 +30,22 @@ function doLogin(accountName, password, authCode) {
 
 			if(err.message == 'SteamGuard') {
 				console.log("An email has been sent to your address at " + err.emaildomain);
-				rl.question("Steam Guard Code: ", function(code) {
+				rl.question("Steam Guard Code: ", function (code) {
 					doLogin(accountName, password, code);
 				});
 
 				return;
 			}
 
+			if(err.message == 'CAPTCHA') {
+				console.log(err.captchaurl);
+				rl.question("CAPTCHA: ", function(captchaInput) {
+					doLogin(accountName, password, authCode, captchaInput);
+				});
+
+				return;
+			}
+
 			console.log(err);
 			process.exit();
 			return;

index.js

@@ -135,6 +135,8 @@ SteamCommunity.prototype.login = function(details, callback) {
 				callback(error);
 			} else if(!body.success) {
 				callback(new Error(body.message || "Unknown error"));
+			} else if(!body.oauth) {
+				callback(new Error("Malformed response"));
 			} else {
 				var sessionID = generateSessionID();
 				var oAuth = JSON.parse( body.oauth );
@@ -339,20 +341,34 @@ SteamCommunity.prototype.loggedIn = function(callback) {
 
 SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 	var self = this;
-	this.httpRequest("https://steamcommunity.com/my", {"followRedirect": false}, function(err, response, body) {
-		if(err || response.statusCode != 302) {
-			callback(err || "HTTP error " + response.statusCode);
-			return;
-		}
-		
-		var match = response.headers.location.match(/steamcommunity\.com(\/(id|profiles)\/[^\/]+)\/?/);
-		if(!match) {
-			callback(new Error("Can't get profile URL"));
-			return;
-		}
 
+	if (this._profileURL) {
+		completeRequest(this._profileURL);
+	} else {
+		this.httpRequest("https://steamcommunity.com/my", {"followRedirect": false}, function(err, response, body) {
+			if(err || response.statusCode != 302) {
+				callback(err || "HTTP error " + response.statusCode);
+				return;
+			}
+
+			var match = response.headers.location.match(/steamcommunity\.com(\/(id|profiles)\/[^\/]+)\/?/);
+			if(!match) {
+				callback(new Error("Can't get profile URL"));
+				return;
+			}
+
+			self._profileURL = match[1];
+			setTimeout(function () {
+				delete self._profileURL; // delete the cache
+			}, 60000);
+
+			completeRequest(match[1]);
+		}, "steamcommunity");
+	}
+
+	function completeRequest(url) {
 		var options = {
-			"uri": "https://steamcommunity.com" + match[1] + "/" + endpoint,
+			"uri": "https://steamcommunity.com" + url + "/" + endpoint,
 			"method": "GET"
 		};
 
@@ -362,10 +378,9 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 		}
 
 		self.httpRequest(options, callback, "steamcommunity");
-	}, "steamcommunity");
+	}
 };
 
-
 require('./components/http.js');
 require('./components/chat.js');
 require('./components/profile.js');

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.19.2",
+	"version": "3.19.7",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": ["steam", "steam community"],
 	"homepage": "https://github.com/DoctorMcKay/node-steamcommunity",
@@ -15,9 +15,9 @@
 	"dependencies": {
 		"request": "^2.61.0",
 		"node-bignumber": "^1.2.1",
-		"steamid": "^0.3.1",
+		"steamid": "^1.0.0",
 		"xml2js": "^0.4.11",
-		"cheerio": "^0.20.0",
+		"cheerio": "0.19.0",
 		"async": "^1.4.2",
 		"steam-totp": "^1.3.0"
 	},