diff --git a/backend/jest.config.js b/backend/jest.config.js index 6b9f374ae..d4dc80ff1 100644 --- a/backend/jest.config.js +++ b/backend/jest.config.js @@ -7,7 +7,7 @@ module.exports = { collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'], coverageThreshold: { global: { - lines: 79, + lines: 78, }, }, setupFiles: ['/test/testSetup.ts'], diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts index dd1d1befd..b5d44c23f 100644 --- a/backend/src/config/schema.ts +++ b/backend/src/config/schema.ts @@ -328,14 +328,14 @@ export const schema = Joi.object({ OPENAI_API_KEY: Joi.string() .pattern(/^sk-[A-Za-z0-9-_]{20,}$/) - .when('OPENAI_ACTIVE', { is: true, then: Joi.required() }) + .when('OPENAI_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() }) .description( 'API key for OpenAI, must be at least 20 characters long and contain only alphanumeric characters, dashes, or underscores', ), OPENAI_ASSISTANT_ID: Joi.string() .pattern(/^asst_[A-Za-z0-9-]{20,}$/) - .when('OPENAI_ACTIVE', { is: true, then: Joi.required() }) + .when('OPENAI_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() }) .description('Assistant ID for OpenAI'), USE_CRYPTO_WORKER: Joi.boolean() diff --git a/backend/src/password/EncryptionWorker.ts b/backend/src/password/EncryptionWorker.ts index ec39e8c3b..abf0ec1ed 100644 --- a/backend/src/password/EncryptionWorker.ts +++ b/backend/src/password/EncryptionWorker.ts @@ -1,3 +1,5 @@ +import { createHash } from 'node:crypto' + import { worker } from 'workerpool' import { CONFIG } from '@/config' @@ -14,7 +16,6 @@ import { crypto_pwhash, crypto_shorthash, } from 'sodium-native' -import { createHash } from 'node:crypto' export const SecretKeyCryptographyCreateKey = ( salt: string, diff --git a/backend/test/testSetup.ts b/backend/test/testSetup.ts index a61556798..8cf4ff084 100644 --- a/backend/test/testSetup.ts +++ b/backend/test/testSetup.ts @@ -1,3 +1,5 @@ +// eslint-disable-next-line import/no-unassigned-import +import 'openai/shims/node' import { CONFIG } from '@/config' import { i18n } from '@/server/localization' import { backendLogger as logger } from '@/server/logger'