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

refactor: Use string ids on Credentials, Workflows, Tags, and Executions DB entities (#5041)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-01-02 17:42:32 +01:00
committed by GitHub
parent 8bee04cd2a
commit ee28213538
83 changed files with 468 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/cli/src/CredentialsHelper.ts
View File

@@ -279,7 +279,7 @@ export class CredentialsHelper extends ICredentialsHelper {
const credential = userId
? await Db.collections.SharedCredentials.findOneOrFail({
relations: ['credentials'],
where: { credentials: { id: nodeCredential.id, type }, user: { id: userId } },
where: { credentials: { id: nodeCredential.id, type }, userId },
}).then((shared) => shared.credentials)
: await Db.collections.Credentials.findOneOrFail({ id: nodeCredential.id, type });
@@ -290,7 +290,7 @@ export class CredentialsHelper extends ICredentialsHelper {
}
return new Credentials(
{ id: credential.id.toString(), name: credential.name },
{ id: credential.id, name: credential.name },
credential.type,
credential.nodesAccess,
credential.data,
@@ -581,7 +581,7 @@ export class CredentialsHelper extends ICredentialsHelper {
position: [0, 0],
credentials: {
[credentialType]: {
id: credentialsDecrypted.id.toString(),
id: credentialsDecrypted.id,
name: credentialsDecrypted.name,
},
},
@@ -762,8 +762,7 @@ export async function getCredentialForUser(
export async function getCredentialWithoutUser(
credentialId: string,
): Promise<ICredentialsDb | undefined> {
const credential = await Db.collections.Credentials.findOne(credentialId);
return credential;
return Db.collections.Credentials.findOne(credentialId);
}
export function createCredentialsFromCredentialsEntity(
@@ -774,5 +773,5 @@ export function createCredentialsFromCredentialsEntity(
if (encrypt) {
return new Credentials({ id: null, name }, type, nodesAccess);
}
return new Credentials({ id: id.toString(), name }, type, nodesAccess, data);
return new Credentials({ id, name }, type, nodesAccess, data);
}