Merge branch '6233-supann-franceconnect-object-class-to-be-changed' into '1.4-dev'

Resolve "[Supann] - FranceConnect object class to be changed."

Closes #6233

See merge request fusiondirectory/fd-plugins!996

supann/contrib/openldap/fdFranceConnect.schema

-attributetype ( 1.3.6.1.4.1.38414.88.1.1 NAME 'fdSupannNomDeNaissance'
-	DESC 'nom de famille de naissance'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.2 NAME 'fdSupannPrenomsEtatCivil'
-	DESC 'prenoms d etat civil'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.3 NAME 'fdSupannOIDCDateDeNaissance'
-	DESC 'date de naissance au format AAAA-MM-JJ'
-	EQUALITY caseExactMatch
-	SUBSTR caseExactSubstringsMatch
-	ORDERING caseExactOrderingMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{10} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.4 NAME 'fdSupannOIDCGenre'
-	DESC 'genre : "female", "male" ou "other"'
-	EQUALITY caseIgnoreMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.44{32} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.5 NAME 'fdSupannCodeINSEEPaysDeNaissance'
-	DESC 'code INSEE du pays de naissance'
-	EQUALITY numericStringMatch
-	ORDERING numericStringOrderingMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.6 NAME 'fdSupannCodeINSEEVilleDeNaissance'
-	DESC 'code INSEE de la commune de naissance'
-	EQUALITY numericStringMatch
-	ORDERING numericStringOrderingMatch
-	SINGLE-VALUE
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{5} )
-
-attributetype ( 1.3.6.1.4.1.38414.88.1.7 NAME 'fdSupannFCSub'
-	DESC 'identifiant cible de personne FranceConnect'
-	EQUALITY caseExactIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )
-
 objectclass ( 1.3.6.1.4.1.38414.88.2.1 NAME 'fdFranceConnect' SUP top AUXILIARY
 	DESC 'Identité de personne FranceConnect'
-	MAY ( fdSupannNomDeNaissance $ fdSupannPrenomsEtatCivil $ fdSupannOIDCDateDeNaissance $
-	fdSupannOIDCGenre $ fdSupannCodeINSEEPaysDeNaissance $ fdSupannFCSub $ fdSupannCodeINSEEVilleDeNaissance ))
+	MAY ( supannNomDeNaissance $ supannPrenomsEtatCivil $ supannOIDCDateDeNaissance $
+	supannOIDCGenre $ supannCodeINSEEPaysDeNaissance $ supannFCSub $ supannCodeINSEEVilleDeNaissance ))

supann/personal/supann/class_supannFC.inc

@@ -51,27 +51,27 @@ class supannFC extends simplePlugin
         'attrs' => [
           new StringAttribute(
             _('Birth name'), _('Last name from birth'),
-            'fdSupannNomDeNaissance', FALSE
+            'supannNomDeNaissance', FALSE
           ),
           new StringAttribute(
             _('First names'), _('Space separated first names'),
-            'fdSupannPrenomsEtatCivil', FALSE
+            'supannPrenomsEtatCivil', FALSE
           ),
           new DateAttribute(
             _('Date of birth'), _('Date of birth'),
-            'fdSupannOIDCDateDeNaissance', FALSE,
+            'supannOIDCDateDeNaissance', FALSE,
             'Y-m-d', '',
             // min and max:
             NULL, 'now'
           ),
           new SelectAttribute(
             _('Gender'), _('Gender'),
-            'fdSupannOIDCGenre', FALSE,
+            'supannOIDCGenre', FALSE,
             ['other', 'female', 'male'], '', [_('Other'), _('Female'), _('Male')]
           ),
           new StringAttribute(
             _('Country of birth'), _('INSEE code of country of birth'),
-            'fdSupannCodeINSEEPaysDeNaissance', FALSE,
+            'supannCodeINSEEPaysDeNaissance', FALSE,
             '',
             '',
             '/^\d{5}$/',
@@ -79,7 +79,7 @@ class supannFC extends simplePlugin
           ),
           new StringAttribute(
             _('City of birth'), _('INSEE code of city of birth, if in France'),
-            'fdSupannCodeINSEEVilleDeNaissance', FALSE,
+            'supannCodeINSEEVilleDeNaissance', FALSE,
             '',
             '',
             '/^[\dAB]{5}$/',
@@ -93,7 +93,7 @@ class supannFC extends simplePlugin
           new SetAttribute(
             new StringAttribute(
               _('Subject'), _('Subject from OpenID Connect standard in the France Connect system'),
-              'fdSupannFCSub', FALSE,
+              'supannFCSub', FALSE,
               '',
               '',
               '/^[[:ascii:]]{1,255}$/'
@@ -108,6 +108,6 @@ class supannFC extends simplePlugin
   {
     parent::__construct($dn, $object, $parent, $mainTab);
 
-    $this->attributesAccess['fdSupannFCSub']->setUnique('whole');
+    $this->attributesAccess['supannFCSub']->setUnique('whole');
   }
 }