UnlockWalletPassword is used instead of SpendingPassword

dmernies-iohk · dmernies-iohk · commit d63b7305cc8a · 2020-01-08T14:35:21.000-03:00
diff --git a/examples/wallet/app/actions/account.js b/examples/wallet/app/actions/account.js
@@ -7,7 +7,7 @@ import type {
   Thunk,
   AccountKeys,
   AccountState,
-  SpendingPassword
+  UnlockWalletPassword
 } from '../reducers/types';
 import type {
   Amount,
@@ -39,40 +39,40 @@ import {
 import routes from '../constants/routes.json';
 
 export type SetKeysAction = { type: 'SET_KEYS' } & AccountKeys;
-export type SetKeysWithSpendingPasswordAction = {
-  type: 'SET_SPENDING_PASSWORD'
-} & SpendingPassword;
+export type SetKeysWithUnlockWalletPasswordAction = {
+  type: 'SET_UNLOCK_WALLET_PASSWORD'
+} & UnlockWalletPassword;
 export const SET_KEYS = 'SET_KEYS';
-export const SET_SPENDING_PASSWORD = 'SET_SPENDING_PASSWORD';
+export const SET_UNLOCK_WALLET_PASSWORD = 'SET_UNLOCK_WALLET_PASSWORD';
 
 export function setAccount(
   privateKey: string,
-  spendingPassword: ?string
+  unlockWalletPassword: ?string
 ): Thunk<SetKeysAction> {
   return function setAccountThunk(dispatch) {
     return getAccountFromPrivateKey(privateKey).then(keys =>
-      curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
+      curry(initializeKeysAndRedirect)(dispatch, keys, unlockWalletPassword)
     );
   };
 }
 
 export function setKeysWithUnlockWalletPassword(
-  spendingPassword: ?string = ''
+  unlockWalletPassword: ?string = ''
 ): Thunk<SetKeysAction> {
   return function setKeysWithUnlockWalletPasswordThunk(dispatch) {
-    const accountKeys = readEncryptedAccountInfo(spendingPassword);
+    const accountKeys = readEncryptedAccountInfo(unlockWalletPassword);
     if (accountKeys) {
-      const spendingPasswordKeys = {
+      const unlockWalletPasswordKeys = {
         walletId: 'wallet01',
-        spendingPassword
+        unlockWalletPassword
       };
       dispatch({
-        type: SET_SPENDING_PASSWORD,
-        ...spendingPasswordKeys
+        type: SET_UNLOCK_WALLET_PASSWORD,
+        ...unlockWalletPasswordKeys
       });
 
       return getAccountFromPrivateKey(accountKeys.privateKey).then(keys =>
-        curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
+        curry(initializeKeysAndRedirect)(dispatch, keys, unlockWalletPassword)
       );
     }
     throw new Error('Invalid password');
@@ -113,14 +113,14 @@ export function setAccountFromPrivateKey(
 const initializeKeysAndRedirect = (
   dispatch: Dispatch,
   keys: AccountKeys,
-  spendingPassword: ?string = ''
+  unlockWalletPassword: ?string = ''
 ) => {
   dispatch({
     type: SET_KEYS,
     ...keys
   });
 
-  saveEncryptedAccountInfo(spendingPassword, keys);
+  saveEncryptedAccountInfo(unlockWalletPassword, keys);
 
   return Promise.all([
     dispatch(updateAccountTransactions()),
@@ -137,13 +137,13 @@ const initializeKeysAndRedirect = (
 export function setAccountFromMnemonic(
   mnemonicPhrase: string,
   mnemonicPassword: string,
-  spendingPassword: ?string
+  unlockWalletPassword: ?string
 ): Thunk<SetKeysAction> {
   if (isValidMnemonic(mnemonicPhrase)) {
     const seed = createSeedFromMnemonic(mnemonicPhrase, mnemonicPassword);
     return function setAccountThunk(dispatch) {
       return getAccountFromSeed(seed).then(keys =>
-        curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
+        curry(initializeKeysAndRedirect)(dispatch, keys, unlockWalletPassword)
       );
     };
   }
diff --git a/examples/wallet/app/components/RestoreWalletFromMnemonic.js b/examples/wallet/app/components/RestoreWalletFromMnemonic.js
@@ -19,7 +19,7 @@ export default ({ setAccountFromMnemonic }: Props) => {
   const handleSubmitMnemonic = function handleSubmitMnemonic(event) {
     event.preventDefault();
     if (isValidMnemonic(newMnemonicPhrase)) {
-      if (checkValidSpendingPassword(password, confirmPassword)) {
+      if (checkValidUnlockWalletPassword(password, confirmPassword)) {
         return setAccountFromMnemonic(
           newMnemonicPhrase,
           newMnemonicPassword,
@@ -37,7 +37,7 @@ export default ({ setAccountFromMnemonic }: Props) => {
 
   const [newMnemonicPassword, setNewMnemonicPassword] = useState('');
 
-  const checkValidSpendingPassword = function checkValidSpendingPassword(
+  const checkValidUnlockWalletPassword = function checkValidUnlockWalletPassword(
     pass,
     confirmation
   ) {
diff --git a/examples/wallet/app/components/RestoreWalletFromPrivateKey.js b/examples/wallet/app/components/RestoreWalletFromPrivateKey.js
@@ -15,12 +15,12 @@ type Props = {
 export default ({ setAccount }: Props) => {
   const handleSubmit = function handleSubmit(event) {
     event.preventDefault();
-    if (checkValidSpendingPassword(password, confirmPassword)) {
+    if (checkValidUnlockWalletPassword(password, confirmPassword)) {
       setAccount(newPrivateKey, password);
     }
   };
 
-  const checkValidSpendingPassword = function checkValidSpendingPassword(
+  const checkValidUnlockWalletPassword = function checkValidUnlockWalletPassword(
     pass,
     confirmation
   ) {
diff --git a/examples/wallet/app/pages/UnlockWallet.js b/examples/wallet/app/pages/UnlockWallet.js
@@ -15,16 +15,20 @@ export default ({ setKeysWithUnlockWalletPassword }: Props) => {
   const handleSubmit = function handleSubmit(event) {
     event.preventDefault();
     try {
-      return setKeysWithUnlockWalletPassword(spendingPassword);
+      return setKeysWithUnlockWalletPassword(unlockWalletPassword);
     } catch (error) {
-      setIsWrongSpendingPassword(true);
-      setHiddenSpendingPassword(false);
+      setIsWrongUnlockWalletPassword(true);
+      setHiddenUnlockWalletPassword(false);
     }
   };
 
-  const [spendingPassword, setSpendingPassword] = useState('');
-  const [isWrongSpendingPassword, setIsWrongSpendingPassword] = useState(false);
-  const [hiddenSpendingPassword, setHiddenSpendingPassword] = useState(true);
+  const [unlockWalletPassword, setUnlockWalletPassword] = useState('');
+  const [isWrongSpendingPassword, setIsWrongUnlockWalletPassword] = useState(
+    false
+  );
+  const [hiddenSpendingPassword, setHiddenUnlockWalletPassword] = useState(
+    true
+  );
 
   return (
     <Container className={styles.container}>
@@ -35,12 +39,12 @@ export default ({ setKeysWithUnlockWalletPassword }: Props) => {
           </Form.Label>
           <Form.Control
             type="password"
-            id="spendingPassword"
-            name="spendingPassword"
+            id="unlockWalletPassword"
+            name="unlockWalletPassword"
             placeholder="Password"
-            value={spendingPassword}
+            value={unlockWalletPassword}
             isInvalid={isWrongSpendingPassword}
-            onChange={event => setSpendingPassword(event.target.value)}
+            onChange={event => setUnlockWalletPassword(event.target.value)}
           />
           <Form.Label className="text-danger" hidden={hiddenSpendingPassword}>
             <code>Incorrect password</code>
diff --git a/examples/wallet/app/reducers/account.js b/examples/wallet/app/reducers/account.js
@@ -1,7 +1,7 @@
 // @flow
 import sortBy from 'lodash/sortBy';
 import {
-  SET_SPENDING_PASSWORD,
+  SET_UNLOCK_WALLET_PASSWORD,
   SET_KEYS,
   SET_ACCOUNT_STATE,
   SEND_TRANSACTION,
@@ -13,7 +13,7 @@ import type {
   SendTransactionAction,
   SetAccountStateAction,
   SetTransactionsAction,
-  SetKeysWithSpendingPasswordAction,
+  SetKeysWithUnlockWalletPasswordAction,
   SendStakeDelegation
 } from '../actions/account';
 import type { Account } from './types';
@@ -23,7 +23,7 @@ export default function account(
   state: Account,
   // eslint-disable-next-line flowtype/space-after-type-colon
   action:
-    | SetKeysWithSpendingPasswordAction
+    | SetKeysWithUnlockWalletPasswordAction
     | SetKeysAction
     | SetAccountStateAction
     | SendTransactionAction
@@ -34,10 +34,10 @@ export default function account(
     return { transactions: [] };
   }
   switch (action.type) {
-    case SET_SPENDING_PASSWORD:
+    case SET_UNLOCK_WALLET_PASSWORD:
       return Object.assign({}, state, {
         walletId: action.walletId,
-        spendingPassword: action.spendingPassword
+        unlockWalletPassword: action.unlockWalletPassword
       });
     case SET_KEYS:
       return Object.assign({}, state, {
diff --git a/examples/wallet/app/reducers/types.js b/examples/wallet/app/reducers/types.js
@@ -37,9 +37,9 @@ export type AccountKeys = {
   identifier: Identifier
 };
 
-export type SpendingPassword = {
+export type UnlockWalletPassword = {
   walletId: string,
-  spendingPassword: string
+  unlockWalletPassword: string
 };
 
 export type AccountState = {
diff --git a/examples/wallet/app/utils/decrypt.js b/examples/wallet/app/utils/decrypt.js
@@ -6,8 +6,10 @@ const blake2b = data => blakejs.blake2b(data, null, 32);
 const SECRET = 'wallet_demo#';
 const AES_SECRET = ':aes_secret#';
 
-export function aesEncrypt(spendingPassword: string, text: string): string {
-  const aesPasswordText = spendingPassword.concat(SECRET).concat(AES_SECRET);
+export function aesEncrypt(unlockWalletPassword: string, text: string): string {
+  const aesPasswordText = unlockWalletPassword
+    .concat(SECRET)
+    .concat(AES_SECRET);
   const aesKey = blake2b(aesPasswordText);
   const aesCtr = new aesjs.ModeOfOperation.ctr(aesKey, new aesjs.Counter(5));
   const encryptedBytes = aesCtr.encrypt(aesjs.utils.utf8.toBytes(text));
@@ -16,10 +18,12 @@ export function aesEncrypt(spendingPassword: string, text: string): string {
 }
 
 export function aesDecrypt(
-  spendingPassword: string,
+  unlockWalletPassword: string,
   encryptedHex: string
 ): string {
-  const aesPasswordText = spendingPassword.concat(SECRET).concat(AES_SECRET);
+  const aesPasswordText = unlockWalletPassword
+    .concat(SECRET)
+    .concat(AES_SECRET);
   const aesKey = blake2b(aesPasswordText);
   const aesCtr = new aesjs.ModeOfOperation.ctr(aesKey, new aesjs.Counter(5));
   const decryptedBytes = aesCtr.decrypt(aesjs.utils.hex.toBytes(encryptedHex));
diff --git a/examples/wallet/app/utils/storage.js b/examples/wallet/app/utils/storage.js
@@ -11,23 +11,23 @@ export function isUnlockWalletPasswordCreated(): boolean {
 }
 
 export function saveEncryptedAccountInfo(
-  spendingPassword: ?string,
+  unlockWalletPassword: ?string,
   keys: AccountKeys
 ): void {
   const plainTextAccountInfo = JSON.stringify(keys);
-  const spedingPwd: string = spendingPassword || '';
+  const spedingPwd: string = unlockWalletPassword || '';
   const encryptedTextAccountInfo = aesEncrypt(spedingPwd, plainTextAccountInfo);
   localStorage.setItem(WALLET_ENCRYPTED_KEYS, encryptedTextAccountInfo);
 }
 
 // eslint-disable-next-line flowtype/space-after-type-colon
 export function readEncryptedAccountInfo(
-  spendingPassword: ?string
+  unlockWalletPassword: ?string
 ): ?AccountKeys {
   const encryptedHex = localStorage.getItem(WALLET_ENCRYPTED_KEYS);
   try {
     if (encryptedHex && encryptedHex.length > 0) {
-      const plainText = aesDecrypt(spendingPassword, encryptedHex);
+      const plainText = aesDecrypt(unlockWalletPassword, encryptedHex);
       const accountKeys = JSON.parse(plainText);
       return accountKeys;
     }
