Merge PR #3184: patch @ewsjs/xhr to stop overwriting request errors

Author: jeanfbrito

.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch

@@ -0,0 +1,34 @@
+diff --git a/dist/ntlmProvider.js b/dist/ntlmProvider.js
+index df9a914110df069ad0a7b3cd4d07461a23aeee2a..e2dc5e7d8cd2e64823fea9fc4ec32fc258a20063 100644
+--- a/dist/ntlmProvider.js
++++ b/dist/ntlmProvider.js
+@@ -40,7 +40,11 @@ class NtlmProvider {
+         delete opt['data'];
+         delete opt['responseType'];
+         try {
+-            const response = await (0, axios_1.default)(opt).catch(err => err.response);
++            const response = await (0, axios_1.default)(opt).catch(err => {
++                if (err.response)
++                    return err.response;
++                throw err;
++            });
+             if (!response.headers['www-authenticate'])
+                 throw new Error('www-authenticate not found on response of second request');
+             let type2msg = (0, ntlm_client_1.decodeType2Message)(response.headers['www-authenticate']);
+diff --git a/src/ntlmProvider.ts b/src/ntlmProvider.ts
+index e6689cbef424452426ae46ca00cf34abcbb77b88..fb0a47127155229ab886adc39f1059e4ed2a2454 100644
+--- a/src/ntlmProvider.ts
++++ b/src/ntlmProvider.ts
+@@ -51,7 +51,11 @@ export class NtlmProvider implements IProvider {
+     delete opt['responseType'];
+ 
+     try {
+-      const response = await axios(opt).catch(err => err.response);
++      const response = await axios(opt).catch(err => {
++        if (err.response)
++          return err.response;
++        throw err;
++      });
+ 
+       if (!response.headers['www-authenticate'])
+         throw new Error('www-authenticate not found on response of second request');

docs/alpha-release-process.md

@@ -0,0 +1,136 @@
+# Alpha Release Process
+
+This document describes how to create alpha releases for QA testing and early customer access.
+
+## Overview
+
+The Rocket.Chat Desktop app supports three release channels:
+- **Stable** (`latest`) - Production releases for all users
+- **Beta** - Pre-release testing with broader audience
+- **Alpha** - Early testing for QA and select customers
+
+## How Channels Work
+
+| Channel | Version Format | Who Gets It | Update File |
+|---------|---------------|-------------|-------------|
+| Stable | `4.12.0` | All users (default) | `latest.yml` |
+| Beta | `4.12.0-beta.1` | Beta opt-in users | `beta.yml` |
+| Alpha | `4.12.0-alpha.1` | Alpha opt-in users | `alpha.yml` |
+
+**Channel hierarchy**: Alpha users receive alpha, beta, AND stable updates. Beta users receive beta AND stable. Stable users only receive stable.
+
+## Creating an Alpha Release
+
+### 1. Create Release Branch
+
+```bash
+git checkout master
+git pull
+git checkout -b release/4.12.0-alpha.1
+```
+
+### 2. Update Version
+
+Edit `package.json`:
+```json
+{
+  "version": "4.12.0-alpha.1"
+}
+```
+
+### 3. Commit and Push
+
+```bash
+git add package.json
+git commit -m "chore: bump version to 4.12.0-alpha.1"
+git push origin release/4.12.0-alpha.1
+```
+
+### 4. Create and Push Tag
+
+```bash
+git tag 4.12.0-alpha.1
+git push origin 4.12.0-alpha.1
+```
+
+### 5. CI Builds Automatically
+
+The GitHub Actions workflow triggers on tag push and:
+- Builds for all platforms (Windows, macOS, Linux)
+- Generates `alpha.yml`, `alpha-mac.yml`, `alpha-linux.yml` metadata
+- Creates a draft GitHub release marked as **Pre-release**
+- Publishes Linux snap to the `edge` channel
+
+### 6. Publish the Release
+
+1. Go to GitHub Releases
+2. Find the draft release for your version
+3. Review the release notes
+4. Click "Publish release"
+
+## How Users Opt Into Alpha
+
+### Option A: Developer Mode (Recommended for QA)
+
+1. Open Settings in the app
+2. Enable **Developer Mode**
+3. Open **About** dialog (Help > About)
+4. Select **Alpha (Experimental)** from the Update Channel dropdown
+5. Click **Check for Updates**
+
+The setting persists - users don't need to select it again.
+
+### Option B: Configuration File (For Managed Deployments)
+
+Create `update.json` in the user data directory:
+
+| Platform | Location |
+|----------|----------|
+| Windows | `%APPDATA%\Rocket.Chat\update.json` |
+| macOS | `~/Library/Application Support/Rocket.Chat/update.json` |
+| Linux | `~/.config/Rocket.Chat/update.json` |
+
+Content:
+```json
+{
+  "channel": "alpha"
+}
+```
+
+For enterprise deployments where you want to force the setting:
+```json
+{
+  "channel": "alpha",
+  "forced": true
+}
+```
+
+## Version Numbering Guidelines
+
+- **Alpha**: `4.12.0-alpha.1`, `4.12.0-alpha.2`, etc.
+- **Beta**: `4.12.0-beta.1`, `4.12.0-beta.2`, etc.
+- **Stable**: `4.12.0`
+
+When promoting:
+- Alpha `4.12.0-alpha.5` → Beta `4.12.0-beta.1`
+- Beta `4.12.0-beta.3` → Stable `4.12.0`
+
+## Safety Guarantees
+
+- Stable users **never** see alpha releases (they check `latest.yml`, not `alpha.yml`)
+- Users must explicitly opt into alpha channel
+- Alpha releases are marked as "Pre-release" on GitHub
+- Users can switch back to stable at any time
+
+## Troubleshooting
+
+### Alpha update not showing
+
+1. Verify the release is published (not draft)
+2. Check that `alpha.yml` exists in the release assets
+3. Ensure user has selected "Alpha" channel
+4. Check for updates manually via About dialog
+
+### Checking current channel
+
+In Developer Mode, open About dialog - the current channel is shown in the dropdown.

package.json

@@ -56,7 +56,7 @@
     "@emotion/css": "~11.11.2",
     "@emotion/react": "~11.11.3",
     "@emotion/styled": "~11.11.0",
-    "@ewsjs/xhr": "~2.0.2",
+    "@ewsjs/xhr": "patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch",
     "@rocket.chat/css-in-js": "~0.31.25",
     "@rocket.chat/desktop-api": "~1.1.0",
     "@rocket.chat/fuselage": "0.58.0",
@@ -156,6 +156,7 @@
   "resolutions": {
     "@fiahfy/icns-convert/sharp": "0.29.3",
     "@fiahfy/ico-convert/sharp": "0.29.3",
+    "@ewsjs/xhr@npm:^2.0.2": "patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch",
     "cross-spawn": "7.0.6",
     "braces": "3.0.3",
     "ws": "8.18.0",

yarn.lock

@@ -2019,7 +2019,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ewsjs/xhr@npm:^2.0.2, @ewsjs/xhr@npm:~2.0.2":
+"@ewsjs/xhr@npm:2.0.2":
   version: 2.0.2
   resolution: "@ewsjs/xhr@npm:2.0.2"
   dependencies:
@@ -2031,6 +2031,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ewsjs/xhr@patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch":
+  version: 2.0.2
+  resolution: "@ewsjs/xhr@patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch::version=2.0.2&hash=5c968f"
+  dependencies:
+    "@ewsjs/ntlm-client": "npm:^2.0.0"
+    axios: "npm:^1.6.0"
+    http-cookie-agent: "npm:^5.0.4"
+    tough-cookie: "npm:^4.1.3"
+  checksum: 10/bfd84076024b9e5b775903e1147076294cc131c9d5a69eb99f9d42b107832ae2e8c60423b856eb1cb8b538ebcc7e47d2c3917970e63538d8072ef615c4187322
+  languageName: node
+  linkType: hard
+
 "@fastify/busboy@npm:^2.0.0":
   version: 2.1.0
   resolution: "@fastify/busboy@npm:2.1.0"
@@ -14881,7 +14893,7 @@ __metadata:
     "@emotion/css": "npm:~11.11.2"
     "@emotion/react": "npm:~11.11.3"
     "@emotion/styled": "npm:~11.11.0"
-    "@ewsjs/xhr": "npm:~2.0.2"
+    "@ewsjs/xhr": "patch:@ewsjs/xhr@npm%3A2.0.2#~/.yarn/patches/@ewsjs-xhr-npm-2.0.2-77506b0a6c.patch"
     "@fiahfy/icns-convert": "npm:~0.0.12"
     "@fiahfy/ico-convert": "npm:~0.0.12"
     "@kayahr/jest-electron-runner": "npm:29.14.0"