diff --git a/backend/src/config/schema.ts b/backend/src/config/schema.ts index 768691800..b5d44c23f 100644 --- a/backend/src/config/schema.ts +++ b/backend/src/config/schema.ts @@ -328,22 +328,14 @@ export const schema = Joi.object({ OPENAI_API_KEY: Joi.string() .pattern(/^sk-[A-Za-z0-9-_]{20,}$/) - .when(Joi.ref('OPENAI_ACTIVE', { adjust: (v) => Boolean(v) }), { - is: true, - then: Joi.required(), - otherwise: Joi.optional(), - }) + .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(Joi.ref('OPENAI_ACTIVE', { adjust: (v) => Boolean(v) }), { - is: true, - then: Joi.required(), - otherwise: Joi.optional(), - }) + .when('OPENAI_ACTIVE', { is: true, then: Joi.required(), otherwise: Joi.optional() }) .description('Assistant ID for OpenAI'), USE_CRYPTO_WORKER: Joi.boolean() diff --git a/config/src/commonSchema.ts b/config/src/commonSchema.ts index 9a0a8598c..b3221491c 100644 --- a/config/src/commonSchema.ts +++ b/config/src/commonSchema.ts @@ -153,6 +153,7 @@ export const LOGIN_SERVER_KEY = Joi.string() export const OPENAI_ACTIVE = Joi.boolean() .default(false) .description('Flag to enable or disable OpenAI API') + .required() export const TYPEORM_LOGGING_RELATIVE_PATH = Joi.string() .pattern(new RegExp('^[a-zA-Z0-9-_\./]+\.log$'))