@colisweb/rescript-toolkit 5.14.0 → 5.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "5.14.0",
+  "version": "5.15.1",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/form/ReSchema.res

@@ -28,8 +28,16 @@ module Make = (Lenses: Lenses) => {
     type rec t =
       | Email({field: Lenses.field<string>, error: option<string>}): t
       | Phone({field: Lenses.field<string>, error: option<string>}): t
-      | Password({field: Lenses.field<string>, error: option<string>}): t
-      | OptionalPassword({field: Lenses.field<string>, error: option<string>}): t
+      | Password({
+          field: Lenses.field<string>,
+          login?: Lenses.state => string,
+          error: option<string>,
+        }): t
+      | OptionalPassword({
+          field: Lenses.field<string>,
+          login?: Lenses.state => string,
+          error: option<string>,
+        }): t
       | NoValidation({field: Lenses.field<'a>}): t
       | StringNonEmpty({field: Lenses.field<string>, error: option<string>}): t
       | StringRegExp({field: Lenses.field<string>, matches: string, error: option<string>}): t
@@ -85,8 +93,8 @@ module Make = (Lenses: Lenses) => {
 
     let email = (~error=?, field) => [Email({field, error})]
     let phone = (~error=?, field) => [Phone({field, error})]
-    let password = (~error=?, field) => [Password({field, error})]
-    let optionalPassword = (~error=?, field) => [OptionalPassword({field, error})]
+    let password = (~error=?, ~login=?, field) => [Password({field, ?login, error})]
+    let optionalPassword = (~error=?, ~login=?, field) => [OptionalPassword({field, ?login, error})]
 
     let nonEmpty = (~error=?, field) => [StringNonEmpty({field, error})]
 
@@ -220,28 +228,38 @@ module Make = (Lenses: Lenses) => {
           }
         },
       )
-    | Validation.Password({field, error}) => {
-        let value = Lenses.get(values, field)
+    | Validation.Password(fields) => {
+        let value = Lenses.get(values, fields.field)
 
         (
-          Field(field),
-          switch value {
-          | "" => Error(i18n.stringNonEmpty(~value=""))
-          | password if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), password) =>
-            Error(error->Option.getWithDefault(i18n.passwordTooShort))
+          Field(fields.field),
+          switch (value, fields.login->Option.map(fn => fn(values))) {
+          | ("", _) => Error(i18n.stringNonEmpty(~value=""))
+          | (password, _)
+            if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), password) =>
+            Error(fields.error->Option.getWithDefault(i18n.passwordTooShort))
+          | (p, Some(login))
+            if p->Js.String2.toLowerCase->Js.String2.includes(login->Js.String2.toLowerCase) =>
+            Error(i18n.passwordCantContainLogin)
+
           | _ => Valid
           },
         )
       }
-    | Validation.OptionalPassword({field, error}) => {
-        let value = Lenses.get(values, field)
+    | Validation.OptionalPassword(fields) => {
+        let value = Lenses.get(values, fields.field)
 
         (
-          Field(field),
-          switch value {
-          | "" => Valid
-          | password if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), password) =>
-            Error(error->Option.getWithDefault(i18n.passwordTooShort))
+          Field(fields.field),
+          switch (value, fields.login->Option.map(fn => fn(values))) {
+          | ("", _) => Error(i18n.stringNonEmpty(~value=""))
+          | (password, _)
+            if !Js.Re.test_(%re("/(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}/"), password) =>
+            Error(fields.error->Option.getWithDefault(i18n.passwordTooShort))
+          | (p, Some(login))
+            if p->Js.String2.toLowerCase->Js.String2.includes(login->Js.String2.toLowerCase) =>
+            Error(i18n.passwordCantContainLogin)
+
           | _ => Valid
           },
         )

package/src/form/ReSchemaI18n.res

@@ -12,6 +12,7 @@ type t = {
   stringMax: (~value: string, ~max: int) => string,
   phone: string,
   passwordTooShort: string,
+  passwordCantContainLogin: string,
 }
 
 let default = {
@@ -35,4 +36,5 @@ let default = {
     `Le champ doit avoir au maximum ${max->Int.toString} caractères.`,
   phone: "Format du numéro invalide. Ex : +33612345678",
   passwordTooShort: "Le mot de passe doit contenir au moins 10 caractères, avoir au moins 1 minuscule, 1 majuscule et un chiffre.",
+  passwordCantContainLogin: "Le mot de passe ne peut pas contenir l'identifiant.",
 }