mirror of
https://github.com/twentyhq/twenty.git
synced 2024-11-25 01:04:58 +03:00
feat(env-vars): Add warning validation decorator (#8555)
Introduced a custom decorator 'WarningIf' to log warnings for specific environment variable conditions. Implemented this for SESSION_STORE_SECRET to ensure users change it from the default value.
This commit is contained in:
parent
e3b327de8e
commit
83b5eb69b0
@ -0,0 +1,73 @@
|
||||
import 'reflect-metadata';
|
||||
import { IsString, validateSync } from 'class-validator';
|
||||
import { plainToClass } from 'class-transformer';
|
||||
|
||||
import { AssertOrWarn } from 'src/engine/core-modules/environment/decorators/assert-or-warn.decorator';
|
||||
|
||||
describe('AssertOrWarn Decorator', () => {
|
||||
it('should pass validation if the condition is met', () => {
|
||||
class EnvironmentVariables {
|
||||
@AssertOrWarn((object, value) => value > 10, {
|
||||
message: 'Value should be higher than 10',
|
||||
})
|
||||
someProperty!: number;
|
||||
}
|
||||
|
||||
const validatedConfig = plainToClass(EnvironmentVariables, {
|
||||
someProperty: 15,
|
||||
});
|
||||
|
||||
const warnings = validateSync(validatedConfig, { groups: ['warning'] });
|
||||
|
||||
expect(warnings.length).toBe(0);
|
||||
});
|
||||
|
||||
it('should provide a warning message if the condition is not met', () => {
|
||||
class EnvironmentVariables {
|
||||
@AssertOrWarn((object, value) => value > 10, {
|
||||
message: 'Value should be higher than 10',
|
||||
})
|
||||
someProperty!: number;
|
||||
}
|
||||
|
||||
const validatedConfig = plainToClass(EnvironmentVariables, {
|
||||
someProperty: 9,
|
||||
});
|
||||
|
||||
const warnings = validateSync(validatedConfig, { groups: ['warning'] });
|
||||
|
||||
expect(warnings.length).toBe(1);
|
||||
expect(warnings[0].constraints!.AssertOrWarn).toBe(
|
||||
'Value should be higher than 10',
|
||||
);
|
||||
});
|
||||
|
||||
it('should not impact errors if the condition is not met', () => {
|
||||
class EnvironmentVariables {
|
||||
@IsString()
|
||||
unit: string;
|
||||
|
||||
@AssertOrWarn(
|
||||
(object, value) => object.unit == 's' && value.toString().length <= 10,
|
||||
{
|
||||
message: 'The unit is in seconds but the duration in milliseconds',
|
||||
},
|
||||
)
|
||||
duration!: number;
|
||||
}
|
||||
|
||||
const validatedConfig = plainToClass(EnvironmentVariables, {
|
||||
duration: 1731944140876000,
|
||||
unit: 's',
|
||||
});
|
||||
|
||||
const warnings = validateSync(validatedConfig, { groups: ['warning'] });
|
||||
const errors = validateSync(validatedConfig, { strictGroups: true });
|
||||
|
||||
expect(errors.length).toBe(0);
|
||||
expect(warnings.length).toBe(1);
|
||||
expect(warnings[0].constraints!.AssertOrWarn).toBe(
|
||||
'The unit is in seconds but the duration in milliseconds',
|
||||
);
|
||||
});
|
||||
});
|
@ -0,0 +1,31 @@
|
||||
import {
|
||||
ValidationOptions,
|
||||
registerDecorator,
|
||||
ValidationArguments,
|
||||
} from 'class-validator';
|
||||
|
||||
export const AssertOrWarn = (
|
||||
condition: (object: any, value: any) => boolean,
|
||||
validationOptions?: ValidationOptions,
|
||||
) => {
|
||||
return function (object: any, propertyName: string) {
|
||||
registerDecorator({
|
||||
name: 'AssertOrWarn',
|
||||
target: object.constructor,
|
||||
propertyName: propertyName,
|
||||
options: {
|
||||
...validationOptions,
|
||||
groups: ['warning'],
|
||||
},
|
||||
constraints: [condition],
|
||||
validator: {
|
||||
validate(value: any, args: ValidationArguments) {
|
||||
return condition(args.object, value);
|
||||
},
|
||||
defaultMessage(args: ValidationArguments) {
|
||||
return `'${args.property}' failed the warning validation.`;
|
||||
},
|
||||
},
|
||||
});
|
||||
};
|
||||
};
|
@ -1,4 +1,4 @@
|
||||
import { LogLevel } from '@nestjs/common';
|
||||
import { LogLevel, Logger } from '@nestjs/common';
|
||||
|
||||
import { plainToClass } from 'class-transformer';
|
||||
import {
|
||||
@ -28,6 +28,7 @@ import { CastToBoolean } from 'src/engine/core-modules/environment/decorators/ca
|
||||
import { CastToLogLevelArray } from 'src/engine/core-modules/environment/decorators/cast-to-log-level-array.decorator';
|
||||
import { CastToPositiveNumber } from 'src/engine/core-modules/environment/decorators/cast-to-positive-number.decorator';
|
||||
import { CastToStringArray } from 'src/engine/core-modules/environment/decorators/cast-to-string-array.decorator';
|
||||
import { AssertOrWarn } from 'src/engine/core-modules/environment/decorators/assert-or-warn.decorator';
|
||||
import { IsAWSRegion } from 'src/engine/core-modules/environment/decorators/is-aws-region.decorator';
|
||||
import { IsDuration } from 'src/engine/core-modules/environment/decorators/is-duration.decorator';
|
||||
import { IsStrictlyLowerThan } from 'src/engine/core-modules/environment/decorators/is-strictly-lower-than.decorator';
|
||||
@ -449,6 +450,16 @@ export class EnvironmentVariables {
|
||||
|
||||
@IsString()
|
||||
@IsOptional()
|
||||
@AssertOrWarn(
|
||||
(env, value) =>
|
||||
!env.AUTH_SSO_ENABLED ||
|
||||
(env.AUTH_SSO_ENABLED &&
|
||||
value !== 'replace_me_with_a_random_string_session'),
|
||||
{
|
||||
message:
|
||||
'SESSION_STORE_SECRET should be changed to a secure, random string.',
|
||||
},
|
||||
)
|
||||
SESSION_STORE_SECRET = 'replace_me_with_a_random_string_session';
|
||||
|
||||
@CastToBoolean()
|
||||
@ -471,7 +482,19 @@ export const validate = (
|
||||
): EnvironmentVariables => {
|
||||
const validatedConfig = plainToClass(EnvironmentVariables, config);
|
||||
|
||||
const errors = validateSync(validatedConfig);
|
||||
const errors = validateSync(validatedConfig, { strictGroups: true });
|
||||
|
||||
const warnings = validateSync(validatedConfig, { groups: ['warning'] });
|
||||
|
||||
if (warnings.length > 0) {
|
||||
warnings.forEach((warning) => {
|
||||
if (warning.constraints && warning.property) {
|
||||
Object.values(warning.constraints).forEach((message) => {
|
||||
Logger.warn(message);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
assert(!errors.length, errors.toString());
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user