diff --git a/dashboard/public/translation/da.json b/dashboard/public/translation/da.json index f235fa45a..34b7f3caf 100644 --- a/dashboard/public/translation/da.json +++ b/dashboard/public/translation/da.json @@ -262,7 +262,6 @@ "label": "Bind adgangskode", "url": "Server URL" }, - "title": "Directory Server", "description": "Cloudron kan fungere som en central brugerkatalogserver for eksterne programmer.", "enabled": "Aktiveret", "ipRestriction": { diff --git a/dashboard/public/translation/de.json b/dashboard/public/translation/de.json index e89d2f45b..f202db175 100644 --- a/dashboard/public/translation/de.json +++ b/dashboard/public/translation/de.json @@ -404,7 +404,6 @@ "placeholder": "Zeilen separierte IP Adresse oder Subnetz" }, "enabled": "Aktiviert", - "title": "LDAP-Anbieter", "cloudflarePortWarning": "Cloudflare Proxying für die Dashboarddomäne muss deaktiviert sein um den LDAP Server zu erreichen" }, "invitationNotification": { diff --git a/dashboard/public/translation/en.json b/dashboard/public/translation/en.json index c85360ff3..4074d979e 100644 --- a/dashboard/public/translation/en.json +++ b/dashboard/public/translation/en.json @@ -373,8 +373,7 @@ "body": "Email sent to {{ email }}" }, "exposedLdap": { - "title": "LDAP Provider", - "description": "Cloudron can act as a central user directory server for external applications.", + "description": "The LDAP server can be used by external applications for authentication.", "enabled": "Enabled", "ipRestriction": { "description": "Limit Directory Server access to specific IPs or ranges. Lines starting with # are treated as comments.", @@ -386,7 +385,8 @@ "description": "All LDAP queries have to be authenticated with this secret and the user DN {{ userDN }}", "url": "Server URL" }, - "cloudflarePortWarning": "Cloudflare proxying must be disabled on the dashboard domain to access the LDAP server" + "cloudflarePortWarning": "Cloudflare proxying must be disabled on the dashboard domain to access the LDAP server", + "title": "LDAP Server" }, "userImportDialog": { "title": "Import Users", diff --git a/dashboard/public/translation/es.json b/dashboard/public/translation/es.json index 89c5a0fe6..1a8e7d0cc 100644 --- a/dashboard/public/translation/es.json +++ b/dashboard/public/translation/es.json @@ -374,7 +374,6 @@ "label": "Acceso Restringido" }, "enabled": "Habilitado", - "title": "Proveedor LDAP", "description": "Cloudron puede actuar como un servidor de directorio de usuarios central para aplicaciones externas.", "secret": { "label": "Vincular Contraseña", diff --git a/dashboard/public/translation/fr.json b/dashboard/public/translation/fr.json index 7fc472350..ad473d74a 100644 --- a/dashboard/public/translation/fr.json +++ b/dashboard/public/translation/fr.json @@ -285,7 +285,6 @@ "placeholder": "Adresse IP séparée par ligne ou sous-réseau", "label": "Accès restreint" }, - "title": "Serveur d'annuaire", "cloudflarePortWarning": "Le proxy Cloudflare doit être désactivé sur le domaine du tableau de bord pour accéder au service LDAP" }, "userImportDialog": { diff --git a/dashboard/public/translation/nl.json b/dashboard/public/translation/nl.json index c87b82678..1de04cbae 100644 --- a/dashboard/public/translation/nl.json +++ b/dashboard/public/translation/nl.json @@ -379,7 +379,6 @@ "label": "Beperk toegang" }, "enabled": "Ingeschakeld", - "title": "LDAP aanbieder", "description": "Cloudron kan ingezet worden als gebruikers Directory Server voor externe applicaties.", "secret": { "label": "Koppel wachtwoord", @@ -424,7 +423,7 @@ "passwordRecoveryEmail": "Wachtwoordherstel e-mailadres", "language": "Taal", "changePassword": { - "title": "Verander je wachtwoord", + "title": "Verander wachtwoord", "newPassword": "Nieuw wachtwoord", "newPasswordRepeat": "Herhaal nieuw wachtwoord", "errorPasswordRequired": "Een wachtwoord is verplicht", diff --git a/dashboard/public/translation/pt.json b/dashboard/public/translation/pt.json index fc21d5d4a..ce9e7ae86 100644 --- a/dashboard/public/translation/pt.json +++ b/dashboard/public/translation/pt.json @@ -317,7 +317,6 @@ }, "users": { "exposedLdap": { - "title": "Fornecedor de LDAP", "enabled": "Ativado", "ipRestriction": { "label": "Restringir Acesso", diff --git a/dashboard/public/translation/ru.json b/dashboard/public/translation/ru.json index f8ccdb052..e2bab2cab 100644 --- a/dashboard/public/translation/ru.json +++ b/dashboard/public/translation/ru.json @@ -373,7 +373,6 @@ "body": "Письмо отправлено на {{ email }}" }, "exposedLdap": { - "title": "Поставщик LDAP", "ipRestriction": { "description": "Ограничьте доступ к серверу каталогов только для определённого круга IP-адресов и диапазонов. Строки, начинающиеся с #, будут считаться комментарием.", "placeholder": "IP-адреса или подсети, разделённые строками", diff --git a/dashboard/public/translation/vi.json b/dashboard/public/translation/vi.json index 65b6d495c..b080f7091 100644 --- a/dashboard/public/translation/vi.json +++ b/dashboard/public/translation/vi.json @@ -347,7 +347,6 @@ "exposedLdap": { "description": "Cloudron có thể đóng vai trò là máy chủ chỉ mục người dùng trung tâm cho những app bên ngoài.", "enabled": "Đã bật", - "title": "Nhà cung cấp LDAP", "ipRestriction": { "description": "Giới hạn quyền truy cập máy chủ chỉ mục cho những địa chỉ IP hoặc khoảng vùng cụ thể. Những dòng bắt đầu bằng dấu # được xem như ghi chú thêm.", "placeholder": "Viết xuống dòng những địa chỉ IP hoặc Subnet", diff --git a/dashboard/public/translation/zh_Hans.json b/dashboard/public/translation/zh_Hans.json index a69baf166..b3c24eb02 100644 --- a/dashboard/public/translation/zh_Hans.json +++ b/dashboard/public/translation/zh_Hans.json @@ -552,7 +552,6 @@ "label": "密钥", "description": "所有 LDAP 请求都必须使用这个密钥和用户 DN {{ userDN }} 认证身份" }, - "title": "目录服务器", "description": "Cloudron 可以作为用户目录给其他外部应用使用。", "enabled": "启用", "ipRestriction": { diff --git a/dashboard/src/Index.vue b/dashboard/src/Index.vue index d37e139a0..fbea85b44 100644 --- a/dashboard/src/Index.vue +++ b/dashboard/src/Index.vue @@ -36,7 +36,7 @@ import SystemUpdateView from './views/SystemUpdateView.vue'; import SystemDockerView from './views/SystemDockerView.vue'; import MetricsView from './views/MetricsView.vue'; import UserDirectorySettingsView from './views/UserDirectorySettingsView.vue'; -import UserDirectoryLdapProviderView from './views/UserDirectoryLdapProviderView.vue'; +import UserDirectoryLdapServerView from './views/UserDirectoryLdapServerView.vue'; import UserDirectoryOpenIdProviderView from './views/UserDirectoryOpenIdProviderView.vue'; import UsersView from './views/UsersView.vue'; import VolumesView from './views/VolumesView.vue'; @@ -66,7 +66,7 @@ const VIEWS = { SYSTEM_EVENTLOG: 'system-eventlog', SYSTEM_UPDATE: 'system-update', USER_DIRECTORY_SETTINGS: 'user-directory-settings', - USER_DIRECTORY_LDAP_PROVIDER: 'user-directory-ldap-provider', + USER_DIRECTORY_LDAP_SERVER: 'user-directory-ldap-server', USER_DIRECTORY_OPENID_PROVIDER: 'user-directory-openid-provider', USERS: 'users', VOLUMES: 'volumes', @@ -185,8 +185,8 @@ function onHashChange() { view.value = VIEWS.SYSTEM_UPDATE; } else if (v === VIEWS.USER_DIRECTORY_SETTINGS && profile.value.isAtLeastAdmin) { view.value = VIEWS.USER_DIRECTORY_SETTINGS; - } else if (v === VIEWS.USER_DIRECTORY_LDAP_PROVIDER && profile.value.isAtLeastAdmin) { - view.value = VIEWS.USER_DIRECTORY_LDAP_PROVIDER; + } else if (v === VIEWS.USER_DIRECTORY_LDAP_SERVER && profile.value.isAtLeastAdmin) { + view.value = VIEWS.USER_DIRECTORY_LDAP_SERVER; } else if (v === VIEWS.USER_DIRECTORY_OPENID_PROVIDER && profile.value.isAtLeastAdmin) { view.value = VIEWS.USER_DIRECTORY_OPENID_PROVIDER; } else if (v === VIEWS.USERS && profile.value.isAtLeastUserManager) { @@ -315,7 +315,7 @@ onMounted(async () => { @@ -355,7 +355,7 @@ onMounted(async () => { - + diff --git a/dashboard/src/views/UserDirectoryLdapProviderView.vue b/dashboard/src/views/UserDirectoryLdapServerView.vue similarity index 98% rename from dashboard/src/views/UserDirectoryLdapProviderView.vue rename to dashboard/src/views/UserDirectoryLdapServerView.vue index aa05207c2..0e948bae8 100644 --- a/dashboard/src/views/UserDirectoryLdapProviderView.vue +++ b/dashboard/src/views/UserDirectoryLdapServerView.vue @@ -62,7 +62,7 @@ onMounted(async () => { [error, result] = await dashboardModel.config(); if (error) return console.error(error); - ldapUrl.value = 'ldaps://' + result.adminFqdn + ':636'; + ldapUrl.value = `ldaps://${result.adminFqdn}:636`; adminDomain.value = domains.find(d => d.domain === result.adminDomain) || domains[0]; [error, result] = await userDirectoryModel.getExposedLdapConfig();