fix question mark stripped from url when no params are given (#7… (#782)

* fix question mark stripped from url when no params are given (#776)

* add more tests

* whitespace

* modify the server to handle the new tests

Co-authored-by: dzek69 <git-public@dzek.eu>

package.json

@@ -56,7 +56,7 @@
 		"chai-as-promised": "^7.1.1",
 		"chai-iterator": "^3.0.2",
 		"chai-string": "^1.5.0",
-        "coveralls": "^3.0.11",
+		"coveralls": "^3.0.11",
 		"form-data": "^3.0.0",
 		"mocha": "^7.1.1",
 		"nyc": "^15.0.1",

src/request.js

@@ -12,6 +12,7 @@ import Stream from 'stream';
 import Headers, {exportNodeCompatibleHeaders} from './headers';
 import Body, {clone, extractContentType, getTotalBytes} from './body';
 import {isAbortSignal} from './utils/is';
+import {getSearch} from './utils/get-search';
 
 const INTERNALS = Symbol('Request internals');
 
@@ -258,9 +259,11 @@ export function getNodeRequestOptions(request) {
 	// HTTP-network fetch step 4.2
 	// chunked encoding is handled by Node.js
 
-	// manually spread the URL object instead of spread syntax
+	const search = getSearch(parsedURL);
+
+	// Manually spread the URL object instead of spread syntax
 	const requestOptions = {
-		path: parsedURL.pathname + parsedURL.search,
+		path: parsedURL.pathname + search,
 		pathname: parsedURL.pathname,
 		hostname: parsedURL.hostname,
 		protocol: parsedURL.protocol,

src/utils/get-search.js

@@ -0,0 +1,9 @@
+export function getSearch(parsedURL) {
+	if (parsedURL.search) {
+		return parsedURL.search;
+	}
+
+	const lastOffset = parsedURL.href.length - 1;
+	const hash = parsedURL.hash || (parsedURL.href[lastOffset] === '#' ? '#' : '');
+	return parsedURL.href[lastOffset - hash.length] === '?' ? '?' : '';
+}

test/main.js

@@ -1909,6 +1909,39 @@ describe('node-fetch', () => {
 		});
 	});
 
+	it('should keep `?` sign in URL when no params are given', () => {
+		const url = `${base}question?`;
+		const urlObject = new URL(url);
+		const request = new Request(urlObject);
+		return fetch(request).then(res => {
+			expect(res.url).to.equal(url);
+			expect(res.ok).to.be.true;
+			expect(res.status).to.equal(200);
+		});
+	});
+
+	it('if params are given, do not modify anything', () => {
+		const url = `${base}question?a=1`;
+		const urlObject = new URL(url);
+		const request = new Request(urlObject);
+		return fetch(request).then(res => {
+			expect(res.url).to.equal(url);
+			expect(res.ok).to.be.true;
+			expect(res.status).to.equal(200);
+		});
+	});
+
+	it('should preserve the hash (#) symbol', () => {
+		const url = `${base}question?#`;
+		const urlObject = new URL(url);
+		const request = new Request(urlObject);
+		return fetch(request).then(res => {
+			expect(res.url).to.equal(url);
+			expect(res.ok).to.be.true;
+			expect(res.status).to.equal(200);
+		});
+	});
+
 	it('should support reading blob as text', () => {
 		return new Response('hello')
 			.blob()

test/utils/server.js

@@ -49,6 +49,12 @@ export default class TestServer {
 			res.end('world');
 		}
 
+		if (p.includes('question')) {
+			res.statusCode = 200;
+			res.setHeader('Content-Type', 'text/plain');
+			res.end('ok');
+		}
+
 		if (p === '/plain') {
 			res.statusCode = 200;
 			res.setHeader('Content-Type', 'text/plain');