Consider Eventbrite URLs without event ids incorrect (#21247)

* [not verified] Consider URLs without event ids incorrect * [not verified] Consider URLs without event ids incorrect * [not verified] Don't wait for testEmbedUrl before validating eventId * Update fix-eventbrite-urls Co-authored-by: Samiff <samiff@users.noreply.github.com>
Automattic · Oct 1, 2021 · 4ebba49 · 4ebba49
1 parent d21dbac
commit 4ebba49
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/projects/plugins/jetpack/changelog/fix-eventbrite-urls b/projects/plugins/jetpack/changelog/fix-eventbrite-urls
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Eventbrite Block: consider event URLs without event IDs invalid.
diff --git a/projects/plugins/jetpack/extensions/blocks/eventbrite/edit.js b/projects/plugins/jetpack/extensions/blocks/eventbrite/edit.js
@@ -49,25 +49,31 @@ export class EventbriteEdit extends Component {
 			return;
 		}
 
-		const newAttributes = {
-			eventId: eventIdFromUrl( url ),
-			url,
-		};
-
-		testEmbedUrl( newAttributes.url, this.setIsResolvingUrl )
-			.then( resolvedUrl => {
-				const newValidatedAttributes = getValidatedAttributes( attributeDetails, {
-					...newAttributes,
-					url: resolvedUrl,
+		const eventId = eventIdFromUrl( url );
+
+		if ( ! eventId ) {
+			this.setErrorNotice();
+		} else {
+			const newAttributes = {
+				eventId,
+				url,
+			};
+
+			testEmbedUrl( newAttributes.url, this.setIsResolvingUrl )
+				.then( resolvedUrl => {
+					const newValidatedAttributes = getValidatedAttributes( attributeDetails, {
+						...newAttributes,
+						url: resolvedUrl,
+					} );
+					setAttributes( newValidatedAttributes );
+					this.setState( { editedUrl: resolvedUrl } );
+					noticeOperations.removeAllNotices();
+				} )
+				.catch( () => {
+					setAttributes( { eventId: undefined, url: undefined } );
+					this.setErrorNotice();
 				} );
-				setAttributes( newValidatedAttributes );
-				this.setState( { editedUrl: resolvedUrl } );
-				noticeOperations.removeAllNotices();
-			} )
-			.catch( () => {
-				setAttributes( { eventId: undefined, url: undefined } );
-				this.setErrorNotice();
-			} );
+		}
 	};
 
 	setIsResolvingUrl = isResolvingUrl => this.setState( { isResolvingUrl } );