mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 18:12:04 +00:00
refactor(core): Abstract away InstanceSettings and encryptionKey into injectable services (no-changelog) (#7471)
This change ensures that things like `encryptionKey` and `instanceId` are always available directly where they are needed, instead of passing them around throughout the code.
This commit is contained in:
committed by
GitHub
parent
519680c2cf
commit
b6de910cbe
@@ -108,17 +108,13 @@ export abstract class ICredentials {
|
||||
this.data = data;
|
||||
}
|
||||
|
||||
abstract getData(encryptionKey: string, nodeType?: string): ICredentialDataDecryptedObject;
|
||||
|
||||
abstract getDataKey(key: string, encryptionKey: string, nodeType?: string): CredentialInformation;
|
||||
abstract getData(nodeType?: string): ICredentialDataDecryptedObject;
|
||||
|
||||
abstract getDataToSave(): ICredentialsEncrypted;
|
||||
|
||||
abstract hasNodeAccess(nodeType: string): boolean;
|
||||
|
||||
abstract setData(data: ICredentialDataDecryptedObject, encryptionKey: string): void;
|
||||
|
||||
abstract setDataKey(key: string, data: CredentialInformation, encryptionKey: string): void;
|
||||
abstract setData(data: ICredentialDataDecryptedObject): void;
|
||||
}
|
||||
|
||||
export interface IUser {
|
||||
@@ -192,8 +188,6 @@ export interface IHttpRequestHelper {
|
||||
helpers: { httpRequest: IAllExecuteFunctions['helpers']['httpRequest'] };
|
||||
}
|
||||
export abstract class ICredentialsHelper {
|
||||
constructor(readonly encryptionKey: string) {}
|
||||
|
||||
abstract getParentTypes(name: string): string[];
|
||||
|
||||
abstract authenticate(
|
||||
@@ -740,7 +734,7 @@ export interface FunctionsBase {
|
||||
getTimezone(): string;
|
||||
getRestApiUrl(): string;
|
||||
getInstanceBaseUrl(): string;
|
||||
getInstanceId(): Promise<string>;
|
||||
getInstanceId(): string;
|
||||
|
||||
getMode?: () => WorkflowExecuteMode;
|
||||
getActivationMode?: () => WorkflowActivateMode;
|
||||
@@ -1847,7 +1841,6 @@ export interface IWorkflowExecuteHooks {
|
||||
|
||||
export interface IWorkflowExecuteAdditionalData {
|
||||
credentialsHelper: ICredentialsHelper;
|
||||
encryptionKey: string;
|
||||
executeWorkflow: (
|
||||
workflowInfo: IExecuteWorkflowInfo,
|
||||
additionalData: IWorkflowExecuteAdditionalData,
|
||||
@@ -1860,7 +1853,6 @@ export interface IWorkflowExecuteAdditionalData {
|
||||
parentWorkflowSettings?: IWorkflowSettings;
|
||||
},
|
||||
) => Promise<any>;
|
||||
// hooks?: IWorkflowExecuteHooks;
|
||||
executionId?: string;
|
||||
restartExecutionId?: string;
|
||||
hooks?: WorkflowHooks;
|
||||
|
||||
Reference in New Issue
Block a user