Remove dbiUserChain, dbiUserPassword and dbiUserUser parameters

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -752,18 +752,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
         'dbiPasswordMailCol' => {
             'type' => 'text'
         },
-        'dbiUserChain' => {
-            'type' => 'text'
-        },
-        'dbiUserPassword' => {
-            'type' => 'password'
-        },
         'dbiUserTable' => {
             'type' => 'text'
         },
-        'dbiUserUser' => {
-            'type' => 'text'
-        },
         'demoExportedVars' => {
             'default' => {
                 'cn'   => 'cn',

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -1989,14 +1989,11 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
         dbiAuthChain       => { type => 'text', },
         dbiAuthUser        => { type => 'text', },
         dbiAuthPassword    => { type => 'password', },
-        dbiUserChain       => { type => 'text', },
-        dbiUserUser        => { type => 'text', },
-        dbiUserPassword    => { type => 'password', },
         dbiAuthTable       => { type => 'text', },
-        dbiUserTable       => { type => 'text', },
         dbiAuthLoginCol    => { type => 'text', },
         dbiAuthPasswordCol => { type => 'text', },
         dbiPasswordMailCol => { type => 'text', },
+        dbiUserTable       => { type => 'text', },
         userPivot          => { type => 'text', },
         dbiAuthPasswordHash =>
           { type => 'text', help => 'authdbi.html#password', },

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -152,25 +152,10 @@ sub tree {
                                 {
                                     title => 'dbiConnection',
                                     help  => 'authdbi.html#connection',
+                                    form  => 'simpleInputContainer',
                                     nodes => [
-                                        {
-                                            title => 'dbiConnectionAuth',
-                                            form  => 'simpleInputContainer',
-                                            nodes => [
-                                                'dbiAuthChain',
-                                                'dbiAuthUser',
-                                                'dbiAuthPassword'
-                                            ]
-                                        },
-                                        {
-                                            title => 'dbiConnectionUser',
-                                            form  => 'simpleInputContainer',
-                                            nodes => [
-                                                'dbiUserChain',
-                                                'dbiUserUser',
-                                                'dbiUserPassword'
-                                            ]
-                                        }
+                                        'dbiAuthChain', 'dbiAuthUser',
+                                        'dbiAuthPassword'
                                     ]
                                 },
                                 {

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Constants.pm

@@ -35,7 +35,7 @@ our $authParameters = {
   browseridParams => [qw(browserIdAuthnLevel browserIdAutoLogin browserIdVerificationURL browserIdSiteName browserIdSiteLogo browserIdBackgroundColor)],
   casParams => [qw(CASAuthnLevel CASurl CASCAFile CASrenew CASgateway CASpgtFile CASproxiedServices)],
   choiceParams => [qw(authChoiceParam authChoiceModules)],
-  dbiParams => [qw(dbiAuthnLevel dbiExportedVars dbiAuthChain dbiAuthUser dbiAuthPassword dbiUserChain dbiUserUser dbiUserPassword dbiAuthTable dbiUserTable dbiAuthLoginCol dbiAuthPasswordCol dbiPasswordMailCol userPivot dbiAuthPasswordHash)],
+  dbiParams => [qw(dbiAuthnLevel dbiExportedVars dbiAuthChain dbiAuthUser dbiAuthPassword dbiAuthTable dbiUserTable dbiAuthLoginCol dbiAuthPasswordCol dbiPasswordMailCol userPivot dbiAuthPasswordHash)],
   demoParams => [qw(demoExportedVars)],
   facebookParams => [qw(facebookAuthnLevel facebookExportedVars facebookAppId facebookAppSecret)],
   googleParams => [qw(googleAuthnLevel googleExportedVars)],

lemonldap-ng-manager/site/static/languages/en.json

@@ -142,17 +142,12 @@
 "dbiAuthTable": "Authentication table",
 "dbiAuthUser": "User",
 "dbiConnection": "Connection",
-"dbiConnectionAuth": "Authentication process",
-"dbiConnectionUser": "User process",
 "dbiExportedVars": "Exported variables",
 "dbiParams": "DBI parameters",
 "dbiPassword": "Password",
 "dbiPasswordMailCol": "Mail field name",
 "dbiSchema": "Schema",
-"dbiUserChain": "Chain",
-"dbiUserPassword": "Password",
 "dbiUserTable": "User table",
-"dbiUserUser": "User",
 "default": "Default",
 "defaultRule": "Default rule",
 "demoModeOn": "This manager runs in demo mode",

lemonldap-ng-manager/site/static/languages/fr.json

@@ -142,17 +142,12 @@
 "dbiAuthTable": "Table authentification",
 "dbiAuthUser": "Utilisateur",
 "dbiConnection": "Connexion",
-"dbiConnectionAuth": "Authentification",
-"dbiConnectionUser": "Utilisateurs",
 "dbiExportedVars": "Variables exportées",
 "dbiParams": "Paramètres DBI",
 "dbiPassword": "Mot de passe",
 "dbiPasswordMailCol": "Champ mail",
 "dbiSchema": "Schéma",
-"dbiUserChain": "Chaîne",
-"dbiUserPassword": "Mot de passe",
 "dbiUserTable": "Table des utilisateurs",
-"dbiUserUser": "Utilisateur",
 "default": "Défaut",
 "defaultRule": "Règle par défaut",
 "demoModeOn": "Ce manager fonctionne en mode Demo",