Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/user_saml.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--l10n/de.js3
-rw-r--r--l10n/de.json3
-rw-r--r--l10n/de_DE.js3
-rw-r--r--l10n/de_DE.json3
-rw-r--r--l10n/es.js3
-rw-r--r--l10n/es.json3
-rw-r--r--l10n/es_MX.js2
-rw-r--r--l10n/es_MX.json2
-rw-r--r--l10n/fr.js3
-rw-r--r--l10n/fr.json3
-rw-r--r--l10n/it.js3
-rw-r--r--l10n/it.json3
-rw-r--r--l10n/nb.js2
-rw-r--r--l10n/nb.json2
-rw-r--r--l10n/nl.js3
-rw-r--r--l10n/nl.json3
-rw-r--r--l10n/pt_BR.js3
-rw-r--r--l10n/pt_BR.json3
-rw-r--r--l10n/tr.js3
-rw-r--r--l10n/tr.json3
-rw-r--r--lib/Settings/Admin.php5
-rw-r--r--lib/UserBackend.php12
-rw-r--r--tests/unit/Settings/AdminTest.php5
-rw-r--r--tests/unit/UserBackendTest.php62
24 files changed, 137 insertions, 3 deletions
diff --git a/l10n/de.js b/l10n/de.js
index 96bd9961..e6a141da 100644
--- a/l10n/de.js
+++ b/l10n/de.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte kontaktiere deinen Administrator.",
"Saved" : "Gespeichert",
+ "Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte prüfe die Log-Datei für weitere Informationen.",
"X.509 certificate of the Service Provider" : "X.509-Zertifikat des Service-Providers",
"Private key of the Service Provider" : "Privater Schlüssel des Diensteanbieters",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Zeigt an, dass die nameID des <samlp:logoutRequest> von diesem Diensteanbieter verschlüsselt versandt werden.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)",
"Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.",
"Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.",
+ "Attribute to map the quota to." : "Attribut dem das Speicherkontingent zugeordnet werden soll.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML-Autorisierung für die %s Desktop-Clients nutzen (erfordert eine Neu-Autorisierung der Nutzer)",
"SSO & SAML authentication" : "SSO & SAML-Autorisierung",
"Open documentation" : "Dokumentation öffnen",
diff --git a/l10n/de.json b/l10n/de.json
index 7bfdad1c..11be60d3 100644
--- a/l10n/de.json
+++ b/l10n/de.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte kontaktiere deinen Administrator.",
"Saved" : "Gespeichert",
+ "Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte prüfe die Log-Datei für weitere Informationen.",
"X.509 certificate of the Service Provider" : "X.509-Zertifikat des Service-Providers",
"Private key of the Service Provider" : "Privater Schlüssel des Diensteanbieters",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Zeigt an, dass die nameID des <samlp:logoutRequest> von diesem Diensteanbieter verschlüsselt versandt werden.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)",
"Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.",
"Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.",
+ "Attribute to map the quota to." : "Attribut dem das Speicherkontingent zugeordnet werden soll.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML-Autorisierung für die %s Desktop-Clients nutzen (erfordert eine Neu-Autorisierung der Nutzer)",
"SSO & SAML authentication" : "SSO & SAML-Autorisierung",
"Open documentation" : "Dokumentation öffnen",
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
index d46da421..7baeb57d 100644
--- a/l10n/de_DE.js
+++ b/l10n/de_DE.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte kontaktieren Sie Ihren Administrator.",
"Saved" : "Gespeichert",
+ "Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte prüfen Sie die Log-Datei für weitere Informationen.",
"X.509 certificate of the Service Provider" : "X.509-Zertifikat des Diensteanbieters",
"Private key of the Service Provider" : "Privater Schlüssel des Diensteanbieters",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Zeigt an, dass die nameID des <samlp:logoutRequest> von diesem Diensteanbieter verschlüsselt versandt werden.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)",
"Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.",
"Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.",
+ "Attribute to map the quota to." : "Attribut dem das Speicherkontingent zugeordnet werden soll.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML-Autorisierung für die %s Desktop-Clients nutzen (erfordert eine Neu-Autorisierung der Nutzer)",
"SSO & SAML authentication" : "SSO & SAML-Autorisierung",
"Open documentation" : "Dokumentation öffnen",
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
index 71c5b652..677a6ce6 100644
--- a/l10n/de_DE.json
+++ b/l10n/de_DE.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte kontaktieren Sie Ihren Administrator.",
"Saved" : "Gespeichert",
+ "Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte prüfen Sie die Log-Datei für weitere Informationen.",
"X.509 certificate of the Service Provider" : "X.509-Zertifikat des Diensteanbieters",
"Private key of the Service Provider" : "Privater Schlüssel des Diensteanbieters",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Zeigt an, dass die nameID des <samlp:logoutRequest> von diesem Diensteanbieter verschlüsselt versandt werden.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Anmeldung nur erlauben, wenn ein Konto auf einem anderen Backend vorhanden ist (z.B. LDAP)",
"Attribute to map the displayname to." : "Attribut dem der Anzeigename zugeordnet werden soll.",
"Attribute to map the email address to." : "Attribut dem die E-Mail-Adresse zugeordnet werden soll.",
+ "Attribute to map the quota to." : "Attribut dem das Speicherkontingent zugeordnet werden soll.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "SAML-Autorisierung für die %s Desktop-Clients nutzen (erfordert eine Neu-Autorisierung der Nutzer)",
"SSO & SAML authentication" : "SSO & SAML-Autorisierung",
"Open documentation" : "Dokumentation öffnen",
diff --git a/l10n/es.js b/l10n/es.js
index c9660e76..e47b4c78 100644
--- a/l10n/es.js
+++ b/l10n/es.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Esta cuenta de usuario está deshabilitada. Por favor, ponte en contacto con el administrador",
"Saved" : "Guardado",
+ "Unknown error, please check the log file for more details." : "Error desconocido. Por favor, revisa el registro para más información.",
"X.509 certificate of the Service Provider" : "Certificado X.509 del Proveedor de Servicio",
"Private key of the Service Provider" : "Llave privada de el Proveedor de Servicio",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que el nameID del <samlp:logoutRequest> enviado por este SP será cifrado.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Permitir la autenticación solo si una cuenta existe en algún otro motor (LDAP, p. ej.).",
"Attribute to map the displayname to." : "Atributo para definir el nombre mostrado",
"Attribute to map the email address to." : "Atributo para definir la dirección de correo electrónico",
+ "Attribute to map the quota to." : "Atributo para asignar la cuota a.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Usar la autenticación SAML para los clientes de escritorio %s (necesita una re-autenticación del usuario)",
"SSO & SAML authentication" : "Autenticación SSO & SAML",
"Open documentation" : "Abrir documentación",
diff --git a/l10n/es.json b/l10n/es.json
index da48c6c5..2831b232 100644
--- a/l10n/es.json
+++ b/l10n/es.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Esta cuenta de usuario está deshabilitada. Por favor, ponte en contacto con el administrador",
"Saved" : "Guardado",
+ "Unknown error, please check the log file for more details." : "Error desconocido. Por favor, revisa el registro para más información.",
"X.509 certificate of the Service Provider" : "Certificado X.509 del Proveedor de Servicio",
"Private key of the Service Provider" : "Llave privada de el Proveedor de Servicio",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que el nameID del <samlp:logoutRequest> enviado por este SP será cifrado.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Permitir la autenticación solo si una cuenta existe en algún otro motor (LDAP, p. ej.).",
"Attribute to map the displayname to." : "Atributo para definir el nombre mostrado",
"Attribute to map the email address to." : "Atributo para definir la dirección de correo electrónico",
+ "Attribute to map the quota to." : "Atributo para asignar la cuota a.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Usar la autenticación SAML para los clientes de escritorio %s (necesita una re-autenticación del usuario)",
"SSO & SAML authentication" : "Autenticación SSO & SAML",
"Open documentation" : "Abrir documentación",
diff --git a/l10n/es_MX.js b/l10n/es_MX.js
index a92a4d8b..d240b666 100644
--- a/l10n/es_MX.js
+++ b/l10n/es_MX.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Esta cuenta de usuario se encuentra deshabilitada, por favor contacta a tu administrador.",
"Saved" : "Guardado",
+ "Unknown error, please check the log file for more details." : "Error desonocido, por favor revisa el archivo de bitácora para más detalles.",
"X.509 certificate of the Service Provider" : "certificado X.509 del Proveedor de Servicio",
"Private key of the Service Provider" : "Llave privada del Proveedor de Servicio",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que el nameID de <samlp:logoutRequest> enviado por este SP será encriptado. ",
diff --git a/l10n/es_MX.json b/l10n/es_MX.json
index 750e2448..524d2cba 100644
--- a/l10n/es_MX.json
+++ b/l10n/es_MX.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Esta cuenta de usuario se encuentra deshabilitada, por favor contacta a tu administrador.",
"Saved" : "Guardado",
+ "Unknown error, please check the log file for more details." : "Error desonocido, por favor revisa el archivo de bitácora para más detalles.",
"X.509 certificate of the Service Provider" : "certificado X.509 del Proveedor de Servicio",
"Private key of the Service Provider" : "Llave privada del Proveedor de Servicio",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que el nameID de <samlp:logoutRequest> enviado por este SP será encriptado. ",
diff --git a/l10n/fr.js b/l10n/fr.js
index 5ab57649..c71f1f11 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Ce compte utilisateur est désactivé, veuillez contacter votre administrateur.",
"Saved" : "Sauvegardé",
+ "Unknown error, please check the log file for more details." : "Erreur inconnue, veuillez vérifier le fichier journal pour plus de détails.",
"X.509 certificate of the Service Provider" : "Certificat X.509 du fournisseur de service",
"Private key of the Service Provider" : "Clé privée du fournisseur de service",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indique que le \"nameID\" de <samlp:logoutRequest> envoyé par ce SP sera chiffré.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Ne permettre l'authentification d'un compte que s'il existe sur un autre système d'authentification. (ex : LDAP)",
"Attribute to map the displayname to." : "Attribut pour relier le nom d'utilisateur.",
"Attribute to map the email address to." : "Attribut pour relier l'adresse mail.",
+ "Attribute to map the quota to." : "Attribut pour relier le quota.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Utiliser l'authentification SAML pour le client bureau de %s (requiert une ré-authentification de l'utilisateur)",
"SSO & SAML authentication" : "Authentification SSO & SAML",
"Open documentation" : "Voir la documentation",
diff --git a/l10n/fr.json b/l10n/fr.json
index aff3bbbc..012fe1c5 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Ce compte utilisateur est désactivé, veuillez contacter votre administrateur.",
"Saved" : "Sauvegardé",
+ "Unknown error, please check the log file for more details." : "Erreur inconnue, veuillez vérifier le fichier journal pour plus de détails.",
"X.509 certificate of the Service Provider" : "Certificat X.509 du fournisseur de service",
"Private key of the Service Provider" : "Clé privée du fournisseur de service",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indique que le \"nameID\" de <samlp:logoutRequest> envoyé par ce SP sera chiffré.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Ne permettre l'authentification d'un compte que s'il existe sur un autre système d'authentification. (ex : LDAP)",
"Attribute to map the displayname to." : "Attribut pour relier le nom d'utilisateur.",
"Attribute to map the email address to." : "Attribut pour relier l'adresse mail.",
+ "Attribute to map the quota to." : "Attribut pour relier le quota.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Utiliser l'authentification SAML pour le client bureau de %s (requiert une ré-authentification de l'utilisateur)",
"SSO & SAML authentication" : "Authentification SSO & SAML",
"Open documentation" : "Voir la documentation",
diff --git a/l10n/it.js b/l10n/it.js
index 24dd8b21..361478ed 100644
--- a/l10n/it.js
+++ b/l10n/it.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Questo account utente è disabilitato, contatta il tuo amministratore.",
"Saved" : "Salvato",
+ "Unknown error, please check the log file for more details." : "Errore sconosciuto, controlla il file di log per ulteriori dettagli.",
"X.509 certificate of the Service Provider" : "Certificato X.509 del fornitore di servizi",
"Private key of the Service Provider" : "Chiave privata del fornitore di servizi",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica che il nameID della <samlp:logoutRequest> inviata da questo SP sarà cifrato.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Consenti l'autenticazione solo se un account esiste in un altro motore. (ad es. LDAP)",
"Attribute to map the displayname to." : "Attributo a cui associare il nome visualizzato.",
"Attribute to map the email address to." : "Attributo a cui associare l'indirizzo di posta elettronica.",
+ "Attribute to map the quota to." : "Attributo a cui associare la quota.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Utilizza autenticazione SAML per i client desktop di %s (richiede una nuova autenticazione degli utenti)",
"SSO & SAML authentication" : "Autenticazione SSO e SAML",
"Open documentation" : "Apri la documentazione",
diff --git a/l10n/it.json b/l10n/it.json
index 999dab62..30b56074 100644
--- a/l10n/it.json
+++ b/l10n/it.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Questo account utente è disabilitato, contatta il tuo amministratore.",
"Saved" : "Salvato",
+ "Unknown error, please check the log file for more details." : "Errore sconosciuto, controlla il file di log per ulteriori dettagli.",
"X.509 certificate of the Service Provider" : "Certificato X.509 del fornitore di servizi",
"Private key of the Service Provider" : "Chiave privata del fornitore di servizi",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica che il nameID della <samlp:logoutRequest> inviata da questo SP sarà cifrato.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Consenti l'autenticazione solo se un account esiste in un altro motore. (ad es. LDAP)",
"Attribute to map the displayname to." : "Attributo a cui associare il nome visualizzato.",
"Attribute to map the email address to." : "Attributo a cui associare l'indirizzo di posta elettronica.",
+ "Attribute to map the quota to." : "Attributo a cui associare la quota.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Utilizza autenticazione SAML per i client desktop di %s (richiede una nuova autenticazione degli utenti)",
"SSO & SAML authentication" : "Autenticazione SSO e SAML",
"Open documentation" : "Apri la documentazione",
diff --git a/l10n/nb.js b/l10n/nb.js
index 3658ee6d..90cdc2ea 100644
--- a/l10n/nb.js
+++ b/l10n/nb.js
@@ -52,7 +52,7 @@ OC.L10N.register(
"Account not provisioned." : "Kontoen er ikke klargjort",
"Your account is not provisioned, access to this service is thus not possible." : "Din konto er ikke klargjort, tilgang til denne tjenesten er ikke mulig akkurat nå.",
"Indicates if the SP will validate all received XMLs." : "Forteller om SP-en skal validere all mottatt XML.",
- "Only allow authentication if an account is existent on some other backend. (e.g. LDAP)" : "Bare tillat autentisering hvis en konto finnes på en annen bakende. (f.eks. LDAP)",
+ "Only allow authentication if an account is existent on some other backend. (e.g. LDAP)" : "Kun tillat autentisering hvis en konto finnes på en annen bakende. (f.eks. LDAP)",
"Show Service Provider settings ..." : "Vis tjenesteleverandørens innstillinger",
"Show optional Identity Provider settings ..." : "Vis valgfrie identitetstilbyderinnstillinger…",
"If you want to optionally map SAML attributes to the user you can configure these here." : "Hvis du valgfritt ønsker å knytte SAML-attributter til brukeren kan du sette opp disse her.",
diff --git a/l10n/nb.json b/l10n/nb.json
index f4316014..065de68f 100644
--- a/l10n/nb.json
+++ b/l10n/nb.json
@@ -50,7 +50,7 @@
"Account not provisioned." : "Kontoen er ikke klargjort",
"Your account is not provisioned, access to this service is thus not possible." : "Din konto er ikke klargjort, tilgang til denne tjenesten er ikke mulig akkurat nå.",
"Indicates if the SP will validate all received XMLs." : "Forteller om SP-en skal validere all mottatt XML.",
- "Only allow authentication if an account is existent on some other backend. (e.g. LDAP)" : "Bare tillat autentisering hvis en konto finnes på en annen bakende. (f.eks. LDAP)",
+ "Only allow authentication if an account is existent on some other backend. (e.g. LDAP)" : "Kun tillat autentisering hvis en konto finnes på en annen bakende. (f.eks. LDAP)",
"Show Service Provider settings ..." : "Vis tjenesteleverandørens innstillinger",
"Show optional Identity Provider settings ..." : "Vis valgfrie identitetstilbyderinnstillinger…",
"If you want to optionally map SAML attributes to the user you can configure these here." : "Hvis du valgfritt ønsker å knytte SAML-attributter til brukeren kan du sette opp disse her.",
diff --git a/l10n/nl.js b/l10n/nl.js
index cf59e3e3..d8b4b804 100644
--- a/l10n/nl.js
+++ b/l10n/nl.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Dit gebruikersaccount is uitgeschakeld, neem contact op met je beheerder.",
"Saved" : "Bewaard",
+ "Unknown error, please check the log file for more details." : "Onbekende fout, controleer de log voor meer details.",
"X.509 certificate of the Service Provider" : "X.509 certificaat ban de Service Provider",
"Private key of the Service Provider" : "Privésleutel van de Service Provider",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Geeft aan dat de nameID van de <samlp:logoutRequest> verzonden door deze SP zal worden versleuteld.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Sta alleen authenticatie toe als een account bestaat op een ander backend (bijv. LDAP).",
"Attribute to map the displayname to." : "weergavenaam toekennen om in kaart te brengen",
"Attribute to map the email address to." : "Email adres toekennen om in kaart te brengen",
+ "Attribute to map the quota to." : "Attribuut om de quota op te mappen.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Gebruik SAML authenticatie voor de %s desktop clients (vereist gebruiker herauthenticatie)",
"SSO & SAML authentication" : "SSO & SAML authenticatie",
"Open documentation" : "Open documentatie",
diff --git a/l10n/nl.json b/l10n/nl.json
index 564117d4..309b6400 100644
--- a/l10n/nl.json
+++ b/l10n/nl.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Dit gebruikersaccount is uitgeschakeld, neem contact op met je beheerder.",
"Saved" : "Bewaard",
+ "Unknown error, please check the log file for more details." : "Onbekende fout, controleer de log voor meer details.",
"X.509 certificate of the Service Provider" : "X.509 certificaat ban de Service Provider",
"Private key of the Service Provider" : "Privésleutel van de Service Provider",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Geeft aan dat de nameID van de <samlp:logoutRequest> verzonden door deze SP zal worden versleuteld.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Sta alleen authenticatie toe als een account bestaat op een ander backend (bijv. LDAP).",
"Attribute to map the displayname to." : "weergavenaam toekennen om in kaart te brengen",
"Attribute to map the email address to." : "Email adres toekennen om in kaart te brengen",
+ "Attribute to map the quota to." : "Attribuut om de quota op te mappen.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Gebruik SAML authenticatie voor de %s desktop clients (vereist gebruiker herauthenticatie)",
"SSO & SAML authentication" : "SSO & SAML authenticatie",
"Open documentation" : "Open documentatie",
diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js
index e2241b25..5c366c3b 100644
--- a/l10n/pt_BR.js
+++ b/l10n/pt_BR.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Esta conta de usuário está desabilitada, contacte o administrador.",
"Saved" : "Salvo",
+ "Unknown error, please check the log file for more details." : "Erro desconhecido, verifique o log para mais detalhes.",
"X.509 certificate of the Service Provider" : "Certificado X.509 do Provedor de Serviços",
"Private key of the Service Provider" : "Chave privada do Provedor de Serviços",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que o ID do nome do <samlp:logoutRequest> enviado por este SP será criptografado.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Apenas permitir a autenticação se uma conta existir em algum outro backend. (Por ex. LDAP)",
"Attribute to map the displayname to." : "Atributo para mapear o nome de exibição.",
"Attribute to map the email address to." : "Atributo para mapear o endereço de e-mail.",
+ "Attribute to map the quota to." : "Atribua a cota ao mapa.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Usar autenticação SAML para os clientes desktop %s (a reautenticação do usuário é requerida)",
"SSO & SAML authentication" : "Autenticação SSO & SAML",
"Open documentation" : "Abrir documentação",
diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json
index 9b0f3c94..fd2dd561 100644
--- a/l10n/pt_BR.json
+++ b/l10n/pt_BR.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Esta conta de usuário está desabilitada, contacte o administrador.",
"Saved" : "Salvo",
+ "Unknown error, please check the log file for more details." : "Erro desconhecido, verifique o log para mais detalhes.",
"X.509 certificate of the Service Provider" : "Certificado X.509 do Provedor de Serviços",
"Private key of the Service Provider" : "Chave privada do Provedor de Serviços",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Indica que o ID do nome do <samlp:logoutRequest> enviado por este SP será criptografado.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Apenas permitir a autenticação se uma conta existir em algum outro backend. (Por ex. LDAP)",
"Attribute to map the displayname to." : "Atributo para mapear o nome de exibição.",
"Attribute to map the email address to." : "Atributo para mapear o endereço de e-mail.",
+ "Attribute to map the quota to." : "Atribua a cota ao mapa.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "Usar autenticação SAML para os clientes desktop %s (a reautenticação do usuário é requerida)",
"SSO & SAML authentication" : "Autenticação SSO & SAML",
"Open documentation" : "Abrir documentação",
diff --git a/l10n/tr.js b/l10n/tr.js
index ec81b1bc..da11dceb 100644
--- a/l10n/tr.js
+++ b/l10n/tr.js
@@ -1,7 +1,9 @@
OC.L10N.register(
"user_saml",
{
+ "This user account is disabled, please contact your administrator." : "Kullanıcı hesabı devre dışı bırakılmış. Lütfen yöneticiniz ile görüşün.",
"Saved" : "Kaydedildi",
+ "Unknown error, please check the log file for more details." : "Bilinmeyen bir sorun çıktı. Ayrıntılı bilgi almak için günlük dosyalarına bakın.",
"X.509 certificate of the Service Provider" : "Hizmet sağlayıcının X.509 sertifikası",
"Private key of the Service Provider" : "Hizmet sağlayıcının özel anahtarı",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Bu hizmet sağlayıcı tarafından gönderilen <samlp:logoutRequest> NameID değerinin şifrelenmiş olup olmayacağını gösterir.",
@@ -20,6 +22,7 @@ OC.L10N.register(
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Kimlik yalnız, hesap başka bir arka sistemde varsa (LDAP gibi) doğrulansın",
"Attribute to map the displayname to." : "Görüntülenecek ad değerinin eşleştirileceği öznitelik.",
"Attribute to map the email address to." : "E-posta adresi değerinin eşleştirileceği özellik.",
+ "Attribute to map the quota to." : "Kime kotası değerinin eşleştirileceği öznitelik.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "%s masaüstü istemcileri için SAML kimlik doğrulaması kullanılsın (kullanıcının kimliğini yeniden doğrulaması gerekir)",
"SSO & SAML authentication" : "SSO ve SAML kimlik doğrulaması",
"Open documentation" : "Belgeleri aç",
diff --git a/l10n/tr.json b/l10n/tr.json
index 83838594..2618d49a 100644
--- a/l10n/tr.json
+++ b/l10n/tr.json
@@ -1,5 +1,7 @@
{ "translations": {
+ "This user account is disabled, please contact your administrator." : "Kullanıcı hesabı devre dışı bırakılmış. Lütfen yöneticiniz ile görüşün.",
"Saved" : "Kaydedildi",
+ "Unknown error, please check the log file for more details." : "Bilinmeyen bir sorun çıktı. Ayrıntılı bilgi almak için günlük dosyalarına bakın.",
"X.509 certificate of the Service Provider" : "Hizmet sağlayıcının X.509 sertifikası",
"Private key of the Service Provider" : "Hizmet sağlayıcının özel anahtarı",
"Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted." : "Bu hizmet sağlayıcı tarafından gönderilen <samlp:logoutRequest> NameID değerinin şifrelenmiş olup olmayacağını gösterir.",
@@ -18,6 +20,7 @@
"Only allow authentication if an account exists on some other backend. (e.g. LDAP)" : "Kimlik yalnız, hesap başka bir arka sistemde varsa (LDAP gibi) doğrulansın",
"Attribute to map the displayname to." : "Görüntülenecek ad değerinin eşleştirileceği öznitelik.",
"Attribute to map the email address to." : "E-posta adresi değerinin eşleştirileceği özellik.",
+ "Attribute to map the quota to." : "Kime kotası değerinin eşleştirileceği öznitelik.",
"Use SAML auth for the %s desktop clients (requires user re-authentication)" : "%s masaüstü istemcileri için SAML kimlik doğrulaması kullanılsın (kullanıcının kimliğini yeniden doğrulaması gerekir)",
"SSO & SAML authentication" : "SSO ve SAML kimlik doğrulaması",
"Open documentation" : "Belgeleri aç",
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 6761ae97..d7e55118 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -98,6 +98,11 @@ class Admin implements ISettings {
'type' => 'line',
'required' => true,
],
+ 'quota_mapping' => [
+ 'text' => $this->l10n->t('Attribute to map the quota to.'),
+ 'type' => 'line',
+ 'required' => false,
+ ],
];
$type = $this->config->getAppValue('user_saml', 'type');
diff --git a/lib/UserBackend.php b/lib/UserBackend.php
index b6c389d6..d1f6bd11 100644
--- a/lib/UserBackend.php
+++ b/lib/UserBackend.php
@@ -455,6 +455,14 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
} catch (\InvalidArgumentException $e) {
$newDisplayname = null;
}
+ try {
+ $newQuota = $this->getAttributeValue('saml-attribute-mapping-quota_mapping', $attributes);
+ if ($newQuota === '') {
+ $newQuota = 'default';
+ }
+ } catch (\InvalidArgumentException $e) {
+ $newQuota = null;
+ }
if ($user !== null) {
$currentEmail = (string)$user->getEMailAddress();
@@ -474,6 +482,10 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
);
$this->setDisplayName($uid, $newDisplayname);
}
+
+ if ($newQuota !== null) {
+ $user->setQuota($newQuota);
+ }
}
}
}
diff --git a/tests/unit/Settings/AdminTest.php b/tests/unit/Settings/AdminTest.php
index a209255a..449f7189 100644
--- a/tests/unit/Settings/AdminTest.php
+++ b/tests/unit/Settings/AdminTest.php
@@ -106,6 +106,11 @@ class AdminTest extends \Test\TestCase {
'type' => 'line',
'required' => true,
],
+ 'quota_mapping' => [
+ 'text' => $this->l10n->t('Attribute to map the quota to.'),
+ 'type' => 'line',
+ 'required' => false,
+ ],
];
$params = [
diff --git a/tests/unit/UserBackendTest.php b/tests/unit/UserBackendTest.php
index 03d649c4..81ea0660 100644
--- a/tests/unit/UserBackendTest.php
+++ b/tests/unit/UserBackendTest.php
@@ -133,7 +133,61 @@ class UserBackendTest extends TestCase {
->method('getAppValue')
->with('user_saml', 'saml-attribute-mapping-displayName_mapping', '')
->willReturn('displayname');
+ $this->config
+ ->expects($this->at(2))
+ ->method('getAppValue')
+ ->with('user_saml', 'saml-attribute-mapping-quota_mapping', '')
+ ->willReturn('quota');
+
+ $this->userManager
+ ->expects($this->once())
+ ->method('get')
+ ->with('ExistingUser')
+ ->willReturn($user);
+ $user
+ ->expects($this->once())
+ ->method('getEMailAddress')
+ ->willReturn('old@example.com');
+ $user
+ ->expects($this->once())
+ ->method('setEMailAddress')
+ ->with('new@example.com');
+ $user
+ ->expects($this->once())
+ ->method('setQuota')
+ ->with('50MB');
+ $this->userBackend
+ ->expects($this->once())
+ ->method('getDisplayName')
+ ->with('ExistingUser')
+ ->willReturn('');
+ $this->userBackend
+ ->expects($this->once())
+ ->method('setDisplayName')
+ ->with('ExistingUser', 'New Displayname');
+ $this->userBackend->updateAttributes('ExistingUser', ['email' => 'new@example.com', 'displayname' => 'New Displayname', 'quota' => '50MB']);
+ }
+
+ public function testUpdateAttributesQuotaDefaultFallback() {
+ $this->getMockedBuilder(['getDisplayName', 'setDisplayName']);
+ /** @var IUser|\PHPUnit_Framework_MockObject_MockObject $user */
+ $user = $this->createMock(IUser::class);
+ $this->config
+ ->expects($this->at(0))
+ ->method('getAppValue')
+ ->with('user_saml', 'saml-attribute-mapping-email_mapping', '')
+ ->willReturn('email');
+ $this->config
+ ->expects($this->at(1))
+ ->method('getAppValue')
+ ->with('user_saml', 'saml-attribute-mapping-displayName_mapping', '')
+ ->willReturn('displayname');
+ $this->config
+ ->expects($this->at(2))
+ ->method('getAppValue')
+ ->with('user_saml', 'saml-attribute-mapping-quota_mapping', '')
+ ->willReturn('quota');
$this->userManager
->expects($this->once())
@@ -148,6 +202,10 @@ class UserBackendTest extends TestCase {
->expects($this->once())
->method('setEMailAddress')
->with('new@example.com');
+ $user
+ ->expects($this->once())
+ ->method('setQuota')
+ ->with('default');
$this->userBackend
->expects($this->once())
->method('getDisplayName')
@@ -157,6 +215,8 @@ class UserBackendTest extends TestCase {
->expects($this->once())
->method('setDisplayName')
->with('ExistingUser', 'New Displayname');
- $this->userBackend->updateAttributes('ExistingUser', ['email' => 'new@example.com', 'displayname' => 'New Displayname']);
+ $this->userBackend->updateAttributes('ExistingUser', ['email' => 'new@example.com', 'displayname' => 'New Displayname', 'quota' => '']);
}
+
+
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 19:34:07 +0300