@@ -3,7 +3,7 @@ import CodeInjector from './modules/codeInjector.js';
33import ExpressServer from './servers/express.js' ;
44import OpenApiRegistry from './servers/openapi.js' ;
55// import FastifyServer from './servers/fastify.js';
6- import { ADMINFORTH_VERSION , listify , suggestIfTypo , RateLimiter , RAMLock , getClientIp , isProbablyUUIDColumn , convertPeriodToSeconds , hookResponseError , md5hash } from './modules/utils.js' ;
6+ import { ADMINFORTH_VERSION , listify , suggestIfTypo , RateLimiter , RAMLock , getClientIp , isProbablyUUIDColumn , convertPeriodToSeconds , hookResponseError , md5hash , applyRegexValidation } from './modules/utils.js' ;
77import {
88 type AdminForthConfig ,
99 type IAdminForth ,
@@ -69,33 +69,7 @@ class AdminForth implements IAdminForth {
6969 } ,
7070
7171 applyRegexValidation ( value , validation ) {
72- if ( validation ?. length ) {
73- const validationArray = validation ;
74- for ( let i = 0 ; i < validationArray . length ; i ++ ) {
75- if ( validationArray [ i ] . regExp ) {
76- let flags = '' ;
77- if ( validationArray [ i ] . caseSensitive ) {
78- flags += 'i' ;
79- }
80- if ( validationArray [ i ] . multiline ) {
81- flags += 'm' ;
82- }
83- if ( validationArray [ i ] . global ) {
84- flags += 'g' ;
85- }
86-
87- const regExp = new RegExp ( validationArray [ i ] . regExp , flags ) ;
88- if ( value === undefined || value === null ) {
89- value = '' ;
90- }
91- let valueS = `${ value } ` ;
92-
93- if ( ! regExp . test ( valueS ) ) {
94- return validationArray [ i ] . message ;
95- }
96- }
97- }
98- }
72+ return applyRegexValidation ( value , validation ) ;
9973 } ,
10074
10175 PASSWORD_VALIDATORS : {
0 commit comments