chore(attachments): Remove support for obsolete text:// format

This format was only used from 03.01.2022 to 23.05.2022.

Signed-off-by: Jonas <[email protected]>

lib/Service/AttachmentService.php

@@ -588,21 +588,6 @@ public function cleanupAttachments(int $fileId): int {
 	 * @return array
 	 */
 	public static function getAttachmentNamesFromContent(string $content, int $fileId): array {
-		$oldMatches = [];
-		preg_match_all(
-			// simple version with .+ between the brackets
-			// '/\!\[.+\]\(text:\/\/image\?[^)]*imageFileName=([^)&]+)\)/',
-			// complex version of php-markdown
-			// matches ![ANY_CONSIDERED_CORRECT_BY_PHP-MARKDOWN](text://image?ANYTHING&imageFileName=FILE_NAME) and captures FILE_NAME
-			'/\!\[(?>[^\[\]]+|\[(?>[^\[\]]+|\[(?>[^\[\]]+|\[(?>[^\[\]]+|\[(?>[^\[\]]+|\[(?>[^\[\]]+|\[\])*\])*\])*\])*\])*\])*\]\(text:\/\/image\?[^)]*imageFileName=([^)&]+)\)/',
-			$content,
-			$oldMatches,
-			PREG_SET_ORDER
-		);
-		$oldNames = array_map(static function (array $match) {
-			return urldecode($match[1]);
-		}, $oldMatches);
-
 		$matches = [];
 		// matches ![ANY_CONSIDERED_CORRECT_BY_PHP-MARKDOWN](.attachments.DOCUMENT_ID/ANY_FILE_NAME) and captures FILE_NAME
 		preg_match_all(
@@ -611,11 +596,9 @@ public static function getAttachmentNamesFromContent(string $content, int $fileI
 			$matches,
 			PREG_SET_ORDER
 		);
-		$names = array_map(static function (array $match) {
+		return array_map(static function (array $match) {
 			return urldecode($match[1]);
 		}, $matches);
-
-		return array_merge($names, $oldNames);
 	}
 
 	/**

src/services/AttachmentResolver.js

@@ -56,14 +56,6 @@ export default class AttachmentResolver {
 	 * Currently returns either one or two urls.
 	 */
 	async resolve(src, preferRawImage = false) {
-		if (this.#session && src.startsWith('text://')) {
-			const imageFileName = getQueryVariable(src, 'imageFileName')
-			return [{
-				type: this.ATTACHMENT_TYPE_IMAGE,
-				url: this.#getImageAttachmentUrl(imageFileName, preferRawImage),
-			}]
-		}
-
 		// Has session and URL points to attachment from current document
 		if (this.#session && src.startsWith(`.attachments.${this.#session?.documentId}/`)) {
 			const imageFileName = decodeURIComponent(src.replace(`.attachments.${this.#session?.documentId}/`, '').split('?')[0])
@@ -253,13 +245,6 @@ export default class AttachmentResolver {
 	 * @param {string} src - url to extract path from
 	 */
 	#relativePath(src) {
-		if (src.startsWith('text://')) {
-			return [
-				this.#attachmentDirectory,
-				getQueryVariable(src, 'imageFileName'),
-			].join('/')
-		}
-
 		return decodeURI(src.split('?')[0])
 	}
 

src/tests/services/AttachmentResolver.spec.js

@@ -19,37 +19,6 @@ describe('Image resolver', () => {
 		expect(resolver).toBeInstanceOf(AttachmentResolver)
 	})
 
-	it('handles text:// urls via Text API', async () => {
-		const src = 'text://image?imageFileName=group%20pic.jpg'
-		const resolver = new AttachmentResolver({ session })
-		const [candidate] = await resolver.resolve(src)
-		expect(candidate.type).toBe('image')
-		expect(candidate.url).toBe('/nc-webroot/apps/text/image?documentId=4173&sessionId=456&sessionToken=mySessionToken&imageFileName=group%20pic.jpg&preferRawImage=0')
-	})
-
-	it('handles text:// urls with token via Text API', async () => {
-		const src = 'text://image?imageFileName=group%20pic.jpg'
-		const resolver = new AttachmentResolver({
-			session,
-			shareToken: 'myShareToken',
-		})
-		const [candidate] = await resolver.resolve(src)
-		expect(candidate.type).toBe('image')
-		expect(candidate.url).toBe('/nc-webroot/apps/text/image?documentId=4173&sessionId=456&sessionToken=mySessionToken&imageFileName=group%20pic.jpg&shareToken=myShareToken&preferRawImage=0')
-	})
-
-	it('uses user auth over token auth', async () => {
-		const src = 'text://image?imageFileName=group%20pic.jpg'
-		const resolver = new AttachmentResolver({
-			session,
-			user,
-			shareToken: 'myShareToken',
-		})
-		const [candidate] = await resolver.resolve(src)
-		expect(candidate.type).toBe('image')
-		expect(candidate.url).not.toContain('myShareToken')
-	})
-
 	it('handles .attachments urls to own fileId via Text API', async () => {
 		const src = `.attachments.${session.documentId}/group%20pic.jpg`
 		const resolver = new AttachmentResolver({ session })
@@ -146,31 +115,6 @@ describe('Image resolver', () => {
 	})
 
 	describe('missing session', () => {
-
-		it('resolves text:// urls as authenticated dav', async () => {
-			const src = 'text://image?imageFileName=group%20pic.jpg'
-			const resolver = new AttachmentResolver({
-				fileId: 4173,
-				user,
-				currentDirectory,
-			})
-			const [candidate] = await resolver.resolve(src)
-			expect(candidate.type).toBe('image')
-			expect(candidate.url).toBe('http://localhost/nc-webroot/remote.php/dav/files/user-uid/parentDir/.attachments.4173/group%20pic.jpg')
-		})
-
-		it('resolves text:// urls as share token download', async () => {
-			const src = 'text://image?imageFileName=group%20pic.jpg'
-			const resolver = new AttachmentResolver({
-				fileId,
-				shareToken,
-				currentDirectory,
-			})
-			const [candidate] = await resolver.resolve(src)
-			expect(candidate.type).toBe('image')
-			expect(candidate.url).toBe('/nc-webroot/s/myShareToken/download?path=%2FparentDir%2F.attachments.4173&files=group%20pic.jpg')
-		})
-
 		it('handles .attachments urls via webdav with mimetype URL fallback', async () => {
 			const src = `.attachments.${session.documentId + 1}/group%20pic.jpg`
 			const resolver = new AttachmentResolver({ user, currentDirectory, fileId })

tests/unit/Service/AttachmentServiceTest.php

@@ -26,23 +26,6 @@ public function testDummy() {
 		$this->assertEquals('text', $app::APP_NAME);
 	}
 
-	public function testGetOldAttachmentNamesFromContent() {
-		$content = "some content\n";
-		foreach (self::$attachmentNames as $name) {
-			// this is how it's generated in MenuBar.vue
-			$linkText = preg_replace('/[[\]]/', '', $name);
-			$encodedName = urlencode($name);
-			$content .= '![' . $linkText . '](text://image?imageFileName=' . $encodedName . ")\n";
-		}
-		$content .= 'some content';
-
-		$computedNames = AttachmentService::getAttachmentNamesFromContent($content, 33);
-		foreach (self::$attachmentNames as $contentName) {
-			$this->assertContains($contentName, $computedNames);
-		}
-	}
-
-
 	public function testGetAttachmentNamesFromContent() {
 		$content = "some content\n";
 		foreach (self::$attachmentNames as $name) {