Merge pull request #5176 from nextcloud-libraries/fix/reference_url_p…

…attern

fix(NcRichText): Make URL_PATTERN match localhost and URLs with ports

src/components/NcRichText/helpers.js

@@ -3,14 +3,11 @@
  *
  * @type {RegExp}
  */
-export const URL_PATTERN = /(\s|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig
+export const URL_PATTERN = /(\s|^)(https?:\/\/)([-A-Z0-9+_.]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|$)/ig
 
 /**
  * Regex pattern to identify strings as links and then making them clickable
- * Opposed to the above regex this one also matches IP addresses, which we would like to be clickable,
- * but in general resolving references for them might mostly not work,
- * as the link provider checks for local addresses and does not resolve them.
  *
  * @type {RegExp}
  */
-export const URL_PATTERN_AUTOLINK = /(\s|\(|^)((https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z0-9]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*))(?=\s|\)|$)/ig
+export const URL_PATTERN_AUTOLINK = /(\s|\(|^)((https?:\/\/)([-A-Z0-9+_.]+[-A-Z0-9]+(?::[0-9]+)?(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*))(?=\s|\)|$)/ig

tests/unit/components/NcRichText/helpers.spec.js

@@ -0,0 +1,21 @@
+import { URL_PATTERN, URL_PATTERN_AUTOLINK } from '../../../../src/components/NcRichText/helpers.js'
+
+describe('URL_PATTERN', () => {
+	const urls = [
+		'http://example.org',
+		'https://example.org/',
+		'https://cloud.example.org/index.php/apps/files/',
+		'http://localhost/',
+		'http://localhost:8080/index.php',
+		'http://192.168.1.3/',
+	]
+
+	for (const url of urls) {
+		it(`URL_PATTERN regex matches URL ${url}`, () => {
+			expect(new RegExp(URL_PATTERN).exec(url)).toBeTruthy()
+		})
+		it(`URL_PATTERN_AUTOLINK regex matches URL ${url}`, () => {
+			expect(new RegExp(URL_PATTERN_AUTOLINK).exec(url)).toBeTruthy()
+		})
+	}
+})