Also reduce admin remote fetch

dev/Remote/Admin/Fetch.js

@@ -1,25 +1,6 @@
 import { AbstractFetchRemote } from 'Remote/AbstractFetch';
 
 class RemoteAdminFetch extends AbstractFetchRemote {
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sLogin
-	 * @param {string} sPassword
-	 */
-	adminLogin(fCallback, sLogin, sPassword, sCode) {
-		this.request('AdminLogin', fCallback, {
-			Login: sLogin,
-			Password: sPassword,
-			TOTP: sCode
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	adminLogout(fCallback) {
-		this.request('AdminLogout', fCallback);
-	}
 
 	/**
 	 * @param {?Function} fCallback
@@ -29,170 +10,6 @@ class RemoteAdminFetch extends AbstractFetchRemote {
 		this.request('AdminSettingsUpdate', fCallback, oData);
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 * @param {boolean=} bIncludeAliases = true
-	 */
-	domainList(fCallback, bIncludeAliases = true) {
-		this.request('AdminDomainList', fCallback, {
-			IncludeAliases: bIncludeAliases ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 */
-	packagesList(fCallback) {
-		this.request('AdminPackagesList', fCallback);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oPackage
-	 */
-	packageInstall(fCallback, oPackage) {
-		this.request('AdminPackageInstall', fCallback,
-			{
-				Id: oPackage.id,
-				Type: oPackage.type,
-				File: oPackage.file
-			},
-			60000
-		);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oPackage
-	 */
-	packageDelete(fCallback, oPackage) {
-		this.request('AdminPackageDelete', fCallback, {
-			Id: oPackage.id
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sName
-	 */
-	domain(fCallback, sName) {
-		this.request('AdminDomainLoad', fCallback, {
-			Name: sName
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sId
-	 */
-	plugin(fCallback, sId) {
-		this.request('AdminPluginLoad', fCallback, {
-			Id: sId
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sName
-	 */
-	domainDelete(fCallback, sName) {
-		this.request('AdminDomainDelete', fCallback, {
-			Name: sName
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sName
-	 * @param {boolean} bDisabled
-	 */
-	domainDisable(fCallback, sName, bDisabled) {
-		this.request('AdminDomainDisable', fCallback, {
-			Name: sName,
-			Disabled: bDisabled ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {Object} oConfig
-	 */
-	pluginSettingsUpdate(fCallback, oConfig) {
-		this.request('AdminPluginSettingsUpdate', fCallback, oConfig);
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {string} sId
-	 * @param {boolean} bDisabled
-	 */
-	pluginDisable(fCallback, sId, bDisabled) {
-		this.request('AdminPluginDisable', fCallback, {
-			Id: sId,
-			Disabled: bDisabled ? 1 : 0
-		});
-	}
-
-	createDomainAlias(fCallback, sName, sAlias) {
-		this.request('AdminDomainAliasSave', fCallback, {
-			Name: sName,
-			Alias: sAlias
-		});
-	}
-
-	createOrUpdateDomain(fCallback, oDomain) {
-		this.request('AdminDomainSave', fCallback, {
-			Create: oDomain.edit() ? 0 : 1,
-			Name: oDomain.name(),
-
-			IncHost: oDomain.imapServer(),
-			IncPort: oDomain.imapPort(),
-			IncSecure: oDomain.imapSecure(),
-			IncShortLogin: oDomain.imapShortLogin() ? 1 : 0,
-
-			UseSieve: oDomain.useSieve() ? 1 : 0,
-			SieveHost: oDomain.sieveServer(),
-			SievePort: oDomain.sievePort(),
-			SieveSecure: oDomain.sieveSecure(),
-
-			OutHost: oDomain.smtpServer(),
-			OutPort: oDomain.smtpPort(),
-			OutSecure: oDomain.smtpSecure(),
-			OutShortLogin: oDomain.smtpShortLogin() ? 1 : 0,
-			OutAuth: oDomain.smtpAuth() ? 1 : 0,
-			OutSetSender: oDomain.smtpSetSender() ? 1 : 0,
-			OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0,
-
-			WhiteList: oDomain.whiteList()
-		});
-	}
-
-	testConnectionForDomain(fCallback, oDomain) {
-		this.request('AdminDomainTest', fCallback, {
-			Name: oDomain.name(),
-			IncHost: oDomain.imapServer(),
-			IncPort: oDomain.imapPort(),
-			IncSecure: oDomain.imapSecure(),
-			UseSieve: oDomain.useSieve() ? 1 : 0,
-			SieveHost: oDomain.sieveServer(),
-			SievePort: oDomain.sievePort(),
-			SieveSecure: oDomain.sieveSecure(),
-			OutHost: oDomain.smtpServer(),
-			OutPort: oDomain.smtpPort(),
-			OutSecure: oDomain.smtpSecure(),
-			OutAuth: oDomain.smtpAuth() ? 1 : 0,
-			OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0
-		});
-	}
-
-	/**
-	 * @param {?Function} fCallback
-	 * @param {?} oData
-	 */
-	testContacts(fCallback, oData) {
-		this.request('AdminContactsTest', fCallback, oData);
-	}
-
 }
 
 export default new RemoteAdminFetch();

dev/Settings/Admin/Contacts.js

@@ -116,7 +116,8 @@ export class ContactsAdminSettings /*extends AbstractViewSettings*/ {
 		this.testContactsErrorMessage('');
 		this.testing(true);
 
-		Remote.testContacts((iError, data) => {
+		Remote.request('AdminContactsTest',
+			(iError, data) => {
 				this.testContactsSuccess(false);
 				this.testContactsError(false);
 				this.testContactsErrorMessage('');
@@ -138,7 +139,8 @@ export class ContactsAdminSettings /*extends AbstractViewSettings*/ {
 				ContactsPdoDsn: this.pdoDsn(),
 				ContactsPdoUser: this.pdoUser(),
 				ContactsPdoPassword: this.pdoPassword()
-		});
+			}
+		);
 	}
 
 	onShow() {

dev/Settings/Admin/Domains.js

@@ -26,19 +26,29 @@ export class DomainsAdminSettings /*extends AbstractViewSettings*/ {
 	deleteDomain(domain) {
 		DomainAdminStore.remove(domain);
 		Remote.domainDelete(DomainAdminStore.fetch, domain.name);
+		Remote.request('AdminDomainDelete', DomainAdminStore.fetch, {
+			Name: domain.name
+		});
 	}
 
 	disableDomain(domain) {
 		domain.disabled(!domain.disabled());
-		Remote.domainDisable(DomainAdminStore.fetch, domain.name, domain.disabled());
+		Remote.request('AdminDomainDisable', DomainAdminStore.fetch, {
+			Name: domain.name,
+			Disabled: domain.disabled() ? 1 : 0
+		});
 	}
 
 	onBuild(oDom) {
 		oDom.addEventListener('click', event => {
 			let el = event.target.closestWithin('.b-admin-domains-list-table .e-action', oDom);
-			el && ko.dataFor(el) && Remote.domain(
+			el && ko.dataFor(el) && Remote.request('AdminDomainLoad',
-				(iError, oData) => iError || showScreenPopup(DomainPopupView, [oData.Result]), ko.dataFor(el).name
+				(iError, oData) => iError || showScreenPopup(DomainPopupView, [oData.Result]),
+				{
+					Name: ko.dataFor(el).name
+				}
 			);
+
 		});
 
 		DomainAdminStore.fetch();

dev/Settings/Admin/Packages.js

@@ -44,7 +44,12 @@ export class PackagesAdminSettings /*extends AbstractViewSettings*/ {
 			// configurePlugin
 			let el = event.target.closestWithin('.package-configure', oDom),
 				data = el ? ko.dataFor(el) : 0;
-			data && Remote.plugin((iError, data) => iError || showScreenPopup(PluginPopupView, [data.Result]), data.id)
+			data && Remote.request('AdminPluginLoad',
+				(iError, data) => iError || showScreenPopup(PluginPopupView, [data.Result]),
+				{
+					Id: data.id
+				}
+			);
 			// disablePlugin
 			el = event.target.closestWithin('.package-active', oDom);
 			data = el ? ko.dataFor(el) : 0;
@@ -77,23 +82,37 @@ export class PackagesAdminSettings /*extends AbstractViewSettings*/ {
 	deletePackage(packageToDelete) {
 		if (packageToDelete) {
 			packageToDelete.loading(true);
-			Remote.packageDelete(this.requestHelper(packageToDelete, false), packageToDelete);
+			Remote.request('AdminPackageDelete',
+				this.requestHelper(packageToDelete, false),
+				{
+					Id: packageToDelete.id
+				}
+			);
 		}
 	}
 
 	installPackage(packageToInstall) {
 		if (packageToInstall) {
 			packageToInstall.loading(true);
-			Remote.packageInstall(this.requestHelper(packageToInstall, true), packageToInstall);
+			Remote.request('AdminPackageInstall',
+				this.requestHelper(packageToInstall, true),
+				{
+					Id: packageToInstall.id,
+					Type: packageToInstall.type,
+					File: packageToInstall.file
+				},
+				60000
+			);
 		}
 	}
 
 	disablePlugin(plugin) {
-		let b = plugin.enabled();
+		let disable = plugin.enabled();
-		plugin.enabled(!b);
+		plugin.enabled(!disable);
-		Remote.pluginDisable((iError, data) => {
+		Remote.request('AdminPluginDisable',
+		(iError, data) => {
 				if (iError) {
-				plugin.enabled(b);
+					plugin.enabled(disable);
 					this.packagesError(
 						(Notification.UnsupportedPluginPackage === iError && data && data.ErrorMessage)
 						? data.ErrorMessage
@@ -101,7 +120,11 @@ export class PackagesAdminSettings /*extends AbstractViewSettings*/ {
 					);
 				}
 //				PackageAdminStore.fetch();
-		}, plugin.id, b);
+			}, {
+				Id: plugin.id,
+				Disabled: disable ? 1 : 0
+			}
+		);
 	}
 
 }

dev/Stores/Admin/Domain.js

@@ -7,7 +7,8 @@ DomainAdminStore.loading = ko.observable(false);
 
 DomainAdminStore.fetch = () => {
 	DomainAdminStore.loading(true);
-	Remote.domainList((iError, data) => {
+	Remote.request('AdminDomainList',
+		(iError, data) => {
 			DomainAdminStore.loading(false);
 			if (!iError) {
 				DomainAdminStore(
@@ -19,5 +20,8 @@ DomainAdminStore.fetch = () => {
 					}))
 				);
 			}
+		}, {
+			IncludeAliases: 1
 		});
+	Remote.domainList();
 };

dev/Stores/Admin/Package.js

@@ -12,7 +12,7 @@ PackageAdminStore.error = ko.observable('');
 
 PackageAdminStore.fetch = () => {
 	PackageAdminStore.loading(true);
-	Remote.packagesList((iError, data) => {
+	Remote.request('AdminPackagesList', (iError, data) => {
 		PackageAdminStore.loading(false);
 		if (iError) {
 			PackageAdminStore.real(false);

dev/View/Admin/Login.js

@@ -43,7 +43,7 @@ class LoginAdminView extends AbstractViewLogin {
 		if (valid) {
 			this.submitRequest(true);
 
-			Remote.adminLogin(
+			Remote.request('AdminLogin',
 				(iError, oData) => {
 					if (iError) {
 						this.submitRequest(false);
@@ -51,11 +51,11 @@ class LoginAdminView extends AbstractViewLogin {
 					} else {
 						rl.setData(oData.Result);
 					}
-				},
+				}, {
-				name,
+					Login: name,
-				pass,
+					Password: pass,
-				this.totp()
+					TOTP: this.totp()
-			);
+				});
 		}
 
 		return valid;

dev/View/Admin/Settings/Pane.js

@@ -21,7 +21,7 @@ class PaneSettingsAdminView extends AbstractViewRight {
 	}
 
 	logoutClick() {
-		Remote.adminLogout(() => rl.logoutReload());
+		Remote.request('AdminLogout', () => rl.logoutReload());
 	}
 }
 

dev/View/Popup/Domain.js

@@ -8,6 +8,25 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
 import { DomainAdminStore } from 'Stores/Admin/Domain';
 
+const domainToParams = oDomain => ({
+			Name: oDomain.name(),
+
+			IncHost: oDomain.imapServer(),
+			IncPort: oDomain.imapPort(),
+			IncSecure: oDomain.imapSecure(),
+
+			UseSieve: oDomain.useSieve() ? 1 : 0,
+			SieveHost: oDomain.sieveServer(),
+			SievePort: oDomain.sievePort(),
+			SieveSecure: oDomain.sieveSecure(),
+
+			OutHost: oDomain.smtpServer(),
+			OutPort: oDomain.smtpPort(),
+			OutSecure: oDomain.smtpSecure(),
+			OutAuth: oDomain.smtpAuth() ? 1 : 0,
+			OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0
+		});
+
 class DomainPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Domain');
@@ -144,9 +163,18 @@ class DomainPopupView extends AbstractViewPopup {
 
 	createOrAddCommand() {
 		this.saving(true);
-		Remote.createOrUpdateDomain(
+		Remote.request('AdminDomainSave',
 			this.onDomainCreateOrSaveResponse.bind(this),
-			this
+			Object.assign(domainToParams(this), {
+				Create: this.edit() ? 0 : 1,
+
+				IncShortLogin: this.imapShortLogin() ? 1 : 0,
+
+				OutShortLogin: this.smtpShortLogin() ? 1 : 0,
+				OutSetSender: this.smtpSetSender() ? 1 : 0,
+
+				WhiteList: this.whiteList()
+			})
 		);
 	}
 
@@ -157,7 +185,7 @@ class DomainPopupView extends AbstractViewPopup {
 		this.testingSmtpError(false);
 		this.testing(true);
 
-		Remote.testConnectionForDomain(
+		Remote.request('AdminDomainTest',
 			(iError, oData) => {
 				this.testing(false);
 				if (iError) {
@@ -186,7 +214,7 @@ class DomainPopupView extends AbstractViewPopup {
 					}
 				}
 			},
-			this
+			domainToParams(this)
 		);
 	}
 

dev/View/Popup/DomainAlias.js

@@ -35,7 +35,8 @@ class DomainAliasPopupView extends AbstractViewPopup {
 
 	createCommand() {
 		this.saving(true);
-		Remote.createDomainAlias(iError => {
+		Remote.request('AdminDomainAliasSave',
+			iError => {
 				this.saving(false);
 				if (iError) {
 					this.savingError(getNotification(iError));
@@ -43,7 +44,10 @@ class DomainAliasPopupView extends AbstractViewPopup {
 					DomainAdminStore.fetch();
 					this.closeCommand();
 				}
-		}, this.name(), this.alias());
+			}, {
+				Name: this.name(),
+				Alias: this.alias()
+			});
 	}
 
 	onShow() {

dev/View/Popup/Plugin.js

@@ -39,7 +39,7 @@ class PluginPopupView extends AbstractViewPopup {
 	}
 
 	saveCommand() {
-		const list = {
+		const oConfig = {
 			Id: this.id(),
 			Settings: {}
 		};
@@ -49,15 +49,15 @@ class PluginPopupView extends AbstractViewPopup {
 			if (false === value || true === value) {
 				value = value ? 1 : 0;
 			}
-			list.Settings[oItem.Name] = value;
+			oConfig.Settings[oItem.Name] = value;
 		});
 
 		this.saveError('');
-		Remote.pluginSettingsUpdate(iError =>
+		Remote.request('AdminPluginSettingsUpdate',
-			iError
+			iError => iError
 				? this.saveError(getNotification(iError))
-				: this.cancelCommand()
+				: this.cancelCommand(),
-		, list);
+			oConfig);
 	}
 
 	onShow(oPlugin) {