Drop additionalCode for #84

dev/Remote/User/Fetch.js

@@ -55,17 +55,13 @@ class RemoteUserFetch extends AbstractFetchRemote {
 	 * @param {string} sPassword
 	 * @param {boolean} bSignMe
 	 * @param {string=} sLanguage
-	 * @param {string=} sAdditionalCode
-	 * @param {boolean=} bAdditionalCodeSignMe
 	 */
-	login(fCallback, sEmail, sPassword, bSignMe, sLanguage, sAdditionalCode, bAdditionalCodeSignMe) {
+	login(fCallback, sEmail, sPassword, bSignMe, sLanguage) {
 		this.defaultRequest(fCallback, 'Login', {
 			Email: sEmail,
 			Login: '',
 			Password: sPassword,
 			Language: sLanguage || '',
-			AdditionalCode: sAdditionalCode || '',
-			AdditionalCodeSignMe: bAdditionalCodeSignMe ? 1 : 0,
 			SignMe: bSignMe ? 1 : 0
 		});
 	}

dev/Styles/Login.less

@@ -54,7 +54,7 @@
 		}
 
 		.controls {
-			.inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode {
+			.inputLoginForm, .inputEmail, .inputLogin, .inputPassword {
 				font-size: 18px;
 				height: 40px;
 				line-height: 20px;

dev/View/User/Login.js

@@ -42,7 +42,6 @@ class LoginUserView extends AbstractViewCenter {
 			email: SettingsGet('DevEmail'),
 			password: SettingsGet('DevPassword'),
 			signMe: false,
-			additionalCode: '',
 
 			emailError: false,
 			passwordError: false,
@@ -55,9 +54,6 @@ class LoginUserView extends AbstractViewCenter {
 
 			langRequest: false,
 
-			additionalCodeError: false,
-			additionalCodeSignMe: false,
-			additionalCodeVisibility: false,
 			signMeType: LoginSignMeType.Unused
 		});
 
@@ -83,15 +79,10 @@ class LoginUserView extends AbstractViewCenter {
 		this.addSubscribables({
 			email: () => {
 				this.emailError(false);
-				this.additionalCode('');
-				this.additionalCodeVisibility(false);
 			},
 
 			password: () => this.passwordError(false),
 
-			additionalCode: () => this.additionalCodeError(false),
-			additionalCodeVisibility: () => this.additionalCodeError(false),
-
 			submitError: value => value || this.submitErrorAddidional(''),
 
 			signMeType: iValue => this.signMe(LoginSignMeType.DefaultOn === iValue),
@@ -120,13 +111,10 @@ class LoginUserView extends AbstractViewCenter {
 	submitCommand(self, event) {
 		let email = this.email().trim(),
 			valid = event.target.form.reportValidity() && email,
-			pass = this.password(),
+			pass = this.password();
-			totp = this.additionalCodeVisibility(),
-			code = totp ? this.additionalCode() : '';
 
 		this.emailError(!email);
 		this.passwordError(!pass);
-		this.additionalCodeError(totp && !code);
 		this.formError(!valid);
 
 		if (valid) {
@@ -148,9 +136,7 @@ class LoginUserView extends AbstractViewCenter {
 				email,
 				pass,
 				!!this.signMe(),
-				this.bSendLanguage ? this.language() : '',
+				this.bSendLanguage ? this.language() : ''
-				code,
-				!!(totp && this.additionalCodeSignMe())
 			);
 
 			Local.set(ClientSideKeyName.LastSignMe, this.signMe() ? '-1-' : '-0-');

snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -1415,8 +1415,7 @@ class Actions
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function LoginProcess(string &$sEmail, string &$sPassword, string $sSignMeToken = '',
+	public function LoginProcess(string &$sEmail, string &$sPassword, string $sSignMeToken = ''): Model\Account
-								 string $sAdditionalCode = '', bool $bAdditionalCodeSignMe = false): Model\Account
 	{
 		$sInputEmail = $sEmail;
 

snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php

@@ -26,9 +26,6 @@ trait User
 		$sLanguage = $this->GetActionParam('Language', '');
 		$bSignMe = '1' === (string) $this->GetActionParam('SignMe', '0');
 
-		$sAdditionalCode = $this->GetActionParam('AdditionalCode', '');
-		$bAdditionalCodeSignMe = '1' === (string) $this->GetActionParam('AdditionalCodeSignMe', '0');
-
 		$oAccount = null;
 
 		$this->Logger()->AddSecret($sPassword);
@@ -36,8 +33,7 @@ trait User
 		try
 		{
 			$oAccount = $this->LoginProcess($sEmail, $sPassword,
-				$bSignMe ? $this->generateSignMeToken($sEmail) : '',
+				$bSignMe ? $this->generateSignMeToken($sEmail) : '');
-				$sAdditionalCode, $bAdditionalCodeSignMe);
 		}
 		catch (ClientException $oException)
 		{

snappymail/v/0.0.0/app/localization/de-DE/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Login",
         "LABEL_SIGN_ME": "Anmeldung merken",
-        "LABEL_VERIFICATION_CODE": "Verifizierungscode",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Für zwei Wochen nicht nach dem Code fragen",
         "BUTTON_SIGN_IN": "Anmelden",
         "LABEL_FORGOT_PASSWORD": "Passwort vergessen",
         "LABEL_REGISTRATION": "Registrierung"

snappymail/v/0.0.0/app/localization/en/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Login",
         "LABEL_SIGN_ME": "Remember Me",
-        "LABEL_VERIFICATION_CODE": "Verification Code",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Don't ask for the code for 2 weeks",
         "BUTTON_SIGN_IN": "Sign In",
         "LABEL_FORGOT_PASSWORD": "Forgot password",
         "LABEL_REGISTRATION": "Registration"

snappymail/v/0.0.0/app/localization/es-ES/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Login",
         "LABEL_SIGN_ME": "Recuérdame",
-        "LABEL_VERIFICATION_CODE": "Código de verificación",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "No solicitar el código de verificación durante 2 semanas",
         "BUTTON_SIGN_IN": "Acceder",
         "LABEL_FORGOT_PASSWORD": "Olvidé mi contraseña",
         "LABEL_REGISTRATION": "Registro"

snappymail/v/0.0.0/app/localization/fr-FR/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Identifiant",
         "LABEL_SIGN_ME": "Se souvenir de moi",
-        "LABEL_VERIFICATION_CODE": "Code de vérification",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Ne plus demander le code pendant 2 semaines",
         "BUTTON_SIGN_IN": "Se connecter",
         "LABEL_FORGOT_PASSWORD": "Mot de passe oublié",
         "LABEL_REGISTRATION": "S'enregistrer"

snappymail/v/0.0.0/app/localization/hu-HU/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Bejelentkezés",
         "LABEL_SIGN_ME": "Megjegyzés",
-        "LABEL_VERIFICATION_CODE": "Megerősítő kód",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Két hétig ne kérje a kódot",
         "BUTTON_SIGN_IN": "Belépés",
         "LABEL_FORGOT_PASSWORD": "Elfelejtett jelszó",
         "LABEL_REGISTRATION": "Regisztráció"

snappymail/v/0.0.0/app/localization/nl-NL/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Inlognaam",
         "LABEL_SIGN_ME": "Aangemeld blijven",
-        "LABEL_VERIFICATION_CODE": "Verificatie Code",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Vraag 2 weken niet naar code",
         "BUTTON_SIGN_IN": "Aanmelden",
         "LABEL_FORGOT_PASSWORD": "Wachtwoord vergeten",
         "LABEL_REGISTRATION": "Registratie"

snappymail/v/0.0.0/app/localization/sv-SE/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "Användarnamn",
         "LABEL_SIGN_ME": "Kom ihåg mig",
-        "LABEL_VERIFICATION_CODE": "Verifikationskod",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "Fråga inte efter koden på  2 veckor",
         "BUTTON_SIGN_IN": "Logga in",
         "LABEL_FORGOT_PASSWORD": "Glömt lösenord",
         "LABEL_REGISTRATION": "Registrera"

snappymail/v/0.0.0/app/localization/zh-CN/user.json

@@ -32,8 +32,6 @@
     "LOGIN": {
         "LABEL_LOGIN": "登录",
         "LABEL_SIGN_ME": "记住我",
-        "LABEL_VERIFICATION_CODE": "验证码",
-        "LABEL_DONT_ASK_VERIFICATION_CODE": "在两周内不再询问验证码",
         "BUTTON_SIGN_IN": "登录",
         "LABEL_FORGOT_PASSWORD": "忘记密码",
         "LABEL_REGISTRATION": "注册"

snappymail/v/0.0.0/app/templates/Views/User/Login.html

@@ -39,25 +39,6 @@
 						</span>
 					</div>
 				</div>
-				<div class="controls" data-bind="visible: additionalCodeVisibility(), css: {'error': additionalCodeError}">
-					<div class="input-append">
-						<input type="text" class="input-block-level inputAdditionalCode"
-							inputmode="numeric"
-							autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" style="padding-right: 35px;"
-							data-bind="textInput: additionalCode, disable: submitRequest"
-							data-i18n="[placeholder]LOGIN/LABEL_VERIFICATION_CODE" />
-						<span class="add-on"><i class="fontastic">🔑</i></span>
-					</div>
-				</div>
-				<div class="controls" data-bind="visible: additionalCodeVisibility()">
-					<div class="additionalCodeSignMeLabel" data-bind="component: {
-						name: 'CheckboxSimple',
-						params: {
-							label: 'LOGIN/LABEL_DONT_ASK_VERIFICATION_CODE',
-							value: additionalCodeSignMe
-						}
-					}"></div>
-				</div>
 				<div id="plugin-Login-BottomControlGroup"></div>
 				<div class="controls" data-bind="hidden: hideSubmitButton">
 					<button type="submit" class="btn btn-large btn-block buttonLogin" data-bind="command: submitCommand">