From d9ed0b31b538320a67ee4e5c0cae34656c9f4334 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 23 Jun 2023 17:12:54 +0300
Subject: [PATCH] fix(Google Drive Node): URL parsing (#6527)

---
 .../nodes/Google/Drive/GoogleDrive.node.ts           | 12 ++++++------
 .../nodes/Google/Drive/GoogleDriveTrigger.node.ts    |  8 ++++----
 .../nodes/Google/Sheet/GoogleSheetsTrigger.node.ts   |  4 ++--
 .../Google/Sheet/v2/actions/sheet/Sheet.resource.ts  |  4 ++--
 .../Sheet/v2/actions/spreadsheet/delete.operation.ts |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index f51d1461a6..fe3169946b 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -238,14 +238,14 @@ export class GoogleDrive implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/(?:drive|docs)\\.google.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive File URL',
 								},
 							},
@@ -302,14 +302,14 @@ export class GoogleDrive implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive Folder URL',
 								},
 							},
@@ -1487,14 +1487,14 @@ export class GoogleDrive implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive Drive URL',
 								},
 							},
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index fd964b0a26..08299f42a2 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -113,14 +113,14 @@ export class GoogleDriveTrigger implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/(?:drive|docs)\\.google.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive File URL',
 								},
 							},
@@ -193,14 +193,14 @@ export class GoogleDriveTrigger implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive Folder URL',
 								},
 							},
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index 514c12d952..71095c94f4 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -85,14 +85,14 @@ export class GoogleSheetsTrigger implements INodeType {
 						extractValue: {
 							type: 'regex',
 							regex:
-								'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
 									regex:
-										'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+										'https:\\/\\/(?:drive|docs)\\.google.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 									errorMessage: 'Not a valid Google Drive File URL',
 								},
 							},
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
index 8dc3de896e..6e67e3a0ea 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
@@ -97,14 +97,14 @@ export const descriptions: INodeProperties[] = [
 				extractValue: {
 					type: 'regex',
 					regex:
-						'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+						'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 				},
 				validation: [
 					{
 						type: 'regex',
 						properties: {
 							regex:
-								'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/(?:drive|docs)\\.google.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 							errorMessage: 'Not a valid Google Drive File URL',
 						},
 					},
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
index 787b6412f6..d8008bd409 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
@@ -38,14 +38,14 @@ export const description: SpreadSheetProperties = [
 				extractValue: {
 					type: 'regex',
 					regex:
-						'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+						'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 				},
 				validation: [
 					{
 						type: 'regex',
 						properties: {
 							regex:
-								'https:\\/\\/(?:drive|docs)\\.google.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
+								'https:\\/\\/(?:drive|docs)\\.google.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
 							errorMessage: 'Not a valid Google Drive File URL',
 						},
 					},