steamutils 1.4.23 → 1.4.24

package/index.js

@@ -4911,55 +4911,104 @@ export default class SteamUser {
   }
 
   async removePhoneNumber() {
-    const result = await this._httpRequest(`https://help.steampowered.com/en/wizard/HelpRemovePhoneNumber?redir=store/account`);
-    if (!result?.data || typeof result.data !== "string" || result instanceof ResponseError) {
+    const getHelpLink = async () => {
+      const response = await this._httpRequest("https://help.steampowered.com/en/wizard/HelpRemovePhoneNumber?redir=store/account");
+      const html = response.data;
+      const $ = cheerio.load(html);
+      const buttons = $("a.help_wizard_button");
+      const buttonsMapping = [...buttons].map(function (el) {
+        el = $(el);
+        const text = el.text().trim();
+        const link = el.attr("href");
+        return {
+          text,
+          link,
+        };
+      });
+
+      const steamAppConfirmBtn = buttonsMapping.find(({ text }) => text === "Send a confirmation to my Steam Mobile app");
+      if (steamAppConfirmBtn) {
+        return {
+          ...steamAppConfirmBtn,
+          type: "SteamAppConfirm",
+        };
+      }
+
+      const phoneTextingConfirmBtn = buttonsMapping.find(({ text }) => text.startsWith("Text an account verification code to my phone number ending in"));
+      if (phoneTextingConfirmBtn) {
+        return {
+          ...phoneTextingConfirmBtn,
+          type: "PhoneTextingConfirm",
+        };
+      }
+    };
+
+    const isVerificationCodeSent = (html) => {
+      const $ = cheerio.load(html);
+      const help_page_title = $("#forgot_login_code_form .help_page_title").text().trim();
+      return help_page_title.startsWith("A verification code was sent to phone number ending in");
+    };
+
+    const { type, link: helpLink } = (await getHelpLink()) || {};
+    if (!type) {
       return;
     }
 
-    let href = null;
-    const $ = cheerio.load(result.data);
-    $("a").each(function (index, el) {
-      if (!href) {
-        const link = $(el).attr("href");
-        if (link?.startsWith("https://help.steampowered.com/en/wizard/HelpWithLoginInfoEnterCode?s=")) {
-          href = link;
-        }
-      }
-    });
-    let s = null;
-    try {
-      s = URL.parse(href)
-        .query.split("&")
-        .map((q) => q.split("="))
-        .find((q) => q[0] === "s")[1];
-    } catch (e) {}
-    if (!s)
+    const result = await this._httpRequest(helpLink);
+    const html = result?.data;
+    if (!html || typeof html !== "string" || result instanceof ResponseError) {
+      return;
+    }
+
+    const params = SteamUser.parseWizardPageParams(html);
+    const paramsExample = {
+      g_sessionID: "a32bcb41a7917a9f0e20a02a",
+      issue: {
+        s: "8531824267074740155",
+        reset: "4",
+        lost: "0",
+        method: "4",
+        issueid: "403",
+      },
+      g_rgDefaultWizardPageParams: {
+        wizard_ajax: 1,
+        gamepad: 0,
+      },
+    };
+
+    if (!params) {
       return {
         success: false,
       };
+    }
 
-    const sendAccountRecoveryCodeResult = await this._httpRequest({
-      url: `https://help.steampowered.com/en/wizard/AjaxSendAccountRecoveryCode`,
-      headers: {
-        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
-        "Content-Type": "application/x-www-form-urlencoded",
-      },
-      data: {
-        wizard_ajax: "1",
-        gamepad: "0",
-        s,
-        method: 4,
-        link: "",
-      },
-      method: "POST",
-    });
-    if (sendAccountRecoveryCodeResult instanceof ResponseError) {
-      return sendAccountRecoveryCodeResult;
+    if (!isVerificationCodeSent(html)) {
+      const sendAccountRecoveryCodeResult = await this._httpRequest({
+        url: `https://help.steampowered.com/en/wizard/AjaxSendAccountRecoveryCode`,
+        headers: {
+          "x-requested-with": "XMLHttpRequest",
+          "content-type": "application/x-www-form-urlencoded",
+        },
+        data: {
+          ...params.g_rgDefaultWizardPageParams,
+          s: params.issue.s,
+          method: params.issue.method,
+          link: "",
+        },
+        method: "POST",
+      });
+      if (sendAccountRecoveryCodeResult instanceof ResponseError) {
+        return sendAccountRecoveryCodeResult;
+      }
+      return {
+        success: !!sendAccountRecoveryCodeResult.data?.success,
+        params,
+      };
     }
 
     return {
-      success: !!sendAccountRecoveryCodeResult.data?.success,
-      s,
+      success: true,
+      params,
     };
   }
 
@@ -7280,6 +7329,39 @@ export default class SteamUser {
     } catch (e) {}
   }
 
+  static parseWizardPageParams(html) {
+    if (!html || typeof html !== "string") {
+      return;
+    }
+
+    const $ = cheerio.load(html);
+    const forgot_login_code_form = $("#forgot_login_code_form");
+    const s = forgot_login_code_form.find('input[name="s"]').val();
+    const reset = forgot_login_code_form.find('input[name="reset"]').val();
+    const lost = forgot_login_code_form.find('input[name="lost"]').val();
+    const method = forgot_login_code_form.find('input[name="method"]').val();
+    const issueid = forgot_login_code_form.find('input[name="issueid"]').val();
+
+    const cleanHtml = html.replaceAll(/\s+/gi, " ");
+    //do not remove this line
+    const g_sessionID = cleanHtml.substringBetweenOrNull('var g_sessionID = "', '";');
+    const g_rgDefaultWizardPageParamsStr = cleanHtml.substringAfter("g_rgDefaultWizardPageParams =").trim().substringBefore(";").trim();
+    const g_rgDefaultWizardPageParams = eval(`() => {return ${g_rgDefaultWizardPageParamsStr};}`)();
+    delete g_rgDefaultWizardPageParams.sessionid;
+
+    return {
+      g_sessionID,
+      issue: {
+        s,
+        reset,
+        lost,
+        method,
+        issueid,
+      },
+      g_rgDefaultWizardPageParams,
+    };
+  }
+
   async enumerateTokens(accessToken) {
     if (!accessToken || typeof accessToken !== "string") {
       console.error("revokeAccessToken", "invalid accessToken", accessToken);
@@ -7466,31 +7548,7 @@ export default class SteamUser {
       if (!html.includes("For security, verify that the code in the box below matches the code we display on the confirmations page.")) {
         return;
       }
-      const $ = cheerio.load(html);
-      const forgot_login_code_form = $("#forgot_login_code_form");
-      const s = forgot_login_code_form.find('input[name="s"]').val();
-      const reset = forgot_login_code_form.find('input[name="reset"]').val();
-      const lost = forgot_login_code_form.find('input[name="lost"]').val();
-      const method = forgot_login_code_form.find('input[name="method"]').val();
-      const issueid = forgot_login_code_form.find('input[name="issueid"]').val();
-
-      const cleanHtml = html.replaceAll(/\s+/gi, " ");
-      //do not remove this line
-      const g_sessionID = cleanHtml.substringAfter("g_sessionID =").trim().substringBefore(";").replaceAll('"', "").trim();
-      const g_rgDefaultWizardPageParamsStr = cleanHtml.substringAfter("g_rgDefaultWizardPageParams =").trim().substringBefore(";").trim();
-      const g_rgDefaultWizardPageParams = eval(`() => {return ${g_rgDefaultWizardPageParamsStr};}`)();
-      delete g_rgDefaultWizardPageParams.sessionid;
-
-      return {
-        issue: {
-          s,
-          reset,
-          lost,
-          method,
-          issueid,
-        },
-        g_rgDefaultWizardPageParams,
-      };
+      return SteamUser.parseWizardPageParams(html);
     };
     const sendAccountRecoveryCode = async (issue, g_rgDefaultWizardPageParams, helpLink) => {
       const result = await this._httpRequest({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.4.23",
+  "version": "1.4.24",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",