From 3682b1df1ce80ad4806ae82e9a1a7fe229e08395 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 13 Oct 2023 09:54:04 +0800 Subject: [PATCH] Add `LDAP over SSL` setting. --- .../Volo/Abp/Ldap/LdapSettingNames.cs | 2 ++ .../Volo/Abp/Ldap/Localization/ar.json | 2 ++ .../Volo/Abp/Ldap/Localization/cs.json | 2 ++ .../Volo/Abp/Ldap/Localization/de-DE.json | 2 ++ .../Volo/Abp/Ldap/Localization/el.json | 2 ++ .../Volo/Abp/Ldap/Localization/en-GB.json | 2 ++ .../Volo/Abp/Ldap/Localization/en.json | 2 ++ .../Volo/Abp/Ldap/Localization/es.json | 2 ++ .../Volo/Abp/Ldap/Localization/fa.json | 2 ++ .../Volo/Abp/Ldap/Localization/fi.json | 2 ++ .../Volo/Abp/Ldap/Localization/fr.json | 26 ++++++++++--------- .../Volo/Abp/Ldap/Localization/hi.json | 2 ++ .../Volo/Abp/Ldap/Localization/hu.json | 2 ++ .../Volo/Abp/Ldap/Localization/is.json | 2 ++ .../Volo/Abp/Ldap/Localization/it.json | 2 ++ .../Volo/Abp/Ldap/Localization/nl.json | 2 ++ .../Volo/Abp/Ldap/Localization/pl-PL.json | 2 ++ .../Volo/Abp/Ldap/Localization/pt-BR.json | 2 ++ .../Volo/Abp/Ldap/Localization/ro-RO.json | 2 ++ .../Volo/Abp/Ldap/Localization/ru.json | 2 ++ .../Volo/Abp/Ldap/Localization/sk.json | 2 ++ .../Volo/Abp/Ldap/Localization/sl.json | 2 ++ .../Volo/Abp/Ldap/Localization/tr.json | 2 ++ .../Volo/Abp/Ldap/Localization/vi.json | 2 ++ .../Volo/Abp/Ldap/Localization/zh-Hans.json | 2 ++ .../Volo/Abp/Ldap/Localization/zh-Hant.json | 2 ++ .../Abp/Ldap/LdapSettingDefinitionProvider.cs | 6 +++++ .../Volo/Abp/Ldap/LdapSettingProvider.cs | 17 +++++++----- 28 files changed, 81 insertions(+), 18 deletions(-) diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/LdapSettingNames.cs b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/LdapSettingNames.cs index f728f684af..063eb142a0 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/LdapSettingNames.cs +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/LdapSettingNames.cs @@ -2,6 +2,8 @@ public static class LdapSettingNames { + public const string Ldaps = "Abp.Ldap.Ldaps"; + public const string ServerHost = "Abp.Ldap.ServerHost"; public const string ServerPort = "Abp.Ldap.ServerPort"; diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ar.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ar.json index 8529f4b79c..1cbd1688ad 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ar.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ar.json @@ -1,6 +1,8 @@ { "culture": "ar", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP عبر SSL", + "Description:Abp.Ldap.Ldaps": "LDAP عبر SSL", "DisplayName:Abp.Ldap.ServerHost": "اسم الخادم", "Description:Abp.Ldap.ServerHost": "اسم الخادم", "DisplayName:Abp.Ldap.ServerPort": "منفذ الخادم", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/cs.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/cs.json index f85b141531..bb52e1b55e 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/cs.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/cs.json @@ -1,6 +1,8 @@ { "culture": "cs", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP přes SSL", + "Description:Abp.Ldap.Ldaps": "LDAP přes SSL", "DisplayName:Abp.Ldap.ServerHost": "Hostitel serveru", "Description:Abp.Ldap.ServerHost": "Hostitel serveru", "DisplayName:Abp.Ldap.ServerPort": "Port serveru", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/de-DE.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/de-DE.json index 6af048c3e1..f16fc4ab04 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/de-DE.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/de-DE.json @@ -1,6 +1,8 @@ { "culture": "de-DE", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP über SSL", + "Description:Abp.Ldap.Ldaps": "LDAP über SSL", "DisplayName:Abp.Ldap.ServerHost": "Server-Host", "Description:Abp.Ldap.ServerHost": "Server-Host", "DisplayName:Abp.Ldap.ServerPort": "Server-Port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/el.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/el.json index d0389c90f0..caf9fee2a2 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/el.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/el.json @@ -1,6 +1,8 @@ { "culture": "el", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP μέσω SSL", + "Description:Abp.Ldap.Ldaps": "LDAP μέσω SSL", "DisplayName:Abp.Ldap.ServerHost": "Κεντρικός διακομιστής", "Description:Abp.Ldap.ServerHost": "Κεντρικός διακομιστής", "DisplayName:Abp.Ldap.ServerPort": "Θύρα", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en-GB.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en-GB.json index 90cc348196..f8b1ff77c9 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en-GB.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en-GB.json @@ -1,6 +1,8 @@ { "culture": "en-GB", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP over SSL", + "Description:Abp.Ldap.Ldaps": "LDAP over SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Server port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en.json index bdab4cc00b..14a5b85fe2 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/en.json @@ -1,6 +1,8 @@ { "culture": "en", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP over SSL", + "Description:Abp.Ldap.Ldaps": "LDAP over SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Server port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/es.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/es.json index 6579a43cbd..3a1298a1bd 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/es.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/es.json @@ -1,6 +1,8 @@ { "culture": "es", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP sobre SSL", + "Description:Abp.Ldap.Ldaps": "LDAP sobre SSL", "DisplayName:Abp.Ldap.ServerHost": "Host del servidor", "Description:Abp.Ldap.ServerHost": "Host del servidor", "DisplayName:Abp.Ldap.ServerPort": "Puerto del servidor", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fa.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fa.json index 3e536b1e1f..cfa6eac79b 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fa.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fa.json @@ -1,6 +1,8 @@ { "culture": "fa", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP از طریق SSL", + "Description:Abp.Ldap.Ldaps": "LDAP از طریق SSL", "DisplayName:Abp.Ldap.ServerHost": "میزبان سرور", "Description:Abp.Ldap.ServerHost": "میزبان سرور", "DisplayName:Abp.Ldap.ServerPort": "پورت سرور", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fi.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fi.json index 83a2cacd03..6ed3e740be 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fi.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fi.json @@ -1,6 +1,8 @@ { "culture": "fi", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP SSL:n kautta", + "Description:Abp.Ldap.Ldaps": "LDAP SSL:n kautta", "DisplayName:Abp.Ldap.ServerHost": "Palvelimen isäntä", "Description:Abp.Ldap.ServerHost": "Palvelimen isäntä", "DisplayName:Abp.Ldap.ServerPort": "Palvelimen portti", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fr.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fr.json index e23b0fc1be..8f0967b0d1 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fr.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/fr.json @@ -1,17 +1,19 @@ { "culture": "fr", "texts": { - "DisplayName:Abp.Ldap.ServerHost": "Hôte du serveur", - "Description:Abp.Ldap.ServerHost": "Hôte du serveur", - "DisplayName:Abp.Ldap.ServerPort": "Port de serveur", - "Description:Abp.Ldap.ServerPort": "Port de serveur", - "DisplayName:Abp.Ldap.BaseDc": "Composant de domaine de base", - "Description:Abp.Ldap.BaseDc": "Composant de domaine de base", - "DisplayName:Abp.Ldap.Domain": "Domaine", - "Description:Abp.Ldap.Domain": "Domaine", - "DisplayName:Abp.Ldap.UserName": "Nom d'utilisateur", - "Description:Abp.Ldap.UserName": "Nom d'utilisateur", - "DisplayName:Abp.Ldap.Password": "Mot de passe", - "Description:Abp.Ldap.Password": "Mot de passe" + "DisplayName:Abp.Ldap.Ldaps": "LDAP sur SSL", + "Description:Abp.Ldap.Ldaps": "LDAP sur SSL", + "DisplayName:Abp.Ldap.ServerHost": "Hôte du serveur", + "Description:Abp.Ldap.ServerHost": "Hôte du serveur", + "DisplayName:Abp.Ldap.ServerPort": "Port de serveur", + "Description:Abp.Ldap.ServerPort": "Port de serveur", + "DisplayName:Abp.Ldap.BaseDc": "Composant de domaine de base", + "Description:Abp.Ldap.BaseDc": "Composant de domaine de base", + "DisplayName:Abp.Ldap.Domain": "Domaine", + "Description:Abp.Ldap.Domain": "Domaine", + "DisplayName:Abp.Ldap.UserName": "Nom d'utilisateur", + "Description:Abp.Ldap.UserName": "Nom d'utilisateur", + "DisplayName:Abp.Ldap.Password": "Mot de passe", + "Description:Abp.Ldap.Password": "Mot de passe" } } diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hi.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hi.json index f46516a6f2..b4d7b08b2b 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hi.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hi.json @@ -1,6 +1,8 @@ { "culture": "hi", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "एसएसएल पर एलडीएपी", + "Description:Abp.Ldap.Ldaps": "एसएसएल पर एलडीएपी", "DisplayName:Abp.Ldap.ServerHost": "सर्वर होस्ट", "Description:Abp.Ldap.ServerHost": "सर्वर होस्ट", "DisplayName:Abp.Ldap.ServerPort": "सर्वर पोर्ट", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hu.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hu.json index 67d6783a0b..f8f5c74692 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hu.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/hu.json @@ -1,6 +1,8 @@ { "culture": "hu", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP SSL-n keresztül", + "Description:Abp.Ldap.Ldaps": "LDAP SSL-n keresztül", "DisplayName:Abp.Ldap.ServerHost": "Szerver host", "Description:Abp.Ldap.ServerHost": "Az LDAP ksizolgáló szerver hostneve vagy IP címe", "DisplayName:Abp.Ldap.ServerPort": "Szerver port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/is.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/is.json index ffca0ac122..6c2a361f46 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/is.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/is.json @@ -1,6 +1,8 @@ { "culture": "is", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP yfir SSL", + "Description:Abp.Ldap.Ldaps": "LDAP yfir SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Server port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/it.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/it.json index 0f5b2776df..8d6004503a 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/it.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/it.json @@ -1,6 +1,8 @@ { "culture": "it", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP su SSL", + "Description:Abp.Ldap.Ldaps": "LDAP su SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Porta del server", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/nl.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/nl.json index 893a3ca77f..e6c96ceb67 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/nl.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/nl.json @@ -1,6 +1,8 @@ { "culture": "nl", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP via SSL", + "Description:Abp.Ldap.Ldaps": "LDAP via SSL", "DisplayName:Abp.Ldap.ServerHost": "Serverhost", "Description:Abp.Ldap.ServerHost": "Serverhost", "DisplayName:Abp.Ldap.ServerPort": "Server poort", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pl-PL.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pl-PL.json index 4cb41b07e6..97ec1f2b5c 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pl-PL.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pl-PL.json @@ -1,6 +1,8 @@ { "culture": "pl-PL", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP przez SSL", + "Description:Abp.Ldap.Ldaps": "LDAP przez SSL", "DisplayName:Abp.Ldap.ServerHost": "Host serwera", "Description:Abp.Ldap.ServerHost": "Host serwera", "DisplayName:Abp.Ldap.ServerPort": "Port serwera", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pt-BR.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pt-BR.json index 8cb19b17d2..64078ac8d2 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pt-BR.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/pt-BR.json @@ -1,6 +1,8 @@ { "culture": "pt-BR", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP sobre SSL", + "Description:Abp.Ldap.Ldaps": "LDAP sobre SSL", "DisplayName:Abp.Ldap.ServerHost": "Host do servidor", "Description:Abp.Ldap.ServerHost": "Host do servidor", "DisplayName:Abp.Ldap.ServerPort": "Porta do servidor", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ro-RO.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ro-RO.json index 8119a5b924..c13ba8035a 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ro-RO.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ro-RO.json @@ -1,6 +1,8 @@ { "culture": "ro-RO", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP peste SSL", + "Description:Abp.Ldap.Ldaps": "LDAP peste SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Server port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ru.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ru.json index fe5feb438c..749326aa81 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ru.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/ru.json @@ -1,6 +1,8 @@ { "culture": "ru", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP через SSL", + "Description:Abp.Ldap.Ldaps": "LDAP через SSL", "DisplayName:Abp.Ldap.ServerHost": "Хост сервера", "Description:Abp.Ldap.ServerHost": "Хост сервера", "DisplayName:Abp.Ldap.ServerPort": "Порт сервера", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sk.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sk.json index d0cc258df1..f37652585a 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sk.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sk.json @@ -1,6 +1,8 @@ { "culture": "sk", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP cez SSL", + "Description:Abp.Ldap.Ldaps": "LDAP cez SSL", "DisplayName:Abp.Ldap.ServerHost": "Server host", "Description:Abp.Ldap.ServerHost": "Server host", "DisplayName:Abp.Ldap.ServerPort": "Server port", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sl.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sl.json index b57f7a7474..5b8ea54dfc 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sl.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/sl.json @@ -1,6 +1,8 @@ { "culture": "sl", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP preko SSL", + "Description:Abp.Ldap.Ldaps": "LDAP preko SSL", "DisplayName:Abp.Ldap.ServerHost": "Gostitelj strežnika", "Description:Abp.Ldap.ServerHost": "Gostitelj strežnika", "DisplayName:Abp.Ldap.ServerPort": "Vrata strežnika", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/tr.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/tr.json index 551b6047ad..4d9b20598c 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/tr.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/tr.json @@ -1,6 +1,8 @@ { "culture": "tr", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "SSL üzerinden LDAP", + "Description:Abp.Ldap.Ldaps": "SSL üzerinden LDAP", "DisplayName:Abp.Ldap.ServerHost": "Sunucu Ana Bilgisayarı", "Description:Abp.Ldap.ServerHost": "Sunucu Ana Bilgisayarı", "DisplayName:Abp.Ldap.ServerPort": "Sunucu portu", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/vi.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/vi.json index b2b103c248..13b10277d8 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/vi.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/vi.json @@ -1,6 +1,8 @@ { "culture": "vi", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "LDAP qua SSL", + "Description:Abp.Ldap.Ldaps": "LDAP qua SSL", "DisplayName:Abp.Ldap.ServerHost": "Máy chủ lưu trữ", "Description:Abp.Ldap.ServerHost": "Máy chủ lưu trữ", "DisplayName:Abp.Ldap.ServerPort": "Cổng máy chủ", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hans.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hans.json index dfc4fa6cea..09b7283b83 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hans.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hans.json @@ -1,6 +1,8 @@ { "culture": "zh-Hans", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "基于SSL的LDAP", + "Description:Abp.Ldap.Ldaps": "基于SSL的LDAP", "DisplayName:Abp.Ldap.ServerHost": "服务器主机", "Description:Abp.Ldap.ServerHost": "服务器主机", "DisplayName:Abp.Ldap.ServerPort": "服务器端口", diff --git a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hant.json b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hant.json index c499e7a60b..66e42d5695 100644 --- a/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hant.json +++ b/framework/src/Volo.Abp.Ldap.Abstractions/Volo/Abp/Ldap/Localization/zh-Hant.json @@ -1,6 +1,8 @@ { "culture": "zh-Hant", "texts": { + "DisplayName:Abp.Ldap.Ldaps": "基於SSL的LDAP", + "Description:Abp.Ldap.Ldaps": "基於SSL的LDAP", "DisplayName:Abp.Ldap.ServerHost": "服務器主機", "Description:Abp.Ldap.ServerHost": "服務器主機", "DisplayName:Abp.Ldap.ServerPort": "服務器端口", diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingDefinitionProvider.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingDefinitionProvider.cs index 2be9684e72..31d5ed2a3b 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingDefinitionProvider.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingDefinitionProvider.cs @@ -9,6 +9,12 @@ public class LdapSettingDefinitionProvider : SettingDefinitionProvider public override void Define(ISettingDefinitionContext context) { context.Add( + new SettingDefinition( + LdapSettingNames.Ldaps, + "false", + L("DisplayName:Abp.Ldap.Ldaps"), + L("Description:Abp.Ldap.Ldaps")), + new SettingDefinition( LdapSettingNames.ServerHost, "", diff --git a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs index cf43f11d43..8299adc458 100644 --- a/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs +++ b/framework/src/Volo.Abp.Ldap/Volo/Abp/Ldap/LdapSettingProvider.cs @@ -14,32 +14,37 @@ public class LdapSettingProvider : ILdapSettingProvider, ITransientDependency SettingProvider = settingProvider; } - public async Task GetServerHostAsync() + public virtual async Task IsLdaps() + { + return (await SettingProvider.GetOrNullAsync(LdapSettingNames.Ldaps))?.To() ?? default; + } + + public virtual async Task GetServerHostAsync() { return await SettingProvider.GetOrNullAsync(LdapSettingNames.ServerHost); } - public async Task GetServerPortAsync() + public virtual async Task GetServerPortAsync() { return (await SettingProvider.GetOrNullAsync(LdapSettingNames.ServerPort))?.To() ?? default; } - public async Task GetBaseDcAsync() + public virtual async Task GetBaseDcAsync() { return await SettingProvider.GetOrNullAsync(LdapSettingNames.BaseDc); } - public async Task GetDomainAsync() + public virtual async Task GetDomainAsync() { return await SettingProvider.GetOrNullAsync(LdapSettingNames.Domain); } - public async Task GetUserNameAsync() + public virtual async Task GetUserNameAsync() { return await SettingProvider.GetOrNullAsync(LdapSettingNames.UserName); } - public async Task GetPasswordAsync() + public virtual async Task GetPasswordAsync() { return await SettingProvider.GetOrNullAsync(LdapSettingNames.Password); }