From b73cf032d23651e1ebe57201eb960988d7284830 Mon Sep 17 00:00:00 2001 From: Sebastian Poxhofer Date: Wed, 4 Oct 2023 07:48:58 +0300 Subject: [PATCH] chore: allow null value and undefined for validateURL (#25014) --- lib/util/url.spec.ts | 5 +++-- lib/util/url.ts | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/util/url.spec.ts b/lib/util/url.spec.ts index 6396f37e8bb416..8978f1fa610a16 100644 --- a/lib/util/url.spec.ts +++ b/lib/util/url.spec.ts @@ -98,8 +98,9 @@ describe('util/url', () => { }); it('validates URLs', () => { - expect(validateUrl()).toBeFalse(); - expect(validateUrl(null as never)).toBeFalse(); + expect(validateUrl(undefined)).toBeFalse(); + expect(validateUrl('')).toBeFalse(); + expect(validateUrl(null)).toBeFalse(); expect(validateUrl('foo')).toBeFalse(); expect(validateUrl('ssh://github.com')).toBeFalse(); expect(validateUrl('http://github.com')).toBeTrue(); diff --git a/lib/util/url.ts b/lib/util/url.ts index f024c6da5aaeab..90400e58eb9d0d 100644 --- a/lib/util/url.ts +++ b/lib/util/url.ts @@ -85,8 +85,11 @@ export function getQueryString(params: Record): string { return usp.toString(); } -export function validateUrl(url?: string, httpOnly = true): boolean { - if (!url) { +export function validateUrl( + url: string | null | undefined, + httpOnly = true +): boolean { + if (!is.nonEmptyString(url)) { return false; } try {