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

fix: Issue with credentials and workflows not being matched correctly due to incorrect typing (#5011)

Browse source 
* fix: Always return ids as strings
This commit is contained in:
Omar Ajoue 2022-12-22 16:09:06 +01:00 committed by GitHub
parent 67da2d0c72
commit 746e8487d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/cli/src/credentials/credentials.controller.ee.ts
View file

@ -35,7 +35,13 @@ EECredentialsController.get(
});
// eslint-disable-next-line @typescript-eslint/unbound-method
return allCredentials.map(EECredentials.addOwnerAndSharings);
return allCredentials
.map((credential: CredentialsEntity & CredentialWithSharings) =>
EECredentials.addOwnerAndSharings(credential),
)
.map(
(credential): CredentialWithSharings => ({ ...credential, id: credential.id.toString() }),
);
} catch (error) {
LoggerProxy.error('Request to list credentials failed', error as Error);
throw error;

4
packages/cli/src/credentials/credentials.controller.ts
View file

@ -3,12 +3,9 @@
import express from 'express';
import {
deepCopy,
ICredentialType,
INodeCredentialTestResult,
LoggerProxy,
NodeHelpers,
} from 'n8n-workflow';
import { Credentials } from 'n8n-core';
import * as GenericHelpers from '@/GenericHelpers';
import { InternalHooksManager } from '@/InternalHooksManager';
@ -17,7 +14,6 @@ import config from '@/config';
import { getLogger } from '@/Logger';
import { EECredentialsController } from './credentials.controller.ee';
import { CredentialsService } from './credentials.service';
import { CredentialTypes } from '@/CredentialTypes';
import type { ICredentialsResponse } from '@/Interfaces';
import type { CredentialRequest } from '@/requests';

4
packages/cli/src/workflows/workflows.controller.ee.ts
View file

@ -108,7 +108,7 @@ EEWorkflowController.get(
EEWorkflows.addOwnerAndSharings(workflow);
await EEWorkflows.addCredentialsToWorkflow(workflow, req.user);
return workflow;
return { ...workflow, id: workflow.id.toString() };
}),
);
@ -214,7 +214,7 @@ EEWorkflowController.get(
EEWorkflows.addOwnerAndSharings(workflow);
await EEWorkflows.addCredentialsToWorkflow(workflow, req.user);
workflow.nodes = [];
return workflow;
return { ...workflow, id: workflow.id.toString() };
}),
);
}),