3.18.6

Fix for issue #75

classes/CSteamUser.js

@@ -90,7 +90,7 @@ function CSteamUser(community, userData, customurl) {
 	var self = this;
 	if(userData.groups && userData.groups[0] && userData.groups[0].group) {
 		this.groups = userData.groups[0].group.map(function(group) {
-			if(group['$'] && group['$'].isPrimary) {
+			if(group['$'] && group['$'].isPrimary === "1") {
 				self.primaryGroup = new SteamID(group.groupID64[0]);
 			}
 			

components/confirmations.js

@@ -165,7 +165,7 @@ function request(community, url, key, time, tag, params, json, callback) {
 
 /**
  * Start automatically polling our confirmations for new ones. The `confKeyNeeded` event will be emitted when we need a confirmation key, or `newConfirmation` when we get a new confirmation
- * @param {int} pollInterval - The interval, in milliseconds, at which we will poll for confirmations. This shouldn't be any less than 10,000 probably.
+ * @param {int} pollInterval - The interval, in milliseconds, at which we will poll for confirmations. This should probably be at least 10,000 to avoid rate-limits.
  * @param {Buffer|string|null} [identitySecret=null] - Your identity_secret. If passed, all confirmations will be automatically accepted and nothing will be emitted.
  */
 SteamCommunity.prototype.startConfirmationChecker = function(pollInterval, identitySecret) {
@@ -239,6 +239,7 @@ SteamCommunity.prototype.checkConfirmations = function() {
 
 		self.getConfirmations(key.time, key.key, function(err, confirmations) {
 			if(err) {
+				self.emit('debug', "Can't check confirmations: " + err.message);
 				resetTimer();
 				return;
 			}
@@ -287,9 +288,14 @@ SteamCommunity.prototype.checkConfirmations = function() {
 		// Delay them by 1 second per new confirmation that we see, so that keys won't be the same.
 		setTimeout(function() {
 			if(self._identitySecret) {
-				self.emit('debug', 'Accepting confirmation ' + conf.id);
+				self.emit('debug', 'Accepting confirmation #' + conf.id);
 				var time = Math.floor(Date.now() / 1000);
-				conf.respond(time, SteamTotp.getConfirmationKey(self._identitySecret, time, "allow"), true, function() {
+				conf.respond(time, SteamTotp.getConfirmationKey(self._identitySecret, time, "allow"), true, function(err) {
+					if (err) {
+						self.emit('debug', "Can't accept confirmation #" + conf.id + ": " + err.message);
+					}
+
+					// We'll just retry next time we poll
 					delete self._knownConfirmations[conf.id];
 				});
 			} else {

components/profile.js

@@ -190,15 +190,6 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 				case 'inventoryGifts':
 					values.inventoryGiftPrivacy = settings[i] ? 1 : 0;
 					break;
-				
-				case 'emailConfirmation': // deprecated
-				case 'tradeConfirmation':
-					values.tradeConfirmationSetting = settings[i] ? 1 : 0;
-					break;
-
-				case 'marketConfirmation':
-					values.marketConfirmationSetting = settings[i] ? 1 : 0;
-					break;
 			}
 		}
 		

index.js

@@ -68,55 +68,43 @@ SteamCommunity.prototype.login = function(details, callback) {
 	this._jar.setCookie(Request.cookie("mobileClient=android"), "https://steamcommunity.com");
 	
 	this.request.post("https://steamcommunity.com/login/getrsakey/", {
-		"form": {
-			"username": details.accountName
-		},
-		"headers": mobileHeaders
+		"form": {"username": details.accountName},
+		"headers": mobileHeaders,
+		"json": true
 	}, function(err, response, body) {
 		// Remove the mobile cookies
-		if(err) {
+		if (self._checkHttpError(err, response, callback)) {
 			deleteMobileCookies();
-			callback(err);
-			return;
-		}
-		
-		var json;
-		try {
-			json = JSON.parse(body);
-		} catch(e) {
-			deleteMobileCookies();
-			callback(e);
 			return;
 		}
 
-		if(!json.publickey_mod || !json.publickey_exp) {
+		if(!body.publickey_mod || !body.publickey_exp) {
 			deleteMobileCookies();
 			callback(new Error("Invalid RSA key received"));
 			return;
 		}
 		
 		var key = new RSA();
-		key.setPublic(json.publickey_mod, json.publickey_exp);
-		
-		var form = {
-			"captcha_text": details.captcha || "",
-			"captchagid": self._captchaGid,
-			"emailauth": details.authCode || "",
-			"emailsteamid": "",
-			"password": hex2b64(key.encrypt(details.password)),
-			"remember_login": "true",
-			"rsatimestamp": json.timestamp,
-			"twofactorcode": details.twoFactorCode || "",
-			"username": details.accountName,
-			"oauth_client_id": "DE45CD61",
-			"oauth_scope": "read_profile write_profile read_client write_client",
-			"loginfriendlyname": "#login_emailauth_friendlyname_mobile"
-		};
+		key.setPublic(body.publickey_mod, body.publickey_exp);
 		
 		self.request.post({
 			"uri": "https://steamcommunity.com/login/dologin/",
 			"json": true,
-			"form": form,
+			"form": {
+				"captcha_text": details.captcha || "",
+				"captchagid": self._captchaGid,
+				"emailauth": details.authCode || "",
+				"emailsteamid": "",
+				"password": hex2b64(key.encrypt(details.password)),
+				"remember_login": "true",
+				"rsatimestamp": body.timestamp,
+				"twofactorcode": details.twoFactorCode || "",
+				"username": details.accountName,
+				"oauth_client_id": "DE45CD61",
+				"oauth_scope": "read_profile write_profile read_client write_client",
+				"loginfriendlyname": "#login_emailauth_friendlyname_mobile",
+				"donotcache": Date.now()
+			},
 			"headers": mobileHeaders
 		}, function(err, response, body) {
 			deleteMobileCookies();
@@ -124,19 +112,20 @@ SteamCommunity.prototype.login = function(details, callback) {
 			if(self._checkHttpError(err, response, callback)) {
 				return;
 			}
-			
+
+			var error;
 			if(!body.success && body.emailauth_needed) {
 				// Steam Guard (email)
-				var error = new Error("SteamGuard");
+				error = new Error("SteamGuard");
 				error.emaildomain = body.emaildomain;
 				
 				callback(error);
 			} else if(!body.success && body.requires_twofactor) {
 				// Steam Guard (app)
 				callback(new Error("SteamGuardMobile"));
-			} else if(!body.success && body.captcha_needed) {
-				var error = new Error("CAPTCHA");
-				error.captchaurl = "https://steamcommunity.com/public/captcha.php?gid=" + body.captcha_gid;
+			} else if(!body.success && body.captcha_needed && body.message.match(/Please verify your humanity/)) {
+				error = new Error("CAPTCHA");
+				error.captchaurl = "https://steamcommunity.com/login/rendercaptcha/?gid=" + body.captcha_gid;
 				
 				self._captchaGid = body.captcha_gid;
 				

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.18.3",
+	"version": "3.18.6",
 	"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",