chore(node-utils): use the new parseUrl utility

This commit is contained in:
Martin Varmuza
2026-02-17 09:01:04 +01:00
parent 310b714844
commit 672672b172
2 changed files with 10 additions and 13 deletions

View File

@@ -1,5 +1,3 @@
import url from 'url';
import { Log } from '@trezor/utils';
import { getFreePort } from '../getFreePort';
@@ -11,6 +9,7 @@ import {
parseBodyJSON,
parseBodyText,
} from '../http';
import { parseUrl } from '../urlParse';
type Events = {
foo: (arg: string) => void;
@@ -360,7 +359,7 @@ describe('HttpServer', () => {
test('query string as array', async () => {
const handler = jest.fn((request, response) => {
const { search } = url.parse(request.url, true);
const { search } = parseUrl(request.url);
response.end(search);
});
server.post('/foo', [parseBodyText, handler]);
@@ -377,7 +376,7 @@ describe('HttpServer', () => {
test('should get query string as url when using encoded parameters', async () => {
const handler = jest.fn((request, response) => {
const { search } = url.parse(request.url, true);
const { search } = parseUrl(request.url);
response.end(search);
});
server.post('/foo', [parseBodyText, handler]);
@@ -397,7 +396,7 @@ describe('HttpServer', () => {
test('should not get query string as url when using invalid encoded parameters', async () => {
const handler = jest.fn((request, response) => {
const { search } = url.parse(request.url, true);
const { search } = parseUrl(request.url);
response.end(search);
});
server.post('/foo', [parseBodyText, handler]);
@@ -414,7 +413,7 @@ describe('HttpServer', () => {
test('query string sanitization', async () => {
const handler = jest.fn((request, response) => {
const { search } = url.parse(request.url, true);
const { search } = parseUrl(request.url);
response.end(search);
});
server.post('/foo', [parseBodyText, handler]);

View File

@@ -1,7 +1,5 @@
import * as url from 'url';
import { trezorLogo } from '@suite-common/suite-constants';
import { HttpServer, allowReferers } from '@trezor/node-utils';
import { HttpServer, allowReferers, parseUrl } from '@trezor/node-utils';
import { xssFilters } from '@trezor/utils';
import { convertILoggerToLog } from '../utils/IloggerToLog';
@@ -80,7 +78,7 @@ export const createHttpReceiver = () => {
httpReceiver.get('/oauth', [
allowReferers(['', '127.0.0.1', 'www.dropbox.com']), // No referer is sent by Google, Dropbox sends referer when using Safari
(request, response) => {
const { search } = url.parse(request.url, true);
const { search } = parseUrl(request.url);
if (search) {
// send data back to main window
httpReceiver.emit('oauth/response', { search });
@@ -103,7 +101,7 @@ export const createHttpReceiver = () => {
httpReceiver.get('/buy-redirect', [
allowReferers(['', 'localhost:3000', '*.invity.io', 'invity.io']),
(request, response) => {
const { query } = url.parse(request.url, true);
const { query } = parseUrl(request.url);
if (query && query.p) {
httpReceiver.emit('buy/redirect', query.p.toString());
}
@@ -155,7 +153,7 @@ export const createHttpReceiver = () => {
httpReceiver.get('/sell-redirect', [
allowReferers(['']), // No referer
(request, response) => {
const { query } = url.parse(request.url, true);
const { query } = parseUrl(request.url);
if (query && query.p) {
httpReceiver.emit('sell/redirect', query.p.toString());
}
@@ -169,7 +167,7 @@ export const createHttpReceiver = () => {
httpReceiver.get('/exchange-redirect', [
allowReferers(['']), // No referer
(request, response) => {
const { query } = url.parse(request.url, true);
const { query } = parseUrl(request.url);
if (query && query.p) {
httpReceiver.emit('exchange/redirect', query.p.toString());
}