From 5f6565ee277d68b3bf52b3db0707ea0e3f2e0377 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 30 Sep 2021 18:09:41 +0200 Subject: [PATCH] web/admin: fix LDAP Source form not exposing syncParentGroup Signed-off-by: Jens Langhammer --- web/src/locales/en.po | 20 ++++++++- web/src/locales/pseudo-LOCALE.po | 20 ++++++++- .../pages/providers/ldap/LDAPProviderForm.ts | 2 +- web/src/pages/sources/ldap/LDAPSourceForm.ts | 41 ++++++++++++++++++- 4 files changed, 76 insertions(+), 7 deletions(-) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 623653975..e2e0a518f 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -183,6 +183,10 @@ msgstr "Addition User DN" msgid "Additional group DN, prepended to the Base DN." msgstr "Additional group DN, prepended to the Base DN." +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Additional settings" +msgstr "Additional settings" + #: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Additional user DN, prepended to the Base DN." msgstr "Additional user DN, prepended to the Base DN." @@ -203,7 +207,6 @@ msgid "Advanced protocol settings" msgstr "Advanced protocol settings" #: src/pages/policies/password/PasswordPolicyForm.ts -#: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Advanced settings" msgstr "Advanced settings" @@ -1942,7 +1945,7 @@ msgstr "Go to previous page" #: src/pages/events/RuleForm.ts #: src/pages/policies/PolicyBindingForm.ts #: src/pages/policies/PolicyBindingForm.ts -#: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/stages/user_write/UserWriteStageForm.ts msgid "Group" msgstr "Group" @@ -2268,6 +2271,10 @@ msgstr "Kubeconfig" msgid "LDAP (Technical preview)" msgstr "LDAP (Technical preview)" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "LDAP Attribute mapping" +msgstr "LDAP Attribute mapping" + #: src/pages/providers/ldap/LDAPProviderForm.ts msgid "LDAP DN under which bind requests and search requests can be made." msgstr "LDAP DN under which bind requests and search requests can be made." @@ -2413,6 +2420,7 @@ msgstr "Loading" #: src/pages/providers/saml/SAMLProviderImportForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/plex/PlexSourceForm.ts @@ -3035,6 +3043,10 @@ msgstr "PEM-encoded Certificate data." msgid "Parent" msgstr "Parent" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Parent group for all the groups imported from LDAP." +msgstr "Parent group for all the groups imported from LDAP." + #: src/pages/policies/dummy/DummyPolicyForm.ts msgid "Pass policy?" msgstr "Pass policy?" @@ -4342,6 +4354,10 @@ msgstr "Sync" msgid "Sync groups" msgstr "Sync groups" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Sync parent group" +msgstr "Sync parent group" + #: src/pages/sources/ldap/LDAPSourceViewPage.ts msgid "Sync status" msgstr "Sync status" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index 67223e965..0a3ad1a61 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -183,6 +183,10 @@ msgstr "" msgid "Additional group DN, prepended to the Base DN." msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Additional settings" +msgstr "" + #: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Additional user DN, prepended to the Base DN." msgstr "" @@ -203,7 +207,6 @@ msgid "Advanced protocol settings" msgstr "" #: src/pages/policies/password/PasswordPolicyForm.ts -#: src/pages/sources/ldap/LDAPSourceForm.ts msgid "Advanced settings" msgstr "" @@ -1934,7 +1937,7 @@ msgstr "" #: src/pages/events/RuleForm.ts #: src/pages/policies/PolicyBindingForm.ts #: src/pages/policies/PolicyBindingForm.ts -#: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/stages/user_write/UserWriteStageForm.ts msgid "Group" msgstr "" @@ -2260,6 +2263,10 @@ msgstr "" msgid "LDAP (Technical preview)" msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "LDAP Attribute mapping" +msgstr "" + #: src/pages/providers/ldap/LDAPProviderForm.ts msgid "LDAP DN under which bind requests and search requests can be made." msgstr "" @@ -2405,6 +2412,7 @@ msgstr "" #: src/pages/providers/saml/SAMLProviderImportForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/ldap/LDAPSourceForm.ts +#: src/pages/sources/ldap/LDAPSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/oauth/OAuthSourceForm.ts #: src/pages/sources/plex/PlexSourceForm.ts @@ -3027,6 +3035,10 @@ msgstr "" msgid "Parent" msgstr "" +#: src/pages/sources/ldap/LDAPSourceForm.ts +msgid "Parent group for all the groups imported from LDAP." +msgstr "" + #: src/pages/policies/dummy/DummyPolicyForm.ts msgid "Pass policy?" msgstr "" @@ -4334,6 +4346,10 @@ msgstr "" msgid "Sync groups" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Sync parent group" +msgstr "" + #: src/pages/sources/ldap/LDAPSourceViewPage.ts msgid "Sync status" msgstr "" diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts index 1196b305f..dc3f859d8 100644 --- a/web/src/pages/providers/ldap/LDAPProviderForm.ts +++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts @@ -95,7 +95,7 @@ export class LDAPProviderFormPage extends ModelForm { ${t`Flow used for users to authenticate. Currently only identification and password stages are supported.`}

- + + + ${until( + new CoreApi(DEFAULT_CONFIG).coreGroupsList({}).then((groups) => { + return groups.results.map((group) => { + return html``; + }); + }), + html``, + )} + +

+ ${t`Parent group for all the groups imported from LDAP.`} +

+