Merge pull request #3143 from yougotwill/fix/ses-2519/set_password_without_restart

_locales/en/messages.json

@@ -69,8 +69,9 @@
   "changeNicknameMessage": "Enter a nickname for this user",
   "changePassword": "Change Password",
   "changePasswordInvalid": "The old password you entered is incorrect",
+  "changePasswordFail": "Failed to change password",
   "changePasswordTitle": "Password Changed",
-  "changePasswordToastDescription": "Your password has been changed. Please keep it safe and restart Session.",
+  "changePasswordToastDescription": "Your password has been changed. Please keep it safe.",
   "chooseAnAction": "Choose an action to start a conversation",
   "classicDarkThemeTitle": "Classic Dark",
   "classicLightThemeTitle": "Classic Light",
@@ -442,8 +443,9 @@
   "removeModerators": "Remove Admins",
   "removePassword": "Remove Password",
   "removePasswordInvalid": "Incorrect password",
+  "removePasswordFail": "Failed to remove password",
   "removePasswordTitle": "Password Removed",
-  "removePasswordToastDescription": "Your password has been removed. Please restart Session.",
+  "removePasswordToastDescription": "Your password has been removed.",
   "removeResidueMembers": "Clicking ok will also remove those members as they left the group.",
   "replyingToMessage": "Replying to:",
   "replyToMessage": "Reply",
@@ -480,7 +482,7 @@
   "setPasswordFail": "Failed to set password",
   "setPasswordInvalid": "Passwords do not match",
   "setPasswordTitle": "Password Set",
-  "setPasswordToastDescription": "Your password has been set. Please keep it safe and restart Session",
+  "setPasswordToastDescription": "Your password has been set. Please keep it safe.",
   "settingAppliesToEveryone": "This setting applies to everyone in this conversation.",
   "settingAppliesToYourMessages": "This setting applies to messages you send in this conversation.",
   "settingsHeader": "Settings",

preload.js

@@ -63,13 +63,11 @@ window.setZoomFactor = number => {
 // Set the password for the database
 window.setPassword = async (passPhrase, oldPhrase) =>
   new Promise((resolve, reject) => {
-    ipc.once('set-password-response', (_event, error) => {
+    ipc.once('set-password-response', (_event, response) => {
-      if (error) {
+      if (!response) {
-        reject(error);
+        return reject('window.setPassword: No response from main process');
-        return;
       }
-      resolve(undefined);
+      return resolve(response);
-      return;
     });
     ipc.send('set-password', passPhrase, oldPhrase);
   });

ts/components/dialog/SessionSetPasswordDialog.tsx

@@ -8,7 +8,7 @@ import { LocalizerKeys } from '../../types/LocalizerKeys';
 import type { PasswordAction } from '../../types/ReduxTypes';
 import { assertUnreachable } from '../../types/sqlSharedTypes';
 import { matchesHash, validatePassword } from '../../util/passwordUtils';
-import { getPasswordHash } from '../../util/storage';
+import { getPasswordHash, Storage } from '../../util/storage';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SpacerSM } from '../basic/Text';
@@ -193,15 +193,25 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
       this.showError();
       return;
     }
-    await window.setPassword(enteredPassword, null);
+    try {
-    ToastUtils.pushToastSuccess(
+      const updatedHash = await window.setPassword(enteredPassword, null);
-      'setPasswordSuccessToast',
+      await Storage.put('passHash', updatedHash);
-      window.i18n('setPasswordTitle'),
+
-      window.i18n('setPasswordToastDescription')
+      ToastUtils.pushToastSuccess(
-    );
+        'setPasswordSuccessToast',
-
+        window.i18n('setPasswordTitle'),
-    this.props.onOk();
+        window.i18n('setPasswordToastDescription')
-    this.closeDialog();
+      );
+
+      this.props.onOk();
+      this.closeDialog();
+    } catch (err) {
+      window.log.error(err);
+      this.setState({
+        error: window.i18n('setPasswordFail'),
+      });
+      this.showError();
+    }
   }
 
   private async handleActionChange(
@@ -232,16 +242,26 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
       this.showError();
       return;
     }
-    await window.setPassword(newPassword, oldPassword);
 
-    ToastUtils.pushToastSuccess(
+    try {
-      'setPasswordSuccessToast',
+      const updatedHash = await window.setPassword(newPassword, oldPassword);
-      window.i18n('changePasswordTitle'),
+      await Storage.put('passHash', updatedHash);
-      window.i18n('changePasswordToastDescription')
-    );
 
-    this.props.onOk();
+      ToastUtils.pushToastSuccess(
-    this.closeDialog();
+        'setPasswordSuccessToast',
+        window.i18n('changePasswordTitle'),
+        window.i18n('changePasswordToastDescription')
+      );
+
+      this.props.onOk();
+      this.closeDialog();
+    } catch (err) {
+      window.log.error(err);
+      this.setState({
+        error: window.i18n('changePasswordFail'),
+      });
+      this.showError();
+    }
   }
 
   private async handleActionRemove(oldPassword: string) {
@@ -254,16 +274,26 @@ export class SessionSetPasswordDialog extends Component<Props, State> {
       this.showError();
       return;
     }
-    await window.setPassword(null, oldPassword);
 
-    ToastUtils.pushToastWarning(
+    try {
-      'setPasswordSuccessToast',
+      await window.setPassword(null, oldPassword);
-      window.i18n('removePasswordTitle'),
+      await Storage.remove('passHash');
-      window.i18n('removePasswordToastDescription')
-    );
 
-    this.props.onOk();
+      ToastUtils.pushToastWarning(
-    this.closeDialog();
+        'setPasswordSuccessToast',
+        window.i18n('removePasswordTitle'),
+        window.i18n('removePasswordToastDescription')
+      );
+
+      this.props.onOk();
+      this.closeDialog();
+    } catch (err) {
+      window.log.error(err);
+      this.setState({
+        error: window.i18n('removePasswordFail'),
+      });
+      this.showError();
+    }
   }
 
   private async onEnterPressed(event: any) {

ts/components/settings/section/CategoryPrivacy.tsx

@@ -113,6 +113,7 @@ export const SettingsCategoryPrivacy = (props: {
           description={window.i18n('setAccountPasswordDescription')}
           onClick={() => {
             displayPasswordModal('set', props.onPasswordUpdated);
+            forceUpdate();
           }}
           buttonText={window.i18n('setPassword')}
           dataTestId={'set-password-button'}
@@ -125,6 +126,7 @@ export const SettingsCategoryPrivacy = (props: {
             description={window.i18n('changeAccountPasswordDescription')}
             onClick={() => {
               displayPasswordModal('change', props.onPasswordUpdated);
+              forceUpdate();
             }}
             buttonText={window.i18n('changePassword')}
             dataTestId="change-password-settings-button"
@@ -134,6 +136,7 @@ export const SettingsCategoryPrivacy = (props: {
             description={window.i18n('removeAccountPasswordDescription')}
             onClick={() => {
               displayPasswordModal('remove', props.onPasswordUpdated);
+              forceUpdate();
             }}
             buttonColor={SessionButtonColor.Danger}
             buttonText={window.i18n('removePassword')}

ts/mains/main_node.ts

@@ -1064,13 +1064,15 @@ ipc.on('set-password', async (event, passPhrase, oldPhrase) => {
       sqlNode.setSQLPassword(defaultKey);
       sqlNode.removePasswordHash();
       userConfig.set('dbHasPassword', false);
+      sendResponse(undefined);
     } else {
       sqlNode.setSQLPassword(passPhrase);
       const newHash = PasswordUtil.generateHash(passPhrase);
       sqlNode.savePasswordHash(newHash);
+      const updatedHash = sqlNode.getPasswordHash();
       userConfig.set('dbHasPassword', true);
+      sendResponse(updatedHash);
     }
-    sendResponse(undefined);
   } catch (e) {
     const localisedError = locale.messages.setPasswordFail;
     sendResponse(localisedError || 'Failed to set password');

ts/node/sql.ts

@@ -253,6 +253,7 @@ function getPasswordHash() {
   const item = getItemById(PASS_HASH_ID);
   return item && item.value;
 }
+
 function savePasswordHash(hash: string) {
   if (isEmpty(hash)) {
     removePasswordHash();
@@ -262,6 +263,7 @@ function savePasswordHash(hash: string) {
   const data = { id: PASS_HASH_ID, value: hash };
   createOrUpdateItem(data);
 }
+
 function removePasswordHash() {
   removeItemById(PASS_HASH_ID);
 }

ts/types/LocalizerKeys.ts

@@ -68,6 +68,7 @@ export type LocalizerKeys =
   | 'changeNickname'
   | 'changeNicknameMessage'
   | 'changePassword'
+  | 'changePasswordFail'
   | 'changePasswordInvalid'
   | 'changePasswordTitle'
   | 'changePasswordToastDescription'
@@ -441,6 +442,7 @@ export type LocalizerKeys =
   | 'removeFromModerators'
   | 'removeModerators'
   | 'removePassword'
+  | 'removePasswordFail'
   | 'removePasswordInvalid'
   | 'removePasswordTitle'
   | 'removePasswordToastDescription'

ts/window.d.ts

@@ -47,7 +47,7 @@ declare global {
     persistStore?: Persistor;
     restart: () => void;
     getSeedNodeList: () => Array<string> | undefined;
-    setPassword: (newPassword: string | null, oldPassword: string | null) => Promise<void>;
+    setPassword: (newPassword: string | null, oldPassword: string | null) => Promise<string>;
     isOnline: boolean;
     toggleMediaPermissions: () => Promise<void>;
     toggleCallMediaPermissionsTo: (enabled: boolean) => Promise<void>;