Append REST findUser URL parameter (#1986)

2021-01-02 20:22:33 +01:00 · 2021-01-02 20:22:33 +01:00 · 994ccfae30
commit 994ccfae30
parent de1be30176
14 changed files with 22 additions and 10 deletions
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
@ -535,13 +535,13 @@ sub attributes {
            flags         => 'p',
        },
        findUserSearchingAttributes => {
-            type       => 'keyTextContainer',
-            keyTest    => qr/^\S+$/,
+            type          => 'keyTextContainer',
+            keyTest       => qr/^\S+$/,
            documentation => 'Attributes used for searching accounts',
        },
        findUserExcludingAttributes => {
-            type       => 'keyTextContainer',
-            keyTest    => qr/^\S+$/,
+            type          => 'keyTextContainer',
+            keyTest       => qr/^\S+$/,
            documentation => 'Attributes used for excluding accounts',
        },
        globalLogoutRule => {
@ -3521,8 +3521,9 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
        radiusServer => { type => 'text', },

        # REST
-        restAuthUrl   => { type => 'url' },
-        restUserDBUrl => { type => 'url' },
+        restAuthUrl       => { type => 'url' },
+        restUserDBUrl     => { type => 'url' },
+        restFindUserDBUrl => { type => 'url' },

        restPwdConfirmUrl => { type => 'url' },
        restPwdModifyUrl  => { type => 'url' },
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
@ -392,9 +392,9 @@ sub tree {
                            help  => 'authrest.html',
                            form  => 'simpleInputContainer',
                            nodes => [
-                                'restAuthnLevel', 'restAuthUrl',
-                                'restUserDBUrl',  'restPwdConfirmUrl',
-                                'restPwdModifyUrl'
+                                'restAuthnLevel',   'restAuthUrl',
+                                'restUserDBUrl',    'restPwdConfirmUrl',
+                                'restPwdModifyUrl', 'restFindUserDBUrl'
                            ]
                        },
                        {
--- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
@ -848,6 +848,7 @@
 "restSessionServer":"خادم جلسة ريست",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"عنوان يو آر إل لبيانات المستخدم",
 "returnUrl":"إرجاع اليو آر إل",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json
@ -848,6 +848,7 @@
 "restSessionServer":"REST session server",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"User data URL",
 "returnUrl":"Return URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@ -848,6 +848,7 @@
 "restSessionServer":"REST session server",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"User data URL",
 "returnUrl":"Return URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json
@ -848,6 +848,7 @@
 "restSessionServer":"Servidor de sesión REST",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"Tolerancia del reloj del servidor REST",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"URL de datos de usuario",
 "returnUrl":"URL de retorno",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@ -848,6 +848,7 @@
 "restPwdModifyUrl":"URL de modification de mot-de-passe",
 "restSessionServer":"Serveur de sessions REST",
 "restAuthServer":"Serveur d'authentification REST",
+"restFindUserDBUrl":"URL des comptes utilisateurs",
 "restClockTolerance":"Tolérance aux écarts d'horloge",
 "restPasswordServer":"Serveur de réinitialisation de mdp REST",
 "restUserDBUrl":"URL de données utilisateurs",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
@ -848,6 +848,7 @@
 "restSessionServer":"Server di sessione REST",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"URL dei dati utente",
 "returnUrl":"URL di ritorno",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json
@ -848,6 +848,7 @@
 "restSessionServer":"Serwer sesji REST",
 "restAuthServer":"Serwer uwierzytelniania REST",
 "restClockTolerance":"Tolerancja zegara serwera REST",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"Serwer resetowania hasła REST",
 "restUserDBUrl":"Adres URL danych użytkownika",
 "returnUrl":"Zwróć adres URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json
@ -848,6 +848,7 @@
 "restSessionServer":"REST oturum sunucusu",
 "restAuthServer":"REST doğrulama sunucusu",
 "restClockTolerance":"REST sunucu saat toleransı",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST parola sıfırlama sunucusu",
 "restUserDBUrl":"Kullanıcı verisi URL'si",
 "returnUrl":"Dönüş URL'si",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
@ -848,6 +848,7 @@
 "restSessionServer":"Máy chủ phiên REST",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"URL dữ liệu người dùng",
 "returnUrl":"Trả lại URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
@ -848,6 +848,7 @@
 "restSessionServer":"REST session server",
 "restAuthServer":"REST authentication server",
 "restClockTolerance":"REST server clock tolerance",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST password reset server",
 "restUserDBUrl":"User data URL",
 "returnUrl":"Return URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
@ -848,6 +848,7 @@
 "restSessionServer":"REST 工作階段伺服器",
 "restAuthServer":"REST 驗證伺服器",
 "restClockTolerance":"REST 伺服器時鐘公差",
+"restFindUserDBUrl":"User accounts URL",
 "restPasswordServer":"REST 密碼重設伺服器",
 "restUserDBUrl":"使用者資料 URL",
 "returnUrl":"回傳 URL",
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/UserDB/REST.pm
@ -76,7 +76,7 @@ sub findUser {
    ];
    $res = eval {
        $self->restCall(
-            $self->conf->{restUserDBUrl},
+            $self->conf->{restFindUserDBUrl},
            {
                searchingAttributes => to_json($searching),
                (