Hash is removed from the key that is saved from in localStorate. Now the functions to verify the keys to unlock the wallet with the encrypted record

Author: dmernies-iohk

examples/wallet/app/actions/account.js

@@ -33,8 +33,7 @@ import {
 import { isValidMnemonic, createSeedFromMnemonic } from '../utils/mnemonic';
 import {
   saveEncryptedAccountInfo,
-  saveSpendingPassword,
-  readAccountKeysFromDEN
+  readEncryptedAccountInfo
 } from '../utils/storage';
 
 import routes from '../constants/routes.json';
@@ -57,11 +56,11 @@ export function setAccount(
   };
 }
 
-export function setKeysWithSpendingPassword(
+export function setKeysWithUnlockWalletPassword(
   spendingPassword: ?string = ''
 ): Thunk<SetKeysAction> {
-  return function setKeysWithSpendingPasswordThunk(dispatch) {
-    const accountKeys = readAccountKeysFromDEN(spendingPassword);
+  return function setKeysWithUnlockWalletPasswordThunk(dispatch) {
+    const accountKeys = readEncryptedAccountInfo(spendingPassword);
     if (accountKeys) {
       const spendingPasswordKeys = {
         walletId: 'wallet01',
@@ -121,7 +120,6 @@ const initializeKeysAndRedirect = (
     ...keys
   });
 
-  saveSpendingPassword(spendingPassword);
   saveEncryptedAccountInfo(spendingPassword, keys);
 
   return Promise.all([

examples/wallet/app/actions/router.js

@@ -4,12 +4,13 @@ import type { Dispatch, GetState } from '../reducers/types';
 import type { Address } from '../models';
 import routes from '../constants/routes';
 
-import { isSpedingPasswordCreated } from '../utils/storage';
+import { isUnlockWalletPasswordCreated } from '../utils/storage';
 
 // eslint-disable-next-line import/prefer-default-export
 export const redirectToFirstAppPage = () => {
   return (dispatch: Dispatch, getState: GetState) => {
-    if (isSpedingPasswordCreated()) return dispatch(push(routes.UNLOCK_WALLET));
+    if (isUnlockWalletPasswordCreated())
+      return dispatch(push(routes.UNLOCK_WALLET));
     const {
       account: { address }
     }: { account: { address: Address } } = getState();

examples/wallet/app/containers/UnlockWallet.js

@@ -2,10 +2,10 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import UnlockWallet from '../pages/UnlockWallet';
-import { setKeysWithSpendingPassword } from '../actions/account';
+import { setKeysWithUnlockWalletPassword } from '../actions/account';
 
 function mapDispatchToProps(dispatch) {
-  return bindActionCreators({ setKeysWithSpendingPassword }, dispatch);
+  return bindActionCreators({ setKeysWithUnlockWalletPassword }, dispatch);
 }
 
 export default connect(

examples/wallet/app/pages/UnlockWallet.js

@@ -5,23 +5,21 @@ import Button from 'react-bootstrap/Button';
 import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import styles from './UnlockWallet.scss';
-import { isValidSpendingPassword } from '../utils/storage';
-import typeof { setKeysWithSpendingPassword as SetKeysWithSpendingPassword } from '../actions/account';
+import typeof { setKeysWithUnlockWalletPassword as SetKeysWithSpendingPassword } from '../actions/account';
 
 type Props = {
-  setKeysWithSpendingPassword: SetKeysWithSpendingPassword
+  setKeysWithUnlockWalletPassword: SetKeysWithSpendingPassword
 };
 
-export default ({ setKeysWithSpendingPassword }: Props) => {
+export default ({ setKeysWithUnlockWalletPassword }: Props) => {
   const handleSubmit = function handleSubmit(event) {
     event.preventDefault();
-    if (isValidSpendingPassword(spendingPassword)) {
-      setIsWrongSpendingPassword(false);
-      setHiddenSpendingPassword(true);
-      return setKeysWithSpendingPassword(spendingPassword);
+    try {
+      return setKeysWithUnlockWalletPassword(spendingPassword);
+    } catch (error) {
+      setIsWrongSpendingPassword(true);
+      setHiddenSpendingPassword(false);
     }
-    setIsWrongSpendingPassword(true);
-    setHiddenSpendingPassword(false);
   };
 
   const [spendingPassword, setSpendingPassword] = useState('');

examples/wallet/app/utils/decrypt.js

@@ -3,23 +3,9 @@ import aesjs from 'aes-js';
 import blakejs from 'blakejs';
 
 const blake2b = data => blakejs.blake2b(data, null, 32);
-const blake2bHex = data => blakejs.blake2bHex(data, null, 32);
 const SECRET = 'wallet_demo#';
 const AES_SECRET = ':aes_secret#';
 
-export function computeBlake2bHexWithSecret(spendingPassword: string): string {
-  const fullSpendingPassword = spendingPassword.concat(SECRET);
-  return blake2bHex(fullSpendingPassword);
-}
-
-export function isBlake2HashHexWithSecretOk(
-  spendingPassword: string,
-  blake2bHashHex: string
-): boolean {
-  const fullSpendingPassword = spendingPassword.concat(SECRET);
-  return blake2bHex(fullSpendingPassword) === blake2bHashHex;
-}
-
 export function aesEncrypt(spendingPassword: string, text: string): string {
   const aesPasswordText = spendingPassword.concat(SECRET).concat(AES_SECRET);
   const aesKey = blake2b(aesPasswordText);

examples/wallet/app/utils/storage.js

@@ -1,30 +1,12 @@
 // @flow
 import type { AccountKeys } from '../reducers/types';
-import {
-  computeBlake2bHexWithSecret,
-  isBlake2HashHexWithSecretOk,
-  aesEncrypt,
-  aesDecrypt
-} from './decrypt';
+import { aesEncrypt, aesDecrypt } from './decrypt';
 
-const WALLET_SPEDING_PASSWORD_KEY = 'wallet.spending.pwd';
 const WALLET_ENCRYPTED_KEYS = 'wallet.encrypted.account.info';
 
-export function saveSpendingPassword(spendingPassword: ?string = ''): void {
-  const spendingHash = computeBlake2bHexWithSecret(spendingPassword);
-  localStorage.setItem(WALLET_SPEDING_PASSWORD_KEY, spendingHash);
-}
-
-export function isValidSpendingPassword(spendingPassword: string): boolean {
-  const savedSpendingHash = localStorage.getItem(WALLET_SPEDING_PASSWORD_KEY);
-  if (!savedSpendingHash)
-    throw new Error('There is not a spending password created');
-  return isBlake2HashHexWithSecretOk(spendingPassword, savedSpendingHash);
-}
-
-export function isSpedingPasswordCreated(): boolean {
-  const savedSpendingHash = localStorage.getItem(WALLET_SPEDING_PASSWORD_KEY);
-  if (savedSpendingHash) return true;
+export function isUnlockWalletPasswordCreated(): boolean {
+  const encryptedAccountInfo = localStorage.getItem(WALLET_ENCRYPTED_KEYS);
+  if (encryptedAccountInfo) return true;
   return false;
 }
 
@@ -39,7 +21,7 @@ export function saveEncryptedAccountInfo(
 }
 
 // eslint-disable-next-line flowtype/space-after-type-colon
-export function readAccountKeysFromDEN(
+export function readEncryptedAccountInfo(
   spendingPassword: ?string
 ): ?AccountKeys {
   const encryptedHex = localStorage.getItem(WALLET_ENCRYPTED_KEYS);