@mswjs/interceptors 0.25.3 → 0.25.4

package/lib/node/RemoteHttpInterceptor.js

@@ -3,7 +3,7 @@
 var _chunkUF7QIAQ5js = require('./chunk-UF7QIAQ5.js');
 
 
-var _chunkNCHFM2TBjs = require('./chunk-NCHFM2TB.js');
+var _chunkBAS5F5A4js = require('./chunk-BAS5F5A4.js');
 
 
 var _chunkJCWVLTP7js = require('./chunk-JCWVLTP7.js');
@@ -24,7 +24,7 @@ var RemoteHttpInterceptor = class extends _chunkUF7QIAQ5js.BatchInterceptor {
     super({
       name: "remote-interceptor",
       interceptors: [
-        new (0, _chunkNCHFM2TBjs.ClientRequestInterceptor)(),
+        new (0, _chunkBAS5F5A4js.ClientRequestInterceptor)(),
         new (0, _chunkJCWVLTP7js.XMLHttpRequestInterceptor)()
       ]
     });

package/lib/node/RemoteHttpInterceptor.mjs

@@ -3,7 +3,7 @@ import {
 } from "./chunk-UBEFEZXT.mjs";
 import {
   ClientRequestInterceptor
-} from "./chunk-MCO3RLQC.mjs";
+} from "./chunk-6HZYLI7O.mjs";
 import {
   XMLHttpRequestInterceptor
 } from "./chunk-FB53TMYN.mjs";

package/lib/node/{chunk-MCO3RLQC.mjs → chunk-6HZYLI7O.mjs}

@@ -152,6 +152,12 @@ function createRequest(clientRequest) {
       headers.append(headerName, value.toString());
     }
   }
+  if (clientRequest.url.username && clientRequest.url.password) {
+    const auth = `${clientRequest.url.username}:${clientRequest.url.password}`;
+    headers.set("Authorization", `Basic ${btoa(auth)}`);
+    clientRequest.url.username = "";
+    clientRequest.url.password = "";
+  }
   const method = clientRequest.method || "GET";
   return new Request(clientRequest.url, {
     method,
@@ -576,7 +582,9 @@ function getUrlByRequestOptions(options) {
   logger3.info("credentials", credentials);
   const authString = credentials ? `${credentials.username}:${credentials.password}@` : "";
   logger3.info("auth string:", authString);
-  const url = new URL(`${protocol}//${authString}${hostname}${path}`);
+  const url = new URL(`${protocol}//${hostname}${path}`);
+  url.username = (credentials == null ? void 0 : credentials.username) || "";
+  url.password = (credentials == null ? void 0 : credentials.password) || "";
   logger3.info("created url:", url);
   return url;
 }

package/lib/node/{chunk-NCHFM2TB.js → chunk-BAS5F5A4.js}

@@ -152,6 +152,12 @@ function createRequest(clientRequest) {
       headers.append(headerName, value.toString());
     }
   }
+  if (clientRequest.url.username && clientRequest.url.password) {
+    const auth = `${clientRequest.url.username}:${clientRequest.url.password}`;
+    headers.set("Authorization", `Basic ${btoa(auth)}`);
+    clientRequest.url.username = "";
+    clientRequest.url.password = "";
+  }
   const method = clientRequest.method || "GET";
   return new Request(clientRequest.url, {
     method,
@@ -576,7 +582,9 @@ function getUrlByRequestOptions(options) {
   logger3.info("credentials", credentials);
   const authString = credentials ? `${credentials.username}:${credentials.password}@` : "";
   logger3.info("auth string:", authString);
-  const url = new URL(`${protocol}//${authString}${hostname}${path}`);
+  const url = new URL(`${protocol}//${hostname}${path}`);
+  url.username = (credentials == null ? void 0 : credentials.username) || "";
+  url.password = (credentials == null ? void 0 : credentials.password) || "";
   logger3.info("created url:", url);
   return url;
 }

package/lib/node/interceptors/ClientRequest/index.js

@@ -1,9 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkNCHFM2TBjs = require('../../chunk-NCHFM2TB.js');
+var _chunkBAS5F5A4js = require('../../chunk-BAS5F5A4.js');
 require('../../chunk-OGN3ZR35.js');
 require('../../chunk-5PTPJLB7.js');
 require('../../chunk-3XFLRXRY.js');
 
 
-exports.ClientRequestInterceptor = _chunkNCHFM2TBjs.ClientRequestInterceptor;
+exports.ClientRequestInterceptor = _chunkBAS5F5A4js.ClientRequestInterceptor;

package/lib/node/interceptors/ClientRequest/index.mjs

@@ -1,6 +1,6 @@
 import {
   ClientRequestInterceptor
-} from "../../chunk-MCO3RLQC.mjs";
+} from "../../chunk-6HZYLI7O.mjs";
 import "../../chunk-3IYIKC3X.mjs";
 import "../../chunk-YQGTMMOZ.mjs";
 import "../../chunk-GM3YBSM3.mjs";

package/lib/node/presets/node.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkNCHFM2TBjs = require('../chunk-NCHFM2TB.js');
+var _chunkBAS5F5A4js = require('../chunk-BAS5F5A4.js');
 
 
 var _chunkJCWVLTP7js = require('../chunk-JCWVLTP7.js');
@@ -12,7 +12,7 @@ require('../chunk-3XFLRXRY.js');
 
 // src/presets/node.ts
 var node_default = [
-  new (0, _chunkNCHFM2TBjs.ClientRequestInterceptor)(),
+  new (0, _chunkBAS5F5A4js.ClientRequestInterceptor)(),
   new (0, _chunkJCWVLTP7js.XMLHttpRequestInterceptor)()
 ];
 

package/lib/node/presets/node.mjs

@@ -1,6 +1,6 @@
 import {
   ClientRequestInterceptor
-} from "../chunk-MCO3RLQC.mjs";
+} from "../chunk-6HZYLI7O.mjs";
 import {
   XMLHttpRequestInterceptor
 } from "../chunk-FB53TMYN.mjs";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.25.3",
+  "version": "0.25.4",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",

package/src/interceptors/ClientRequest/utils/createRequest.ts

@@ -20,6 +20,21 @@ export function createRequest(clientRequest: NodeClientRequest): Request {
     }
   }
 
+  /**
+   * Translate the authentication from the request URL to
+   * the request "Authorization" header.
+   * @see https://github.com/mswjs/interceptors/issues/438
+   */
+  if (clientRequest.url.username && clientRequest.url.password) {
+    const auth = `${clientRequest.url.username}:${clientRequest.url.password}`
+    headers.set('Authorization', `Basic ${btoa(auth)}`)
+
+    // Remove the credentials from the URL since you cannot
+    // construct a Request instance with such a URL.
+    clientRequest.url.username = ''
+    clientRequest.url.password = ''
+  }
+
   const method = clientRequest.method || 'GET'
 
   return new Request(clientRequest.url, {

package/src/utils/getUrlByRequestOptions.ts

@@ -86,7 +86,14 @@ function getHostByRequestOptions(options: ResolvedRequestOptions): string {
   return host || DEFAULT_HOST
 }
 
-function getAuthByRequestOptions(options: ResolvedRequestOptions) {
+interface RequestAuth {
+  username: string
+  password: string
+}
+
+function getAuthByRequestOptions(
+  options: ResolvedRequestOptions
+): RequestAuth | undefined {
   if (options.auth) {
     const [username, password] = options.auth.split(':')
     return { username, password }
@@ -159,7 +166,10 @@ export function getUrlByRequestOptions(options: ResolvedRequestOptions): URL {
     : ''
   logger.info('auth string:', authString)
 
-  const url = new URL(`${protocol}//${authString}${hostname}${path}`)
+  const url = new URL(`${protocol}//${hostname}${path}`)
+  url.username = credentials?.username || ''
+  url.password = credentials?.password || ''
+
   logger.info('created url:', url)
 
   return url