Change handling of (token) errors due to #1706

dev/App/User.js

@@ -27,7 +27,7 @@ import {
 	getFolderFromCacheList
 } from 'Common/Cache';
 
-import { i18n, reloadTime } from 'Common/Translator';
+import { i18n, reloadTime, getErrorMessage } from 'Common/Translator';
 
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { NotificationUserStore } from 'Stores/User/Notification';
@@ -150,7 +150,8 @@ export class AppUser extends AbstractApp {
 
 	logout() {
 		Remote.request('Logout', (iError, data) =>
-			iError ? alert(data) : rl.logoutReload(Settings.app('customLogoutLink'))
+			iError ? alert('Logout error: ' + getErrorMessage(iError, data))
+				: rl.logoutReload(Settings.app('customLogoutLink'))
 		);
 	}
 
@@ -183,9 +184,9 @@ export class AppUser extends AbstractApp {
 			SettingsUserStore.init();
 			ContactUserStore.init();
 
-			loadFolders(value => {
+			loadFolders((success, error) => {
 				try {
-					if (value) {
+					if (success) {
 						startScreens([
 							MailBoxUserScreen,
 							SettingsUserScreen
@@ -227,6 +228,7 @@ export class AppUser extends AbstractApp {
 						setTimeout(() => mailToHelper(SettingsGet('mailToEmail')), 500);
 					} else {
 						this.logout();
+						alert('Folders error: ' + getErrorMessage(0, error))
 					}
 				} catch (e) {
 					console.error(e);

dev/Common/Folders.js

@@ -198,7 +198,7 @@ dropFilesInFolder = (sFolderFullName, files) => {
 			data.append('folder', sFolderFullName);
 			data.append('appendFile', file);
 			Remote.request('FolderAppend', (iError, data)=>{
-				iError && console.error(data.ErrorMessage);
+				iError && console.error(data.message);
 				0 == --count
 				&& FolderUserStore.currentFolderFullName() == sFolderFullName
 				&& MessagelistUserStore.reload(true, true);

dev/Common/Translator.js

@@ -184,6 +184,9 @@ export const
 			|| '';
 	},
 
+	getErrorMessage = (code, data) =>
+		getNotification(code) || data?.messageAdditional || data?.message || data,
+
 	/**
 	 * @param {*} code
 	 * @returns {string}

dev/Model/FolderCollection.js

@@ -104,7 +104,7 @@ export const
 				// Repeat every 15 minutes?
 //				this.foldersTimeout = setTimeout(loadFolders, 900000);
 			})
-			.catch(() => fCallback && setTimeout(fCallback, 1, false));
+			.catch(e => fCallback && setTimeout(fCallback, 1, false, e));
 	};
 
 export class FolderCollectionModel extends AbstractCollectionModel

dev/Remote/AbstractFetch.js

@@ -8,9 +8,9 @@ let iJsonErrorCount = 0;
 const getURL = (add = '') => serverRequest('Json') + pString(add),
 
 checkResponseError = data => {
-	const err = data ? data.ErrorCode : null;
+	const err = data ? data.code : null;
 	if (Notifications.InvalidToken === err) {
-		console.error(getNotification(err) + ` (${data.ErrorMessageAdditional})`);
+		console.error(getNotification(err) + ` (${data.messageAdditional})`);
 //		alert(getNotification(err));
 		setTimeout(rl.logoutReload, 5000);
 	} else if ([
@@ -144,7 +144,7 @@ export class AbstractFetchRemote
 						iJsonErrorCount = 0;
 					} else {
 						checkResponseError(data);
-						iError = data.ErrorCode || Notifications.UnknownError
+						iError = data.code || Notifications.UnknownError
 					}
 				}
 
@@ -196,7 +196,7 @@ export class AbstractFetchRemote
 					return Promise.reject(new FetchError(Notifications.JsonParse));
 				}
 
-				if (111 === data?.ErrorCode && rl.app.ask && await rl.app.ask.cryptkey()) {
+				if (111 === data?.code && rl.app.ask && await rl.app.ask.cryptkey()) {
 					return this.post(action, fTrigger, params, timeOut);
 				}
 /*
@@ -222,8 +222,8 @@ export class AbstractFetchRemote
 				if (!data.Result || action !== data.Action) {
 					checkResponseError(data);
 					return Promise.reject(new FetchError(
-						data ? data.ErrorCode : 0,
+						data ? data.code : 0,
-						data ? (data.ErrorMessageAdditional || data.ErrorMessage) : ''
+						data ? (data.messageAdditional || data.message) : ''
 					));
 				}
 

dev/Settings/Admin/Packages.js

@@ -68,7 +68,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 			if (iError) {
 				this.packagesError(
 					getNotification(install ? Notifications.CantInstallPackage : Notifications.CantDeletePackage)
-					+ (data.ErrorMessage ? ':\n' + data.ErrorMessage : '')
+					+ (data.message ? ':\n' + data.message : '')
 				);
 			} else if (data.Result.Reload) {
 				location.reload();
@@ -113,8 +113,8 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 				if (iError) {
 					plugin.enabled(disable);
 					this.packagesError(
-						(Notifications.UnsupportedPluginPackage === iError && data?.ErrorMessage)
+						(Notifications.UnsupportedPluginPackage === iError && data?.message)
-						? data.ErrorMessage
+						? data.message
 						: getNotification(iError)
 					);
 				}

dev/Settings/User/Themes.js

@@ -99,8 +99,8 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 					themeBackground.hash(data?.Result?.hash || '');
 					if (!themeBackground.name() || !themeBackground.hash()) {
 						let errorMsg = '';
-						if (data.ErrorCode) {
+						if (data.code) {
-							switch (data.ErrorCode) {
+							switch (data.code) {
 								case UploadErrorCode.FileIsTooBig:
 									errorMsg = i18n('SETTINGS_THEMES/ERROR_FILE_IS_TOO_BIG');
 									break;
@@ -111,7 +111,7 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 							}
 						}
 
-						themeBackground.error(errorMsg || data.ErrorMessage || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
+						themeBackground.error(errorMsg || data.message || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
 					}
 				});
 		}

dev/Sieve/View/Script.js

@@ -78,7 +78,7 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 
 					if (iError) {
 						self.saveError(true);
-						self.errorText(data?.ErrorMessageAdditional || getNotification(iError));
+						self.errorText(data?.messageAdditional || getNotification(iError));
 					} else {
 						script.exists() || scripts.push(script);
 						script.exists(true);

dev/Stores/User/Contact.js

@@ -39,7 +39,7 @@ ContactUserStore.sync = fResultFunc => {
 				line = JSON.parse(line);
 				if ('ContactsSync' === line.Action) {
 					ContactUserStore.syncing(false);
-					fResultFunc?.(line.ErrorCode, line);
+					fResultFunc?.(line.code, line);
 				}
 			} catch (e) {
 				ContactUserStore.syncing(false);

dev/Stores/User/GnuPG.js

@@ -57,7 +57,7 @@ export const GnuPGUserStore = new class {
 									(iError, oData) => {
 										if (oData) {
 											if (iError) {
-												alert(oData.ErrorMessage);
+												alert(oData.message);
 											} else if (oData.Result) {
 												isPrivate
 													? this.privateKeys.remove(key)

dev/Stores/User/Pgp.js

@@ -61,7 +61,7 @@ export const
 						if (gnuPG && oData?.Result/* && (oData.Result.imported || oData.Result.secretimported)*/) {
 							GnuPGUserStore.loadKeyrings();
 						}
-						iError && alert(oData.ErrorMessage);
+						iError && alert(oData.message);
 					}, {
 						key, gnuPG, backup
 					}

dev/View/Popup/Account.js

@@ -36,7 +36,7 @@ export class AccountPopupView extends AbstractViewPopup {
 					this.submitRequest(false);
 					if (iError) {
 						this.submitError(getNotification(iError));
-						this.submitErrorAdditional(data?.ErrorMessageAdditional);
+						this.submitErrorAdditional(data?.messageAdditional);
 					} else {
 						loadAccountsAndIdentities();
 						this.close();

dev/View/Popup/Compose.js

@@ -499,8 +499,8 @@ export class ComposePopupView extends AbstractViewPopup {
 				const sendFailed = (iError, data) => {
 					this.sendError(true);
 					this.sendErrorDesc(
-						getNotification(iError, data?.ErrorMessage, Notifications.CantSendMessage)
+						getNotification(iError, data?.message, Notifications.CantSendMessage)
-						+ "\n" + (data?.ErrorMessageAdditional || data?.ErrorMessage)
+						+ "\n" + (data?.messageAdditional || data?.message)
 					);
 				};
 				try {
@@ -530,8 +530,8 @@ export class ComposePopupView extends AbstractViewPopup {
 									if (Notifications.CantSaveMessage === iError) {
 										this.sendSuccessButSaveError(true);
 										let msg = i18n('COMPOSE/SAVED_ERROR_ON_SEND');
-										if (data?.ErrorMessageAdditional) {
+										if (data?.messageAdditional) {
-											msg = msg + "\n" + data?.ErrorMessageAdditional;
+											msg = msg + "\n" + data?.messageAdditional;
 										}
 										this.savedErrorDesc(msg);
 									} else {
@@ -1151,7 +1151,7 @@ export class ComposePopupView extends AbstractViewPopup {
 			.on('onComplete', (id, result, data) => {
 				const attachment = this.getAttachmentById(id),
 					response = data?.Result || {},
-					errorCode = response.ErrorCode,
+					errorCode = response.code,
 					attachmentJson = result && response.Attachment;
 
 				let error = '';
@@ -1167,7 +1167,7 @@ export class ComposePopupView extends AbstractViewPopup {
 							.waiting(false)
 							.uploading(false)
 							.complete(true)
-							.error(error + '\n' + response.ErrorMessage);
+							.error(error + '\n' + response.message);
 					} else if (attachmentJson) {
 						attachment
 							.waiting(false)

dev/View/Popup/Contacts.js

@@ -116,7 +116,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 			Remote.request('ContactsDelete',
 				(iError, oData) => {
 					if (iError) {
-						alert(oData?.ErrorMessage || getNotification(iError));
+						alert(oData?.message || getNotification(iError));
 					} else {
 						const page = this.contactsPage();
 						if (page > Math.max(1, Math.ceil((this.contactsCount() - count) / CONTACTS_PER_PAGE))) {
@@ -181,7 +181,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 			Remote.request('ContactSave',
 				(iError, oData) => {
 					if (iError) {
-						alert(oData?.ErrorMessage || getNotification(iError));
+						alert(oData?.message || getNotification(iError));
 					} else if (oData.Result.ResultID) {
 						if (contact.id()) {
 							contact.id(oData.Result.ResultID);
@@ -245,7 +245,7 @@ export class ContactsPopupView extends AbstractViewPopup {
 
 				if (iError) {
 //					console.error(data);
-					alert(data?.ErrorMessage || getNotification(iError));
+					alert(data?.message || getNotification(iError));
 				} else if (arrayLength(data.Result.List)) {
 					data.Result.List.forEach(item => {
 						item = ContactModel.reviveFromJson(item);

dev/View/Popup/Identity.js

@@ -54,7 +54,7 @@ export class IdentityPopupView extends AbstractViewPopup {
 						identity.smimeKey(oData.Result.pkey);
 						identity.smimeCertificate(oData.Result.x509);
 					} else {
-						this.submitError(oData.ErrorMessage);
+						this.submitError(oData.message);
 					}
 				}, {
 					name: identity.name(),
@@ -81,7 +81,7 @@ export class IdentityPopupView extends AbstractViewPopup {
 					if (oData.Result) {
 						identity.smimeKey(oData.Result);
 					} else {
-						this.submitError(oData.ErrorMessage);
+						this.submitError(oData.message);
 					}
 				}, {
 					privateKey: identity.smimeKey(),

dev/View/Popup/OpenPgpImport.js

@@ -35,7 +35,7 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 		const fn = () => Remote.request('PgpSearchKey',
 			(iError, oData) => {
 				if (iError) {
-					this.key(oData.ErrorMessage);
+					this.key(oData.message);
 				} else {
 					this.key(oData.Result);
 				}

dev/View/Popup/SMimeImport.js

@@ -29,8 +29,8 @@ export class SMimeImportPopupView extends AbstractViewPopup {
 				(iError, oData) => {
 					if (iError) {
 						this.pemError(true);
-						this.pemErrorMessage(getNotification(iError, oData?.ErrorMessage));
+						this.pemErrorMessage(getNotification(iError, oData?.message));
-//						oData?.ErrorMessageAdditional;
+//						oData?.messageAdditional;
 					} else {
 						this.close();
 					}

dev/View/User/Login.js

@@ -118,9 +118,9 @@ export class LoginUserView extends AbstractViewLogin {
 						if (Notifications.InvalidInputArgument == iError) {
 							iError = Notifications.AuthError;
 						}
-						this.submitError(getNotification(iError, oData?.ErrorMessage,
+						this.submitError(getNotification(iError, oData?.message,
 							Notifications.UnknownError));
-						this.submitErrorAdditional(oData?.ErrorMessageAdditional || oData?.message);
+						this.submitErrorAdditional(oData?.messageAdditional || oData?.message);
 					} else {
 						rl.setData(oData.Result);
 					}

dev/View/User/SystemDropDown.js

@@ -59,7 +59,7 @@ export class SystemDropDownUserView extends AbstractViewRight {
 				(iError/*, oData*/) => {
 					if (iError) {
 						AccountUserStore.loading(false);
-						alert(getNotification(iError).replace('%EMAIL%', email));
+						alert('Account error: ' + getNotification(iError).replace('%EMAIL%', email));
 						if (account.isAdditional()) {
 							showScreenPopup(AccountPopupView, [account]);
 						}

dev/boot.js

@@ -123,9 +123,9 @@ window.rl = {
 					return Promise.reject(Notifications.JsonParse);
 					return {
 						Result: false,
-						ErrorCode: 952, // Notifications.JsonParse
+						code: 952, // Notifications.JsonParse
-						ErrorMessage: e.message,
+						message: e.message,
-						ErrorMessageAdditional: data
+						messageAdditional: data
 					}
 				}
 				*/

dev/sieve.js

@@ -57,7 +57,7 @@ window.Sieve = {
 		Remote.request('FiltersScriptDelete',
 			(iError, data) =>
 				iError
-					? setError(data?.ErrorMessageAdditional || getNotification(iError))
+					? setError(data?.messageAdditional || getNotification(iError))
 					: scripts.remove(script)
 			,
 			{name:script.name()}
@@ -69,7 +69,7 @@ window.Sieve = {
 		Remote.request('FiltersScriptActivate',
 			(iError, data) =>
 				iError
-					? setError(data?.ErrorMessageAdditional || iError)
+					? setError(data?.messageAdditional || iError)
 					: scripts.forEach(script => script.active(script.name() === name))
 			,
 			{name:name}

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

@@ -828,7 +828,7 @@ class Actions
 			$sError = Enumerations\UploadError::getUserMessage($iError, $iClientError);
 
 			if (!empty($sError)) {
-				$aResponse['ErrorCode'] = $iClientError;
+				$aResponse['code'] = $iClientError;
 				$aResponse['Error'] = $sError;
 			}
 		}

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

@@ -13,11 +13,11 @@ trait Response
 	public function DefaultResponse($mResult, array $aAdditionalParams = array(), string $sActionName = '') : array
 	{
 		if (false === $mResult) {
-			if (!isset($aAdditionalParams['ErrorCode'])) {
+			if (!isset($aAdditionalParams['code'])) {
-				$aAdditionalParams['ErrorCode'] = 0;
+				$aAdditionalParams['code'] = 0;
 			}
-			if (!isset($aAdditionalParams['ErrorMessage'])) {
+			if (!isset($aAdditionalParams['message'])) {
-				$aAdditionalParams['ErrorMessage'] = '';
+				$aAdditionalParams['message'] = '';
 			}
 		}
 
@@ -36,9 +36,9 @@ trait Response
 	public function FalseResponse(int $iErrorCode = 0, string $sErrorMessage = '', string $sAdditionalErrorMessage = '') : array
 	{
 		return $this->DefaultResponse(false, [
-			'ErrorCode' => $iErrorCode,
+			'code' => $iErrorCode,
-			'ErrorMessage' => $sErrorMessage,
+			'message' => $sErrorMessage,
-			'ErrorMessageAdditional' => $sAdditionalErrorMessage
+			'messageAdditional' => $sAdditionalErrorMessage
 		]);
 	}
 
@@ -62,9 +62,9 @@ trait Response
 		$this->logException($oException->getPrevious() ?: $oException);
 
 		return $this->DefaultResponse(false, [
-			'ErrorCode' => $iErrorCode,
+			'code' => $iErrorCode,
-			'ErrorMessage' => $sErrorMessage,
+			'message' => $sErrorMessage,
-			'ErrorMessageAdditional' => $sErrorMessageAdditional,
+			'messageAdditional' => $sErrorMessageAdditional,
 			'ExceptionCode' => $iExceptionCode
 		]);
 	}

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

@@ -94,14 +94,20 @@ class ServiceActions
 				throw new Exceptions\ClientException(Notifications::InvalidInputArgument, null, 'Action unknown');
 			}
 
+			if ('Logout' !== $sAction) {
 				$token = Utils::GetCsrfToken();
 				if (isset($_SERVER['HTTP_X_SM_TOKEN'])) {
 					if ($_SERVER['HTTP_X_SM_TOKEN'] !== $token) {
+						$sEmail = $this->oActions->getAccountFromToken(false)->Email();
+						$this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERROR, 'Token');
 						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'HTTP Token mismatch');
 					}
 				} else if ($this->oHttp->IsPost()) {
 					if (empty($_POST['XToken']) || $_POST['XToken'] !== $token) {
-					throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken Token mismatch');
+						$sEmail = $this->oActions->getAccountFromToken(false)->Email();
+						$this->oActions->logWrite("{$_POST['XToken']} !== {$token} for {$sEmail}", \LOG_ERROR, 'XToken');
+						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken mismatch');
+					}
 				}
 			}
 

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

@@ -70,11 +70,11 @@ class Utils
 	{
 		$oActions = \RainLoop\Api::Actions();
 		$oAccount = $oActions->getAccountFromToken(false);
+//		$oAccount = $oActions->getMainAccountFromToken(false);
 		if ($oAccount) {
+			if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
 				return '2-' . \sha1(APP_SALT.$oAccount->Hash());
 			}
-		$oAccount = $oActions->getMainAccountFromToken(false);
-		if ($oAccount) {
 			return '1-' . \sha1(APP_SALT.$oAccount->Hash());
 		}
 		$sToken = \SnappyMail\Cookies::get(self::CONNECTION_TOKEN);
@@ -82,7 +82,7 @@ class Utils
 			$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
 			\SnappyMail\Cookies::set(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
 		}
-		return \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
+		return '0-' . \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
 	}
 
 	public static function GetCsrfToken() : string