admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 11:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Google Drive Node): URL parsing (#6527)

Browse Source
This commit is contained in:
Michael Kret
2023-06-23 17:12:54 +03:00
committed by GitHub
parent c82c7f1912
commit d9ed0b31b5
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
View File

@@ -238,14 +238,14 @@ export class GoogleDrive implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive File URL',
}, },
}, },
@@ -302,14 +302,14 @@ export class GoogleDrive implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive Folder URL',
}, },
}, },
@@ -1487,14 +1487,14 @@ export class GoogleDrive implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive Drive URL',
}, },
}, },

8
packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
View File

@@ -113,14 +113,14 @@ export class GoogleDriveTrigger implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive File URL',
}, },
}, },
@@ -193,14 +193,14 @@ export class GoogleDriveTrigger implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/drive\\.google\\.com\\/\\w+\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive Folder URL',
}, },
}, },

4
packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
View File

@@ -85,14 +85,14 @@ export class GoogleSheetsTrigger implements INodeType {
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive File URL',
}, },
}, },

4
packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
View File

@@ -97,14 +97,14 @@ export const descriptions: INodeProperties[] = [
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive File URL',
}, },
}, },

4
packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
View File

@@ -38,14 +38,14 @@ export const description: SpreadSheetProperties = [
extractValue: { extractValue: {
type: 'regex', type: 'regex',
regex: regex:
'https:\\/\\/(?:drive|docs)\\.google\\.com\\/\\w+\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)', 'https:\\/\\/(?:drive|docs)\\.google\\.com(?:\\/.*|)\\/d\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)',
}, },
validation: [ validation: [
{ {
type: 'regex', type: 'regex',
properties: { properties: {
regex: 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', errorMessage: 'Not a valid Google Drive File URL',
}, },
}, },