diff --git a/appinfo/info.xml b/appinfo/info.xml index ac32f551a9c913b8ee8214a4b16f77c73e01c7f3..dc8f67f3a4e10b399deb4dcd7ed96521ee63bc02 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -10,7 +10,7 @@ - 11.1.0 + 12.0.0 agpl Murena SAS EcloudAccounts diff --git a/l10n/de.js b/l10n/de.js index 2c00a4098eed4d843226a82b65ff156e9603d829..e4c45ed723d77dacc6feeae91e294773cbf89afa 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -45,7 +45,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.", "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", - "Later": "Später", "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", @@ -77,7 +76,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", "Use an alternative email": "Verwenden Sie eine alternative E-Mail", "Important:": "Das ist wichtig:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "For security reasons, a recovery email is required.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich.", "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse", "Captcha is not verified!": "Captcha wird nicht überprüft!", "A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.", diff --git a/l10n/de.json b/l10n/de.json index 63b7d43470426b300c1780e519b881b1472b55c2..9ffdb87b18936bcb6714eead77bb82438196c2ac 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -44,7 +44,6 @@ "As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.", "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", - "Later": "Später", "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", @@ -75,7 +74,7 @@ "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", "Use an alternative email": "Verwenden Sie eine alternative E-Mail", "Important:": "Das ist wichtig:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "For security reasons, a recovery email is required.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich.", "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse", "Captcha is not verified!": "Captcha wird nicht überprüft!", "A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 9478e84445bae366361d4cd55bce7eb51d054b9d..c4c291813bd2a067ba227ab35af62a927ce702d0 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -45,7 +45,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.", "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", - "Later": "Später", "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", @@ -77,7 +76,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", "Use an alternative email": "Verwenden Sie eine alternative E-Mail", "Important:": "Das ist wichtig:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "For security reasons, a recovery email is required.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich.", "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse", "Captcha is not verified!": "Captcha wird nicht überprüft!", "A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index 493c1672e02f70888eddcda6d9cc9d0f49d342a2..0e91245e1acc77202778c55e20df26b68aa81571 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -44,7 +44,6 @@ "As long as you don't, you'll have limited access to your account.": "Solange Sie das nicht tun, haben Sie nur eingeschränkten Zugang zu Ihrem Konto.", "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", - "Later": "Später", "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", @@ -75,7 +74,7 @@ "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", "Use an alternative email": "Verwenden Sie eine alternative E-Mail", "Important:": "Das ist wichtig:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "For security reasons, a recovery email is required.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich.", "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse", "Captcha is not verified!": "Captcha wird nicht überprüft!", "A server-side error occurred while processing your request! Please try again later.": "Ein serverseitiger Fehler ist bei der Bearbeitung Ihrer Anfrage aufgetreten! Bitte versuchen Sie es später noch einmal.", diff --git a/l10n/en.js b/l10n/en.js index 95596e24501143318d853f40b6e9c5799226abb1..98b3a740ee51b18c80c027ec8e959238a9d84f6b 100644 --- a/l10n/en.js +++ b/l10n/en.js @@ -48,7 +48,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "As long as you don't, you'll have limited access to your account.", "Create My Account": "Create My Account", "Verify": "Verify", - "Later": "Later", "Set My Recovery Email Now": "Set My Recovery Email Now", "Display name": "Display name", "Username": "Username", @@ -80,7 +79,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32", "Use an alternative email": "Use an alternative email", "Important:": "Important:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.", + "For security reasons, a recovery email is required.": "For security reasons, a recovery email is required.", "Set a recovery email address": "Set a recovery email address", "Captcha is not verified!": "Captcha is not verified!", "A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.", diff --git a/l10n/en.json b/l10n/en.json index d6550f4997ae25359c430f53c0383ffa71e55e63..77c18bd797c702066232cca6d1a85ec5d53dd03a 100644 --- a/l10n/en.json +++ b/l10n/en.json @@ -45,7 +45,6 @@ "As long as you don't, you'll have limited access to your account.": "As long as you don't, you'll have limited access to your account.", "Create My Account": "Create My Account", "Verify": "Verify", - "Later": "Later", "Set My Recovery Email Now": "Set My Recovery Email Now", "Display name": "Display name", "Username": "Username", @@ -77,7 +76,7 @@ "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32", "Use an alternative email": "Use an alternative email", "Important:": "Important:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.", + "For security reasons, a recovery email is required.": "For security reasons, a recovery email is required.", "Set a recovery email address": "Set a recovery email address", "Captcha is not verified!": "Captcha is not verified!", "A server-side error occurred while processing your request! Please try again later.": "A server-side error occurred while processing your request! Please try again later.", diff --git a/l10n/es.js b/l10n/es.js index 7238cc2adc8e7d35dee43153d305e6ef0393410b..1c5d5aede4aa32d88cae3708408f26a565f45c73 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -47,7 +47,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "Mientras no lo hagas, tendrás acceso limitado a tu cuenta.", "Create My Account": "Crear mi cuenta", "Verify": "Verifique", - "Later": "Más tarde", "Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora", "Display name": "Mostrar nombre", "Username": "Nombre de usuario", @@ -79,7 +78,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32", "Use an alternative email": "Utilizar un correo electrónico alternativo", "Important:": "Importante:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.", + "For security reasons, a recovery email is required.": "Por razones de seguridad, se requiere un correo electrónico de recuperación.", "Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación", "Captcha is not verified!": "¡Captcha no está verificado!", "A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.", diff --git a/l10n/es.json b/l10n/es.json index 74dad40c4205b4c3c3124373e4a78bb8333a64a0..7d8aad34704bc468137b6553799abe44916a424e 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -46,7 +46,6 @@ "As long as you don't, you'll have limited access to your account.": "Mientras no lo hagas, tendrás acceso limitado a tu cuenta.", "Create My Account": "Crear mi cuenta", "Verify": "Verifique", - "Later": "Más tarde", "Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora", "Display name": "Mostrar nombre", "Username": "Nombre de usuario", @@ -78,7 +77,7 @@ "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32", "Use an alternative email": "Utilizar un correo electrónico alternativo", "Important:": "Importante:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.", + "For security reasons, a recovery email is required.": "Por razones de seguridad, se requiere un correo electrónico de recuperación.", "Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación", "Captcha is not verified!": "¡Captcha no está verificado!", "A server-side error occurred while processing your request! Please try again later.": "Hubo un error en el servidor al procesar tu solicitud. Por favor, inténtalo más tarde.", diff --git a/l10n/fr.js b/l10n/fr.js index 3a7a008e1fbc85aa1bf8ab08f3788ffdca150478..143aae2df13bf796645a93120fef7c2f0d01d115 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -46,7 +46,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "Si vous ne le faites pas, vous aurez un accès limité à votre compte.", "Create My Account": "Créer mon compte", "Verify": "Vérifier", - "Later": "Plus tard", "Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant", "Display name": "Nom d'affichage", "Username": "Nom d'utilisateur", @@ -78,7 +77,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32", "Use an alternative email": "Utiliser un autre courriel", "Important:": "Important :", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.", + "For security reasons, a recovery email is required.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire.", "Set a recovery email address": "Définir une adresse électronique de récupération", "Captcha is not verified!": "Captcha n'est pas vérifié !", "A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.", diff --git a/l10n/fr.json b/l10n/fr.json index 8f27e62aa4dd4d6533eec53cb938dcf7baa85aea..32992623bb147a515394cbd80e280ec05823719e 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -45,7 +45,6 @@ "As long as you don't, you'll have limited access to your account.": "Si vous ne le faites pas, vous aurez un accès limité à votre compte.", "Create My Account": "Créer mon compte", "Verify": "Vérifier", - "Later": "Plus tard", "Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant", "Display name": "Nom d'affichage", "Username": "Nom d'utilisateur", @@ -77,7 +76,7 @@ "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32", "Use an alternative email": "Utiliser un autre courriel", "Important:": "Important :", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.", + "For security reasons, a recovery email is required.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire.", "Set a recovery email address": "Définir une adresse électronique de récupération", "Captcha is not verified!": "Captcha n'est pas vérifié !", "A server-side error occurred while processing your request! Please try again later.": "Erreur du serveur dans la gestion de votre demande ! Merci d'essayer ultérieurement.", diff --git a/l10n/it.js b/l10n/it.js index f90e0506f73905720b10e8be75968dcd9f359722..084333e80ff2c052337ec4f3b531162465e9f0b4 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -46,7 +46,6 @@ OC.L10N.register( "As long as you don't, you'll have limited access to your account.": "Finché non lo farete, avrete un accesso limitato al vostro conto.", "Create My Account": "Crea il mio account", "Verify": "Verifica", - "Later": "Più tardi", "Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero", "Display name": "Nome visualizzato", "Username": "Nome utente", @@ -78,7 +77,7 @@ OC.L10N.register( "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32", "Use an alternative email": "Utilizzare un'e-mail alternativa", "Important:": "Importante:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.", + "For security reasons, a recovery email is required.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero.", "Set a recovery email address": "Impostare un indirizzo e-mail di recupero", "Captcha is not verified!": "Il Captcha non è verificato!", "A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.", diff --git a/l10n/it.json b/l10n/it.json index fcd388c4254cb44d57c1b69ebf9348258c3102fc..0b18b40af4bac25ac88d3ab2f0fa594165d22972 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -45,7 +45,6 @@ "As long as you don't, you'll have limited access to your account.": "Finché non lo farete, avrete un accesso limitato al vostro conto.", "Create My Account": "Crea il mio account", "Verify": "Verifica", - "Later": "Più tardi", "Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero", "Display name": "Nome visualizzato", "Username": "Nome utente", @@ -73,7 +72,7 @@ "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32", "Use an alternative email": "Utilizzare un'e-mail alternativa", "Important:": "Importante:", - "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.", + "For security reasons, a recovery email is required.": "Per motivi di sicurezza è necessaria un'e-mail di recupero.", "Set a recovery email address": "Impostare un indirizzo e-mail di recupero", "Captcha is not verified!": "Il Captcha non è verificato!", "A server-side error occurred while processing your request! Please try again later.": "Si è verificato un errore lato server nel processare la tua richiesta! Ritenta più tardi.", diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php index 589c0db54516b3fbbffff998cb3ae321e8c7df13..8b23dad6166f5ae6b1d76e9fc91c1215eaa239b2 100644 --- a/lib/Controller/AccountController.php +++ b/lib/Controller/AccountController.php @@ -143,7 +143,7 @@ class AccountController extends Controller { * * @return \OCP\AppFramework\Http\DataResponse */ - public function create(string $recoveryEmail = '', string $password = '', string $language = 'en', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse { + public function create(string $recoveryEmail, string $password = '', string $language = 'en', bool $newsletterEos = false, bool $newsletterProduct = false): DataResponse { $response = new DataResponse(); @@ -184,6 +184,10 @@ class AccountController extends Controller { } try { + if (empty($recoveryEmail)) { + throw new RecoveryEmailValidationException('Recovery Email is required.'); + } + $username = mb_strtolower($username, 'UTF-8'); $mainDomain = $this->userService->getMainDomain(); $userEmail = $username.'@'.$mainDomain; diff --git a/src/signup/RecoveryEmailForm.vue b/src/signup/RecoveryEmailForm.vue index 84fde0bd219ae460a24bd2a681b9c93587c00503..8eea04d1f6667a7b5048ce8c8fb8cf4473f148c3 100644 --- a/src/signup/RecoveryEmailForm.vue +++ b/src/signup/RecoveryEmailForm.vue @@ -27,7 +27,7 @@

{{ t(appName,'Important:') }} - {{ t(appName,'For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.') }} + {{ t(appName,'For security reasons, a recovery email is required.') }}

@@ -39,13 +39,6 @@ @click.prevent="submitRecoveryEmailForm(true)"> {{ t(appName,'Set My Recovery Email Now') }} -