Desktop: Fixed button to upgrade a master key

laurent22 · Nov 10, 2021 · 725c79d · 725c79d
1 parent 0de6e9e
commit 725c79d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx b/packages/app-desktop/gui/EncryptionConfigScreen/EncryptionConfigScreen.tsx
@@ -5,7 +5,7 @@ import { _ } from '@joplin/lib/locale';
 import time from '@joplin/lib/time';
 import shim from '@joplin/lib/shim';
 import dialogs from '../dialogs';
-import { decryptedStatText, dontReencryptData, enableEncryptionConfirmationMessages, onSavePasswordClick, onToggleEnabledClick, reencryptData, upgradeMasterKey, useInputPasswords, useNeedMasterPassword, usePasswordChecker, useStats, useToggleShowDisabledMasterKeys } from '@joplin/lib/components/EncryptionConfigScreen/utils';
+import { decryptedStatText, determineKeyPassword, dontReencryptData, enableEncryptionConfirmationMessages, onSavePasswordClick, onToggleEnabledClick, reencryptData, upgradeMasterKey, useInputPasswords, useNeedMasterPassword, usePasswordChecker, useStats, useToggleShowDisabledMasterKeys } from '@joplin/lib/components/EncryptionConfigScreen/utils';
 import { MasterKeyEntity } from '@joplin/lib/services/e2ee/types';
 import { getEncryptionEnabled, masterKeyEnabled, SyncInfo } from '@joplin/lib/services/synchronizer/syncInfoUtils';
 import { getDefaultMasterKey, getMasterPasswordStatusMessage, masterPasswordIsValid, toggleAndSetupEncryption } from '@joplin/lib/services/e2ee/utils';
@@ -41,9 +41,11 @@ const EncryptionConfigScreen = (props: Props) => {
 	const { showDisabledMasterKeys, toggleShowDisabledMasterKeys } = useToggleShowDisabledMasterKeys();
 	const needMasterPassword = useNeedMasterPassword(passwordChecks, props.masterKeys);
 
-	const onUpgradeMasterKey = useCallback((mk: MasterKeyEntity) => {
-		void upgradeMasterKey(mk, passwordChecks, props.passwords);
-	}, [passwordChecks, props.passwords]);
+	const onUpgradeMasterKey = useCallback(async (mk: MasterKeyEntity) => {
+		const password = determineKeyPassword(mk.id, masterPasswordKeys, props.masterPassword, props.passwords);
+		const result = await upgradeMasterKey(mk, password);
+		alert(result);
+	}, [props.passwords, masterPasswordKeys, props.masterPassword]);
 
 	const renderNeedUpgradeSection = () => {
 		if (!shim.isElectron()) return null;

diff --git a/packages/lib/components/EncryptionConfigScreen/utils.ts b/packages/lib/components/EncryptionConfigScreen/utils.ts
@@ -198,14 +198,19 @@ export const useNeedMasterPassword = (passwordChecks: PasswordChecks, masterKeys
 	return false;
 };
 
-export const upgradeMasterKey = async (masterKey: MasterKeyEntity, passwordChecks: PasswordChecks, passwords: Record<string, string>): Promise<string> => {
-	const passwordCheck = passwordChecks[masterKey.id];
-	if (!passwordCheck) {
+export const determineKeyPassword = (masterKeyId: string, masterPasswordKeys: PasswordChecks, masterPassword: string, passwords: Record<string, string>): string => {
+	if (masterPasswordKeys[masterKeyId]) return masterPassword;
+	return passwords[masterKeyId];
+};
+
+export const upgradeMasterKey = async (masterKey: MasterKeyEntity, password: string): Promise<string> => {
+	if (!password) {
 		return _('Please enter your password in the master key list below before upgrading the key.');
 	}
 
 	try {
-		const password = passwords[masterKey.id];
+		// Just re-encrypt the master key, but using the new encryption method
+		// (which would be the default).
 		const newMasterKey = await EncryptionService.instance().reencryptMasterKey(masterKey, password, password);
 		await MasterKey.save(newMasterKey);
 		void reg.waitForSyncFinishedThenSync();