change AbstractFetchRemote with a better structure

dev/Remote/AbstractFetch.js

@@ -125,7 +125,7 @@ export class AbstractFetchRemote
 	 * @param {string=} sGetAdd = ''
 	 * @param {Array=} aAbortActions = []
 	 */
-	defaultRequest(fCallback, sAction, params, iTimeout, sGetAdd, abortActions) {
+	request(sAction, fCallback, params, iTimeout, sGetAdd, abortActions) {
 		params = params || {};
 
 		const start = Date.now();
@@ -184,24 +184,14 @@ export class AbstractFetchRemote
 	 * @param {?Function} fCallback
 	 */
 	noop(fCallback) {
-		this.defaultRequest(fCallback, 'Noop');
+		this.request('Noop', fCallback);
 	}
 
 	/**
 	 * @param {?Function} fCallback
 	 */
 	getPublicKey(fCallback) {
-		this.defaultRequest(fCallback, 'GetPublicKey');
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sVersion
-	 */
-	jsVersion(fCallback, sVersion) {
-		this.defaultRequest(fCallback, 'Version', {
-			Version: sVersion
-		});
+		this.request('GetPublicKey', fCallback);
 	}
 
 	fastResolve(mData) {
@@ -217,7 +207,7 @@ export class AbstractFetchRemote
 		}
 	}
 
-	postRequest(action, fTrigger, params, timeOut) {
+	post(action, fTrigger, params, timeOut) {
 		this.setTrigger(fTrigger, true);
 		return fetchJSON(action, '', params, pInt(timeOut, 30000),
 			data => {

dev/Remote/Admin/Fetch.js

@@ -7,7 +7,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {string} sPassword
 	 */
 	adminLogin(fCallback, sLogin, sPassword, sCode) {
-		this.defaultRequest(fCallback, 'AdminLogin', {
+		this.request('AdminLogin', fCallback, {
 			Login: sLogin,
 			Password: sPassword,
 			TOTP: sCode
@@ -18,7 +18,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {?Function} fCallback
 	 */
 	adminLogout(fCallback) {
-		this.defaultRequest(fCallback, 'AdminLogout');
+		this.request('AdminLogout', fCallback);
 	}
 
 	/**
@@ -26,7 +26,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {?} oData
 	 */
 	saveAdminConfig(fCallback, oData) {
-		this.defaultRequest(fCallback, 'AdminSettingsUpdate', oData);
+		this.request('AdminSettingsUpdate', fCallback, oData);
 	}
 
 	/**
@@ -34,7 +34,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {boolean=} bIncludeAliases = true
 	 */
 	domainList(fCallback, bIncludeAliases = true) {
-		this.defaultRequest(fCallback, 'AdminDomainList', {
+		this.request('AdminDomainList', fCallback, {
 			IncludeAliases: bIncludeAliases ? 1 : 0
 		});
 	}
@@ -43,7 +43,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {?Function} fCallback
 	 */
 	packagesList(fCallback) {
-		this.defaultRequest(fCallback, 'AdminPackagesList');
+		this.request('AdminPackagesList', fCallback);
 	}
 
 	/**
@@ -51,9 +51,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {Object} oPackage
 	 */
 	packageInstall(fCallback, oPackage) {
-		this.defaultRequest(
-			fCallback,
-			'AdminPackageInstall',
+		this.request('AdminPackageInstall', fCallback,
 			{
 				Id: oPackage.id,
 				Type: oPackage.type,
@@ -68,7 +66,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {Object} oPackage
 	 */
 	packageDelete(fCallback, oPackage) {
-		this.defaultRequest(fCallback, 'AdminPackageDelete', {
+		this.request('AdminPackageDelete', fCallback, {
 			Id: oPackage.id
 		});
 	}
@@ -78,7 +76,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {string} sName
 	 */
 	domain(fCallback, sName) {
-		this.defaultRequest(fCallback, 'AdminDomainLoad', {
+		this.request('AdminDomainLoad', fCallback, {
 			Name: sName
 		});
 	}
@@ -88,7 +86,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {string} sId
 	 */
 	plugin(fCallback, sId) {
-		this.defaultRequest(fCallback, 'AdminPluginLoad', {
+		this.request('AdminPluginLoad', fCallback, {
 			Id: sId
 		});
 	}
@@ -98,7 +96,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {string} sName
 	 */
 	domainDelete(fCallback, sName) {
-		this.defaultRequest(fCallback, 'AdminDomainDelete', {
+		this.request('AdminDomainDelete', fCallback, {
 			Name: sName
 		});
 	}
@@ -109,7 +107,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {boolean} bDisabled
 	 */
 	domainDisable(fCallback, sName, bDisabled) {
-		this.defaultRequest(fCallback, 'AdminDomainDisable', {
+		this.request('AdminDomainDisable', fCallback, {
 			Name: sName,
 			Disabled: bDisabled ? 1 : 0
 		});
@@ -120,7 +118,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {Object} oConfig
 	 */
 	pluginSettingsUpdate(fCallback, oConfig) {
-		this.defaultRequest(fCallback, 'AdminPluginSettingsUpdate', oConfig);
+		this.request('AdminPluginSettingsUpdate', fCallback, oConfig);
 	}
 
 	/**
@@ -129,21 +127,21 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {boolean} bDisabled
 	 */
 	pluginDisable(fCallback, sId, bDisabled) {
-		this.defaultRequest(fCallback, 'AdminPluginDisable', {
+		this.request('AdminPluginDisable', fCallback, {
 			Id: sId,
 			Disabled: bDisabled ? 1 : 0
 		});
 	}
 
 	createDomainAlias(fCallback, sName, sAlias) {
-		this.defaultRequest(fCallback, 'AdminDomainAliasSave', {
+		this.request('AdminDomainAliasSave', fCallback, {
 			Name: sName,
 			Alias: sAlias
 		});
 	}
 
 	createOrUpdateDomain(fCallback, oDomain) {
-		this.defaultRequest(fCallback, 'AdminDomainSave', {
+		this.request('AdminDomainSave', fCallback, {
 			Create: oDomain.edit() ? 0 : 1,
 			Name: oDomain.name(),
 
@@ -170,7 +168,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	}
 
 	testConnectionForDomain(fCallback, oDomain) {
-		this.defaultRequest(fCallback, 'AdminDomainTest', {
+		this.request('AdminDomainTest', fCallback, {
 			Name: oDomain.name(),
 			IncHost: oDomain.imapServer(),
 			IncPort: oDomain.imapPort(),
@@ -192,7 +190,7 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 	 * @param {?} oData
 	 */
 	testContacts(fCallback, oData) {
-		this.defaultRequest(fCallback, 'AdminContactsTest', oData);
+		this.request('AdminContactsTest', fCallback, oData);
 	}
 
 }

dev/Remote/User/Fetch.js

@@ -35,135 +35,6 @@ const urlSafeJSON = data => btoa(encodeURIComponent(JSON.stringify(data)).replac
 
 class RemoteUserFetch extends AbstractFetchRemote {
 
-	/**
-	 * @param {?Function} fCallback
-	 */
-	contactsSync(fCallback) {
-		this.defaultRequest(fCallback, 'ContactsSync', null, 200000);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {boolean} bEnable
-	 * @param {string} sUrl
-	 * @param {string} sUser
-	 * @param {string} sPassword
-	 */
-	saveContactsSyncData(fCallback, bEnable, sUrl, sUser, sPassword) {
-		this.defaultRequest(fCallback, 'SaveContactsSyncData', {
-			Enable: bEnable ? 1 : 0,
-			Url: sUrl,
-			User: sUser,
-			Password: sPassword
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sEmail
-	 * @param {string} sPassword
-	 * @param {boolean=} bNew
-	 */
-	accountSetup(fCallback, sEmail, sPassword, bNew = true) {
-		this.defaultRequest(fCallback, 'AccountSetup', {
-			Email: sEmail,
-			Password: sPassword,
-			New: bNew ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sEmailToDelete
-	 */
-	accountDelete(fCallback, sEmailToDelete) {
-		this.defaultRequest(fCallback, 'AccountDelete', {
-			EmailToDelete: sEmailToDelete
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Array} aAccounts
-	 * @param {Array} aIdentities
-	 */
-	accountsAndIdentitiesSortOrder(fCallback, aAccounts, aIdentities) {
-		this.defaultRequest(fCallback, 'AccountsAndIdentitiesSortOrder', {
-			Accounts: aAccounts,
-			Identities: aIdentities
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sId
-	 * @param {string} sEmail
-	 * @param {string} sName
-	 * @param {string} sReplyTo
-	 * @param {string} sBcc
-	 * @param {string} sSignature
-	 * @param {boolean} bSignatureInsertBefore
-	 */
-	identityUpdate(fCallback, sId, sEmail, sName, sReplyTo, sBcc, sSignature, bSignatureInsertBefore) {
-		this.defaultRequest(fCallback, 'IdentityUpdate', {
-			Id: sId,
-			Email: sEmail,
-			Name: sName,
-			ReplyTo: sReplyTo,
-			Bcc: sBcc,
-			Signature: sSignature,
-			SignatureInsertBefore: bSignatureInsertBefore ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sIdToDelete
-	 */
-	identityDelete(fCallback, sIdToDelete) {
-		this.defaultRequest(fCallback, 'IdentityDelete', {
-			IdToDelete: sIdToDelete
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	accountsAndIdentities(fCallback) {
-		this.defaultRequest(fCallback, 'AccountsAndIdentities');
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {SieveScriptModel} script
-	 */
-	filtersScriptSave(fCallback, script) {
-		this.defaultRequest(fCallback, 'FiltersScriptSave', script.toJson());
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} name
-	 */
-	filtersScriptActivate(fCallback, name) {
-		this.defaultRequest(fCallback, 'FiltersScriptActivate', {name:name});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} name
-	 */
-	filtersScriptDelete(fCallback, name) {
-		this.defaultRequest(fCallback, 'FiltersScriptDelete', {name:name});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	filtersGet(fCallback) {
-		this.defaultRequest(fCallback, 'Filters', {});
-	}
-
 	/**
 	 * @param {Function} fCallback
 	 * @param {object} params
@@ -199,9 +70,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 			params = {};
 		}
 
-		this.defaultRequest(
+		this.request('MessageList',
 			fCallback,
-			'MessageList',
 			params,
 			30000,
 			sGetAdd,
@@ -209,21 +79,6 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		);
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Array} aDownloads
-	 */
-	messageUploadAttachments(fCallback, aDownloads) {
-		this.defaultRequest(
-			fCallback,
-			'MessageUploadAttachments',
-			{
-				Attachments: aDownloads
-			},
-			999000
-		);
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullName
@@ -235,9 +90,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		iUid = pInt(iUid);
 
 		if (getFolderFromCacheList(sFolderFullName) && 0 < iUid) {
-			this.defaultRequest(
+			this.request('Message',
 				fCallback,
-				'Message',
 				{},
 				null,
 				'Message/' +
@@ -258,38 +112,6 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		return false;
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Array} aExternals
-	 */
-	composeUploadExternals(fCallback, aExternals) {
-		this.defaultRequest(
-			fCallback,
-			'ComposeUploadExternals',
-			{
-				Externals: aExternals
-			},
-			999000
-		);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sUrl
-	 * @param {string} sAccessToken
-	 */
-	composeUploadDrive(fCallback, sUrl, sAccessToken) {
-		this.defaultRequest(
-			fCallback,
-			'ComposeUploadDrive',
-			{
-				AccessToken: sAccessToken,
-				Url: sUrl
-			},
-			999000
-		);
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} folder
@@ -321,7 +143,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		}
 
 		if (request) {
-			this.defaultRequest(fCallback, 'FolderInformation', {
+			this.request('FolderInformation', fCallback, {
 				Folder: folder,
 				FlagsUids: isArray(uids) ? uids : [],
 				UidNext: getFolderInboxName() === folder ? getFolderUidNext(folder) : 0
@@ -331,51 +153,6 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		}
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Array} aFolders
-	 */
-	folderInformationMultiply(fCallback, aFolders) {
-		this.defaultRequest(fCallback, 'FolderInformationMultiply', {
-			Folders: aFolders
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	logout(fCallback) {
-		this.defaultRequest(fCallback, 'Logout');
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullName
-	 * @param {Array} aUids
-	 * @param {boolean} bSetFlagged
-	 */
-	messageSetFlagged(fCallback, sFolderFullName, aUids, bSetFlagged) {
-		this.defaultRequest(fCallback, 'MessageSetFlagged', {
-			Folder: sFolderFullName,
-			Uids: aUids.join(','),
-			SetAction: bSetFlagged ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullName
-	 * @param {Array} aUids
-	 * @param {boolean} bSetSeen
-	 */
-	messageSetSeen(fCallback, sFolderFullName, aUids, bSetSeen) {
-		this.defaultRequest(fCallback, 'MessageSetSeen', {
-			Folder: sFolderFullName,
-			Uids: aUids.join(','),
-			SetAction: bSetSeen ? 1 : 0
-		});
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullName
@@ -383,61 +160,19 @@ class RemoteUserFetch extends AbstractFetchRemote {
 	 * @param {Array} aThreadUids = null
 	 */
 	messageSetSeenToAll(fCallback, sFolderFullName, bSetSeen, aThreadUids = null) {
-		this.defaultRequest(fCallback, 'MessageSetSeenToAll', {
+		this.request('MessageSetSeenToAll', fCallback, {
 			Folder: sFolderFullName,
 			SetAction: bSetSeen ? 1 : 0,
 			ThreadUids: aThreadUids ? aThreadUids.join(',') : ''
 		});
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oData
-	 */
-	saveMessage(fCallback, oData) {
-		this.defaultRequest(fCallback, 'SaveMessage', oData, 200000);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sMessageFolder
-	 * @param {number} iMessageUid
-	 * @param {string} sReadReceipt
-	 * @param {string} sSubject
-	 * @param {string} sText
-	 */
-	sendReadReceiptMessage(fCallback, sMessageFolder, iMessageUid, sReadReceipt, sSubject, sText) {
-		this.defaultRequest(fCallback, 'SendReadReceiptMessage', {
-			MessageFolder: sMessageFolder,
-			MessageUid: iMessageUid,
-			ReadReceipt: sReadReceipt,
-			Subject: sSubject,
-			Text: sText
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oData
-	 */
-	sendMessage(fCallback, oData) {
-		this.defaultRequest(fCallback, 'SendMessage', oData, 30000);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oData
-	 */
-	saveSystemFolders(fCallback, oData) {
-		this.defaultRequest(fCallback, 'SystemFoldersUpdate', oData);
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {Object} oData
 	 */
 	saveSettings(fCallback, oData) {
-		this.defaultRequest(fCallback, 'SettingsUpdate', oData);
+		this.request('SettingsUpdate', fCallback, oData);
 	}
 
 	/**
@@ -451,179 +186,27 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		});
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullName
-	 */
-	folderClear(fCallback, sFolderFullName) {
-		this.defaultRequest(fCallback, 'FolderClear', {
-			Folder: sFolderFullName
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullName
-	 * @param {boolean} bSubscribe
-	 */
-	folderSetSubscribe(fCallback, sFolderFullName, bSubscribe) {
-		this.defaultRequest(fCallback, 'FolderSubscribe', {
-			Folder: sFolderFullName,
-			Subscribe: bSubscribe ? 1 : 0
-		});
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullName
 	 * @param {boolean} bSubscribe
 	 */
 	folderSetMetadata(fCallback, sFolderFullName, sKey, sValue) {
-		this.defaultRequest(fCallback, 'FolderSetMetadata', {
+		this.request('FolderSetMetadata', fCallback, {
 			Folder: sFolderFullName,
 			Key: sKey,
 			Value: sValue
 		});
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolderFullName
-	 * @param {boolean} bCheckable
-	 */
-	folderSetCheckable(fCallback, sFolderFullName, bCheckable) {
-		this.defaultRequest(fCallback, 'FolderCheckable', {
-			Folder: sFolderFullName,
-			Checkable: bCheckable ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolder
-	 * @param {string} sToFolder
-	 * @param {Array} aUids
-	 * @param {string=} sLearning
-	 * @param {boolean=} bMarkAsRead
-	 */
-	messagesMove(fCallback, sFolder, sToFolder, aUids, sLearning, bMarkAsRead) {
-		this.defaultRequest(
-			fCallback,
-			'MessageMove',
-			{
-				FromFolder: sFolder,
-				ToFolder: sToFolder,
-				Uids: aUids.join(','),
-				MarkAsRead: bMarkAsRead ? 1 : 0,
-				Learning: sLearning || ''
-			},
-			null,
-			'',
-			['MessageList']
-		);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolder
-	 * @param {string} sToFolder
-	 * @param {Array} aUids
-	 */
-	messagesCopy(fCallback, sFolder, sToFolder, aUids) {
-		this.defaultRequest(fCallback, 'MessageCopy', {
-			FromFolder: sFolder,
-			ToFolder: sToFolder,
-			Uids: aUids.join(',')
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sFolder
-	 * @param {Array} aUids
-	 */
-	messagesDelete(fCallback, sFolder, aUids) {
-		this.defaultRequest(
-			fCallback,
-			'MessageDelete',
-			{
-				Folder: sFolder,
-				Uids: aUids.join(',')
-			},
-			null,
-			'',
-			['MessageList']
-		);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	appDelayStart(fCallback) {
-		this.defaultRequest(fCallback, 'AppDelayStart');
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	quota(fCallback) {
-		this.defaultRequest(fCallback, 'Quota');
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {number} iOffset
-	 * @param {number} iLimit
-	 * @param {string} sSearch
-	 */
-	contacts(fCallback, iOffset, iLimit, sSearch) {
-		this.defaultRequest(
-			fCallback,
-			'Contacts',
-			{
-				Offset: iOffset,
-				Limit: iLimit,
-				Search: sSearch
-			},
-			null,
-			'',
-			['Contacts']
-		);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sRequestUid
-	 * @param {string} sUid
-	 * @param {Array} aProperties
-	 */
-	contactSave(fCallback, sRequestUid, sUid, aProperties) {
-		this.defaultRequest(fCallback, 'ContactSave', {
-			RequestUid: sRequestUid,
-			Uid: sUid,
-			Properties: aProperties
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Array} aUids
-	 */
-	contactsDelete(fCallback, aUids) {
-		this.defaultRequest(fCallback, 'ContactsDelete', {
-			Uids: aUids.join(',')
-		});
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sQuery
 	 * @param {number} iPage
 	 */
 	suggestions(fCallback, sQuery, iPage) {
-		this.defaultRequest(
+		this.request('Suggestions',
 			fCallback,
-			'Suggestions',
 			{
 				Query: sQuery,
 				Page: iPage
@@ -634,19 +217,12 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		);
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 */
-	clearUserBackground(fCallback) {
-		this.defaultRequest(fCallback, 'ClearUserBackground');
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 */
 	foldersReload(fCallback) {
 		this.abort('Folders')
-			.postRequest('Folders', FolderUserStore.foldersLoading)
+			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
 				data = FolderCollectionModel.reviveFromJson(data.Result);
 				data && data.storeIt();
@@ -662,35 +238,16 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		this.foldersTimeout = setTimeout(() => this.foldersReload(), 500);
 	}
 
-	folderDelete(sFolderFullName) {
-		return this.postRequest('FolderDelete', FolderUserStore.foldersDeleting, {
-			Folder: sFolderFullName
-		});
-	}
-
-	folderCreate(sNewFolderName, sParentName) {
-		return this.postRequest('FolderCreate', FolderUserStore.foldersCreating, {
-			Folder: sNewFolderName,
-			Parent: sParentName
-		});
-	}
-
+/*
 	folderMove(sPrevFolderFullName, sNewFolderFullName) {
-		return this.postRequest('FolderMove', FolderUserStore.foldersRenaming, {
+		return this.post('FolderMove', FolderUserStore.foldersRenaming, {
 			Folder: sPrevFolderFullName,
 			NewFolder: sNewFolderFullName
 		});
 	}
-
-	folderRename(sPrevFolderFullName, sNewFolderName) {
-		return this.postRequest('FolderRename', FolderUserStore.foldersRenaming, {
-			Folder: sPrevFolderFullName,
-			NewFolderName: sNewFolderName
-		});
-	}
-
+*/
 	attachmentsActions(sAction, aHashes, fTrigger) {
-		return this.postRequest('AttachmentsActions', fTrigger, {
+		return this.post('AttachmentsActions', fTrigger, {
 			Do: sAction,
 			Hashes: aHashes
 		});