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

refactor: Upgrade typeorm to 0.3.x (#5151)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-01-13 18:12:22 +01:00
committed by GitHub
parent 6608e69457
commit 0a5ab560b1
85 changed files with 579 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/cli/src/credentials/credentials.service.ts
View File

@@ -10,7 +10,7 @@ import {
LoggerProxy,
NodeHelpers,
} from 'n8n-workflow';
import { FindConditions, FindManyOptions, In } from 'typeorm';
import { FindManyOptions, FindOptionsWhere, In } from 'typeorm';
import * as Db from '@/Db';
import * as ResponseHelper from '@/ResponseHelper';
@@ -28,11 +28,12 @@ import { CredentialTypes } from '@/CredentialTypes';
export class CredentialsService {
static async get(
credential: Partial<ICredentialsDb>,
where: FindOptionsWhere<ICredentialsDb>,
options?: { relations: string[] },
): Promise<ICredentialsDb | undefined> {
return Db.collections.Credentials.findOne(credential, {
): Promise<ICredentialsDb | null> {
return Db.collections.Credentials.findOne({
relations: options?.relations,
where,
});
}
@@ -88,8 +89,8 @@ export class CredentialsService {
credentialId: string,
relations: string[] = ['credentials'],
{ allowGlobalOwner } = { allowGlobalOwner: true },
): Promise<SharedCredentials | undefined> {
const where: FindConditions<SharedCredentials> = { credentialsId: credentialId };
): Promise<SharedCredentials | null> {
const where: FindOptionsWhere<SharedCredentials> = { credentialsId: credentialId };
// Omit user from where if the requesting user is the global
// owner. This allows the global owner to view and delete
@@ -204,7 +205,7 @@ export class CredentialsService {
static async update(
credentialId: string,
newCredentialData: ICredentialsDb,
): Promise<ICredentialsDb | undefined> {
): Promise<ICredentialsDb | null> {
await ExternalHooks().run('credentials.update', [newCredentialData]);
// Update the credentials in DB
@@ -212,7 +213,7 @@ export class CredentialsService {
// We sadly get nothing back from "update". Neither if it updated a record
// nor the new value. So query now the updated entry.
return Db.collections.Credentials.findOne(credentialId);
return Db.collections.Credentials.findOneBy({ id: credentialId });
}
static async save(
@@ -226,7 +227,7 @@ export class CredentialsService {
await ExternalHooks().run('credentials.create', [encryptedData]);
const role = await Db.collections.Role.findOneOrFail({
const role = await Db.collections.Role.findOneByOrFail({
name: 'owner',
scope: 'credential',
});