mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 10:02:05 +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
@@ -9,12 +9,11 @@ import {
|
||||
} from '@/environments/sourceControl/sourceControlHelper.ee';
|
||||
import { License } from '@/License';
|
||||
import { SourceControlPreferencesService } from '@/environments/sourceControl/sourceControlPreferences.service.ee';
|
||||
import { UserSettings } from 'n8n-core';
|
||||
import { InstanceSettings } from 'n8n-core';
|
||||
import path from 'path';
|
||||
import {
|
||||
SOURCE_CONTROL_SSH_FOLDER,
|
||||
SOURCE_CONTROL_GIT_FOLDER,
|
||||
SOURCE_CONTROL_SSH_KEY_NAME,
|
||||
} from '@/environments/sourceControl/constants';
|
||||
import { LoggerProxy } from 'n8n-workflow';
|
||||
import { getLogger } from '@/Logger';
|
||||
@@ -184,10 +183,9 @@ describe('Source Control', () => {
|
||||
});
|
||||
|
||||
it('should check for git and ssh folders and create them if required', async () => {
|
||||
const userFolder = UserSettings.getUserN8nFolderPath();
|
||||
const sshFolder = path.join(userFolder, SOURCE_CONTROL_SSH_FOLDER);
|
||||
const gitFolder = path.join(userFolder, SOURCE_CONTROL_GIT_FOLDER);
|
||||
const sshKeyName = path.join(sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
|
||||
const { n8nFolder } = Container.get(InstanceSettings);
|
||||
const sshFolder = path.join(n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
|
||||
const gitFolder = path.join(n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
|
||||
let hasThrown = false;
|
||||
try {
|
||||
accessSync(sshFolder, fsConstants.F_OK);
|
||||
|
||||
Reference in New Issue
Block a user