fix(v1 decryption): return v1 password error correctly

blockchain · Feb 24, 2021 · fb3e70e · fb3e70e
1 parent 5ba1ca9
commit fb3e70e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/Login/template.tsx b/packages/blockchain-wallet-v4-frontend/src/scenes/Login/template.tsx
@@ -172,9 +172,7 @@ const Login = (props: InjectedFormProps<{}, Props> & Props) => {
   const guidError =
     loginError && loginError.toLowerCase().includes('unknown wallet id')
   const passwordError =
-    loginError &&
-    (loginError.toLowerCase().includes('wrong_wallet_password') ||
-      loginError.toLowerCase().includes('wrong_wrapper'))
+    loginError && loginError.toLowerCase().includes('wrong_wallet_password')
   const twoFactorError =
     loginError && loginError.toLowerCase().includes('authentication code')
   const accountLocked =

diff --git a/packages/blockchain-wallet-v4/src/walletCrypto/index.ts b/packages/blockchain-wallet-v4/src/walletCrypto/index.ts
@@ -214,9 +214,8 @@ export const encryptWallet = curry((data, password, iterations, version) =>
 // decryptWalletV1 :: String -> String -> Task Error Object
 export const decryptWalletV1 = (password, data) => {
   let decrypt = (i, o) =>
-    decryptDataWithPassword(data, password, i, o).chain(
-      safeParse,
-      'v1: wrong_wallet_password'
+    decryptDataWithPassword(data, password, i, o).chain(p =>
+      safeParse(p, 'v1: wrong_wallet_password')
     )
   // v1: CBC, ISO10126, 10 iterations
   return (
@@ -264,7 +263,9 @@ export const decryptWalletV2V3 = (password, data) => {
 }
 
 export const decryptWallet = curry((password, data) =>
-  decryptWalletV1(password, data).orElse(() =>
-    decryptWalletV2V3(password, data)
-  )
+  decryptWalletV1(password, data).orElse(result => {
+    return result === 'v1: wrong_wallet_password'
+      ? Task.rejected(result)
+      : decryptWalletV2V3(password, data)
+  })
 )