mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-24 20:24:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🔨 improve handling of leading /

Browse source
This commit is contained in:
Ben Hesseldieck 2021-01-15 17:38:26 +01:00
parent b3bf6f04b8
commit d8f175a010
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/cli/src/ActiveWorkflowRunner.ts
View file

@ -275,7 +275,7 @@ export class ActiveWorkflowRunner {
webhook.webhookId = node.webhookId; webhook.webhookId = node.webhookId;
} }
if (webhook.webhookPath.charAt(0) === '/') { if (webhook.webhookPath.startsWith('/')) {
webhook.webhookPath = webhook.webhookPath.slice(1); webhook.webhookPath = webhook.webhookPath.slice(1);
} }
@ -302,7 +302,6 @@ export class ActiveWorkflowRunner {
// TODO check if there is standard error code for duplicate key violation that works // TODO check if there is standard error code for duplicate key violation that works
// with all databases // with all databases
if (error.name === 'MongoError' || error.name === 'QueryFailedError') { if (error.name === 'MongoError' || error.name === 'QueryFailedError') {
console.log(error);
errorMessage = error.parameters.length === 5 errorMessage = error.parameters.length === 5
? `Node [${webhook.node}] can't be saved, please duplicate [${webhook.node}] and delete the currently existing one.` ? `Node [${webhook.node}] can't be saved, please duplicate [${webhook.node}] and delete the currently existing one.`
: `The webhook path [${webhook.webhookPath}] and method [${webhook.method}] already exist.`; : `The webhook path [${webhook.webhookPath}] and method [${webhook.method}] already exist.`;

3
packages/workflow/src/NodeHelpers.ts
View file

@ -893,6 +893,9 @@ export function getNodeWebhookUrl(baseUrl: string, workflowId: string, node: INo
// setting this to false to prefix the webhookId // setting this to false to prefix the webhookId
isFullPath = false; isFullPath = false;
} }
if (path.startsWith('/')) {
path = path.slice(1);
}
return `${baseUrl}/${getNodeWebhookPath(workflowId, node, path, isFullPath)}`; return `${baseUrl}/${getNodeWebhookPath(workflowId, node, path, isFullPath)}`;
} }