diff --git a/CHANGES b/CHANGES index 5e8476353..c98debe54 100644 --- a/CHANGES +++ b/CHANGES @@ -2732,4 +2732,5 @@ * directoryserver: fix totp validation * email: improve loading of the mail usage to not block other views from loading * eventlog: add events for directory server and exernal directory configuration +* externalldap: available regardless of subscription diff --git a/dashboard/src/js/client.js b/dashboard/src/js/client.js index 40e5277f0..3a25f00bc 100644 --- a/dashboard/src/js/client.js +++ b/dashboard/src/js/client.js @@ -763,9 +763,6 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout this._config.consoleServerOrigin = '<%= appstore.consoleOrigin %>'; <% } -%> - // => This is just for easier testing - // this._config.features.externalLdap = false; - this._configListener.forEach(function (callback) { callback(that._config); }); diff --git a/dashboard/src/translation/da.json b/dashboard/src/translation/da.json index 9affdc2d3..60a07d955 100644 --- a/dashboard/src/translation/da.json +++ b/dashboard/src/translation/da.json @@ -182,7 +182,6 @@ "title": "Tilslut en ekstern mappe", "description": "Cloudron synkroniserer brugere og grupper fra en ekstern LDAP- eller ActiveDirectory-server. Adgangskodebekræftelse til autentificering af disse brugere foretages mod den eksterne server. Synkroniseringen køres ikke automatisk, men skal udløses manuelt.", "bindUsername": "Bind DN/Benyttelsesnavn (valgfrit)", - "subscriptionRequired": "Denne funktion er kun tilgængelig i de betalte abonnementer.", "subscriptionRequiredAction": "Oprettelse af abonnement nu", "noopInfo": "LDAP-godkendelse er ikke konfigureret.", "provider": "Udbyder", diff --git a/dashboard/src/translation/de.json b/dashboard/src/translation/de.json index 2efa96b54..95528f307 100644 --- a/dashboard/src/translation/de.json +++ b/dashboard/src/translation/de.json @@ -230,7 +230,6 @@ "provider": "Anbieter", "noopInfo": "LDAP Authentifizierung ist nicht konfiguriert.", "subscriptionRequiredAction": "Abonnenement jetzt abschließen", - "subscriptionRequired": "Diese Funktion ist nur im Abo enthalten.", "description": "Cloudron synchronisiert User und Gruppen aus dem externen LDAP- oder Active-Directory-Server. Passwörter beim Anmelden werden immer durch den externen Server validiert. Die Synchronisierung läuft nicht automatisch, sondern muss manuell gestartet werden.", "title": "Verbinde ein externes Verzeichnis", "providerOther": "Sonstige", diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json index 5584324f5..18878d725 100644 --- a/dashboard/src/translation/en.json +++ b/dashboard/src/translation/en.json @@ -221,8 +221,7 @@ }, "externalLdap": { "title": "Connect an External Directory", - "description": "This setting will synchronize and authenticate users and groups from an external LDAP or Active Directory server. The synchronization is run every 4 hours but can also be triggered manually.", - "subscriptionRequired": "This feature is only available in the paid plans.", + "description": "This setting will synchronize and authenticate users and groups from an external LDAP or Active Directory server. The synchronization is run periodically but can also be triggered manually.", "subscriptionRequiredAction": "Set up Subscription Now", "noopInfo": "LDAP authentication is not configured.", "provider": "Provider", diff --git a/dashboard/src/translation/es.json b/dashboard/src/translation/es.json index ef9559858..69dbf1bd4 100644 --- a/dashboard/src/translation/es.json +++ b/dashboard/src/translation/es.json @@ -211,7 +211,6 @@ "provider": "Proveedor", "noopInfo": "La autentificación LDAP no está configurada.", "subscriptionRequiredAction": "Configura tu Suscripción Ahora", - "subscriptionRequired": "Esta característica solo está habilitada en planes de pago.", "description": "Cloudron sincronizará usuarios y grupos desde un servidor LDAP o ActiveDirectory externo. La verificación de la contraseña para autentificar a esos usuarios se realiza en el servidor externo. La sincronización no se ejecuta automáticamente, sino que debe activarse manualmente.", "title": "Conectar un directorio externo", "auth": "Auth", diff --git a/dashboard/src/translation/fr.json b/dashboard/src/translation/fr.json index 98b78aa8d..4d4ddcccb 100644 --- a/dashboard/src/translation/fr.json +++ b/dashboard/src/translation/fr.json @@ -139,7 +139,6 @@ "groupnameField": "Champ nom du groupe", "syncGroups": "Groupes synchronisés", "filter": "Filtre", - "subscriptionRequired": "Cette fonctionnalité est disponible uniquement dans la version payante.", "acceptSelfSignedCert": "Accepter le certificat auto-signé", "usernameField": "Champ nom d'utilisateur", "groupFilter": "Filtre des groupes", diff --git a/dashboard/src/translation/it.json b/dashboard/src/translation/it.json index a153556cd..88d4e86c7 100644 --- a/dashboard/src/translation/it.json +++ b/dashboard/src/translation/it.json @@ -932,7 +932,6 @@ "server": "URL del Server", "noopInfo": "L'autenticazione LDAP non è configurata.", "subscriptionRequiredAction": "Attiva un piano a pagamento", - "subscriptionRequired": "Questa funzionalità è disponibile solo nei piani a pagamento.", "description": "Cloudron sincronizzerà utenti e gruppi da un server LDAP o ActiveDirectory esterni. La verifica della password per l'autenticazione di tali utenti viene eseguita sul server esterno. La sincronizzazione non viene eseguita automaticamente ma deve essere attivata manualmente.", "auth": "Auth", "groupnameField": "Campo Groupname", diff --git a/dashboard/src/translation/nl.json b/dashboard/src/translation/nl.json index c0b7ef545..83cf2c69f 100644 --- a/dashboard/src/translation/nl.json +++ b/dashboard/src/translation/nl.json @@ -221,7 +221,6 @@ }, "externalLdap": { "title": "Verbind met een externe lijst", - "subscriptionRequired": "Deze functie is alleen beschikbaar voor betaalde abonnementen.", "subscriptionRequiredAction": "Neem nu een abonnement", "noopInfo": "LDAP authenticatie is niet geconfigureerd.", "provider": "Aanbieder", diff --git a/dashboard/src/translation/ru.json b/dashboard/src/translation/ru.json index caa892f9b..c00158b89 100644 --- a/dashboard/src/translation/ru.json +++ b/dashboard/src/translation/ru.json @@ -221,7 +221,6 @@ "bindPassword": "Привязать пароль (необязательно)", "bindUsername": "Привязать Уникальное имя (DN)/Имя пользователя (необязательно)", "title": "Подключиться к удалённому каталогу", - "subscriptionRequired": "Данная функция доступна только в платной подписке.", "subscriptionRequiredAction": "Настроить подписку сейчас", "noopInfo": "LDAP аутентификация не настроена.", "provider": "Поставщик", diff --git a/dashboard/src/translation/vi.json b/dashboard/src/translation/vi.json index 1b0bd8e11..bb49ca6df 100644 --- a/dashboard/src/translation/vi.json +++ b/dashboard/src/translation/vi.json @@ -239,7 +239,6 @@ "subscriptionRequiredAction": "Cài đặt gói đăng ký ngay", "description": "Cloudron sẽ đồng bộ người dùng và nhóm từ server LDAP hay ActiveDirectory bên ngoài. Xác minh mật khẩu cho người dùng được dựa trên server ngoài. Việc đồng bộ hoá không được chạy tự động mà cần được khởi động bằng tay.", "title": "Kết nối thư mục ngoài", - "subscriptionRequired": "Tính năng này chỉ có trong gói trả phí.", "providerOther": "Khác", "providerDisabled": "Đã tắt" }, diff --git a/dashboard/src/translation/zh_Hans.json b/dashboard/src/translation/zh_Hans.json index 1eae4b43f..6f1a9b115 100644 --- a/dashboard/src/translation/zh_Hans.json +++ b/dashboard/src/translation/zh_Hans.json @@ -428,7 +428,6 @@ }, "externalLdap": { "title": "连接外部用户目录", - "subscriptionRequired": "这个功能仅在付费订阅后可用。", "subscriptionRequiredAction": "现在就设置订阅", "noopInfo": "LDAP 认证未配置。", "provider": "Provider", diff --git a/dashboard/src/views/user-settings.html b/dashboard/src/views/user-settings.html index 499965749..6291a7230 100644 --- a/dashboard/src/views/user-settings.html +++ b/dashboard/src/views/user-settings.html @@ -277,150 +277,141 @@
-
-
- {{ 'users.externalLdap.subscriptionRequired' | tr }} {{ 'users.externalLdap.subscriptionRequiredAction' | tr }} +
+
+ {{ 'users.externalLdap.noopInfo' | tr }}
-
+
+
+ {{ 'users.externalLdap.provider' | tr }} +
+
+ {{ externalLdap.currentConfig.provider }} +
+
-
-
- {{ 'users.externalLdap.noopInfo' | tr }} +
+
+ {{ 'users.externalLdap.server' | tr }} +
+
+ {{ externalLdap.currentConfig.url }} +
+
+ +
+
+ {{ 'users.externalLdap.acceptSelfSignedCert' | tr }} +
+
+ {{ externalLdap.currentConfig.acceptSelfSignedCerts ? 'Yes' : 'No' }} +
+
+ +
+
+ {{ 'users.externalLdap.baseDn' | tr }} +
+
+ {{ externalLdap.currentConfig.baseDn }} +
+
+ +
+
+ {{ 'users.externalLdap.filter' | tr }} +
+
+ {{ externalLdap.currentConfig.filter }} +
+
+ +
+
+ {{ 'users.externalLdap.usernameField' | tr }} +
+
+ {{ externalLdap.currentConfig.usernameField || 'uid' }} +
+
+ +
+
+ {{ 'users.externalLdap.syncGroups' | tr }} +
+
+ {{ externalLdap.currentConfig.syncGroups ? 'Yes' : 'No' }} +
+
+ +
+
+ {{ 'users.externalLdap.groupBaseDn' | tr }} +
+
+ {{ externalLdap.currentConfig.groupBaseDn }} +
+
+ +
+
+ {{ 'users.externalLdap.groupFilter' | tr }} +
+
+ {{ externalLdap.currentConfig.groupFilter }} +
+
+ +
+
+ {{ 'users.externalLdap.groupnameField' | tr }} +
+
+ {{ externalLdap.currentConfig.groupnameField }} +
+
+ +
+
+ {{ 'users.externalLdap.auth' | tr }} +
+
+ {{ externalLdap.currentConfig.bindDn ? 'Yes' : 'No' }} +
+
+ +
+
+ {{ 'users.externalLdap.autocreateUsersOnLogin' | tr }} +
+
+ {{ externalLdap.currentConfig.autoCreate ? 'Yes' : 'No' }} +
+
+ +
+
+
+
+
+
-
-
- {{ 'users.externalLdap.provider' | tr }} -
-
- {{ externalLdap.currentConfig.provider }} -
+
+
+

{{ externalLdap.message }}

+

+

{{ externalLdap.errorMessage }}
+

-
-
- {{ 'users.externalLdap.server' | tr }} -
-
- {{ externalLdap.currentConfig.url }} -
-
- -
-
- {{ 'users.externalLdap.acceptSelfSignedCert' | tr }} -
-
- {{ externalLdap.currentConfig.acceptSelfSignedCerts ? 'Yes' : 'No' }} -
-
- -
-
- {{ 'users.externalLdap.baseDn' | tr }} -
-
- {{ externalLdap.currentConfig.baseDn }} -
-
- -
-
- {{ 'users.externalLdap.filter' | tr }} -
-
- {{ externalLdap.currentConfig.filter }} -
-
- -
-
- {{ 'users.externalLdap.usernameField' | tr }} -
-
- {{ externalLdap.currentConfig.usernameField || 'uid' }} -
-
- -
-
- {{ 'users.externalLdap.syncGroups' | tr }} -
-
- {{ externalLdap.currentConfig.syncGroups ? 'Yes' : 'No' }} -
-
- -
-
- {{ 'users.externalLdap.groupBaseDn' | tr }} -
-
- {{ externalLdap.currentConfig.groupBaseDn }} -
-
- -
-
- {{ 'users.externalLdap.groupFilter' | tr }} -
-
- {{ externalLdap.currentConfig.groupFilter }} -
-
- -
-
- {{ 'users.externalLdap.groupnameField' | tr }} -
-
- {{ externalLdap.currentConfig.groupnameField }} -
-
- -
-
- {{ 'users.externalLdap.auth' | tr }} -
-
- {{ externalLdap.currentConfig.bindDn ? 'Yes' : 'No' }} -
-
- -
-
- {{ 'users.externalLdap.autocreateUsersOnLogin' | tr }} -
-
- {{ externalLdap.currentConfig.autoCreate ? 'Yes' : 'No' }} -
-
- -
-
-
-
-
-
-
-
- -
-
-

{{ externalLdap.message }}

-

-

{{ externalLdap.errorMessage }}
-

-
- -
- - - {{ 'users.externalLdap.showLogsAction' | tr }} -
+
+ + + {{ 'users.externalLdap.showLogsAction' | tr }}