Ask old login password on CryptKey decrypt failure, to reseal with new password

dev/App/Admin.js

@@ -11,6 +11,8 @@ import { LoginAdminScreen } from 'Screen/Admin/Login';
 import { startScreens } from 'Knoin/Knoin';
 import { AbstractApp } from 'App/Abstract';
 
+import { AskPopupView } from 'View/Popup/Ask';
+
 export class AdminApp extends AbstractApp {
 	constructor() {
 		super(Remote);
@@ -35,3 +37,16 @@ export class AdminApp extends AbstractApp {
 		}
 	}
 }
+
+AskPopupView.credentials = function(sAskDesc, btnText) {
+	return new Promise(resolve => {
+		this.showModal([
+			sAskDesc,
+			view => resolve({username:view.username(), password:view.passphrase()}),
+			() => resolve(null),
+			true,
+			3,
+			btnText
+		]);
+	});
+};

dev/App/User.js

@@ -86,6 +86,8 @@ export class AppUser extends AbstractApp {
 
 		this.folderList = FolderUserStore.folderList;
 		this.messageList = MessagelistUserStore;
+
+		this.ask = AskPopupView;
 	}
 
 	/**
@@ -248,3 +250,46 @@ export class AppUser extends AbstractApp {
 		showScreenPopup(ComposePopupView, params);
 	}
 }
+
+AskPopupView.password = function(sAskDesc, btnText) {
+	return new Promise(resolve => {
+		this.showModal([
+			sAskDesc,
+			view => resolve({password:view.passphrase(), remember:view.remember()}),
+			() => resolve(null),
+			true,
+			5,
+			btnText
+		]);
+	});
+};
+
+AskPopupView.cryptkey = () => new Promise(resolve => {
+	const fn = () => AskPopupView.showModal([
+		i18n('CRYPTO/ASK_CRYPTKEY_PASS'),
+		view => {
+			let pass = view.passphrase();
+			if (pass) {
+				Remote.post('ResealCryptKey', null, {
+					passphrase: pass
+				}).then(response => {
+					resolve(response?.Result);
+				}).catch(e => {
+					if (111 === e.code) {
+						fn();
+					} else {
+						console.error(e);
+						resolve(null);
+					}
+				});
+			} else {
+				resolve(null);
+			}
+		},
+		() => resolve(null),
+		true,
+		1,
+		i18n('CRYPTO/DECRYPT')
+	]);
+	fn();
+});

dev/Common/Enums.js

@@ -50,6 +50,7 @@ Notifications = {
 	ConnectionError: 104,
 	DomainNotAllowed: 109,
 	AccountNotAllowed: 110,
+	CryptKeyError: 111,
 
 	ContactsSyncError: 140,
 

dev/Remote/AbstractFetch.js

@@ -132,7 +132,7 @@ export class AbstractFetchRemote
 		fetchJSON(sAction, getURL(sGetAdd),
 			sGetAdd ? null : (params || {}),
 			undefined === iTimeout ? 30000 : pInt(iTimeout),
-			data => {
+			async data => {
 				let iError = 0;
 				if (data) {
 /*
@@ -148,6 +148,10 @@ export class AbstractFetchRemote
 					}
 				}
 
+				if (111 === iError && rl.app.ask && await rl.app.ask.cryptkey()) {
+					return this.request(sAction, fCallback, params, iTimeout, sGetAdd);
+				}
+
 				fCallback && fCallback(
 					iError,
 					data,
@@ -185,12 +189,16 @@ export class AbstractFetchRemote
 	post(action, fTrigger, params, timeOut) {
 		this.setTrigger(fTrigger, true);
 		return fetchJSON(action, getURL(), params || {}, pInt(timeOut, 30000),
-			data => {
+			async data => {
 				abort(action, 0, 1);
 
 				if (!data) {
 					return Promise.reject(new FetchError(Notifications.JsonParse));
 				}
+
+				if (111 === data?.ErrorCode && rl.app.ask && await rl.app.ask.cryptkey()) {
+					return this.post(action, fTrigger, params, timeOut);
+				}
 /*
 				let isCached = false, type = '';
 				if (data?.epoch) {

dev/View/Popup/Ask.js

@@ -85,29 +85,3 @@ export class AskPopupView extends AbstractViewPopup {
 		});
 	}
 }
-
-AskPopupView.password = function(sAskDesc, btnText) {
-	return new Promise(resolve => {
-		this.showModal([
-			sAskDesc,
-			view => resolve({password:view.passphrase(), remember:view.remember()}),
-			() => resolve(null),
-			true,
-			5,
-			btnText
-		]);
-	});
-}
-
-AskPopupView.credentials = function(sAskDesc, btnText) {
-	return new Promise(resolve => {
-		this.showModal([
-			sAskDesc,
-			view => resolve({username:view.username(), password:view.passphrase(), remember:view.remember()}),
-			() => resolve(null),
-			true,
-			3,
-			btnText
-		]);
-	});
-}