status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #239 from status-im/bug/#237 

Fix error after account recovery

Former-commit-id: c06b1249e8
This commit is contained in:
adrian-tiberius 2016-09-21 00:13:39 +03:00 committed by GitHub
parent a694034d20 a560493eb7
commit 9f99dba7bd
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/status_im/accounts/recover/handlers.cljs
View File

@ -4,17 +4,21 @@
[status-im.utils.types :refer [json->clj]] [status-im.utils.types :refer [json->clj]]
[status-im.utils.identicon :refer [identicon]] [status-im.utils.identicon :refer [identicon]]
[taoensso.timbre :as log] [taoensso.timbre :as log]
[clojure.string :as str])) [clojure.string :as str]
[status-im.protocol.core :as protocol]))
(defn account-recovered [result password] (defn account-recovered [result password]
(let [_ (log/debug result) (let [_ (log/debug result)
data (json->clj result) data (json->clj result)
public-key (:pubkey data) public-key (:pubkey data)
address (:address data) address (:address data)
{:keys [public private]} (protocol/new-keypair!)
account {:public-key public-key account {:public-key public-key
:address address :address address
:name address :name address
:photo-path (identicon public-key)}] :photo-path (identicon public-key)
:updates-public-key public
:updates-private-key private}]
(log/debug "account-recovered") (log/debug "account-recovered")
(when (not (str/blank? public-key)) (when (not (str/blank? public-key))
(do (do

11
src/status_im/protocol/listeners.cljs
View File

@ -3,18 +3,25 @@
[status-im.protocol.ack :as ack] [status-im.protocol.ack :as ack]
[status-im.protocol.web3.utils :as u] [status-im.protocol.web3.utils :as u]
[status-im.protocol.encryption :as e] [status-im.protocol.encryption :as e]
[taoensso.timbre :refer-macros [debug]])) [taoensso.timbre :refer-macros [debug] :as log]))
(defn- parse-payload [payload] (defn- parse-payload [payload]
(debug :parse-payload) (debug :parse-payload)
(r/read-string (u/to-utf8 payload))) (r/read-string (u/to-utf8 payload)))
(defn- decrypt [key content]
(try
(r/read-string (e/decrypt key content))
(catch :default err
(log/warn :decrypt-error err)
nil)))
(defn- parse-content [key {:keys [content]} was-encrypted?] (defn- parse-content [key {:keys [content]} was-encrypted?]
(debug :parse-content (debug :parse-content
"Key exitsts:" (not (nil? key)) "Key exitsts:" (not (nil? key))
"Content exists:" (not (nil? content))) "Content exists:" (not (nil? content)))
(if (and (not was-encrypted?) key content) (if (and (not was-encrypted?) key content)
(r/read-string (e/decrypt key content)) (decrypt key content)
content)) content))
(defn message-listener (defn message-listener