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

Do not change keychain method on auth-bio fail 

Do not change auth method if user does not save password

Sanity check - fix only for biometric method

Check for new auth method only when save password

ScrollView Persist taps on login view

Signed-off-by: Gheorghe Pinzaru <feross95@gmail.com>
This commit is contained in:
Gheorghe Pinzaru 2020-01-22 14:37:14 +03:00
parent f18e7d746b
commit ff1022f337
No known key found for this signature in database
GPG Key ID: C9A094959935A952
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/status_im/multiaccounts/login/core.cljs
View File

@ -212,15 +212,12 @@
(multiaccounts/switch-preview-privacy-mode-flag)))) (multiaccounts/switch-preview-privacy-mode-flag))))
(defn get-new-auth-method [auth-method save-password?] (defn get-new-auth-method [auth-method save-password?]
(if save-password? (when save-password?
(when-not (or (= keychain/auth-method-biometric auth-method) (when-not (or (= keychain/auth-method-biometric auth-method)
(= keychain/auth-method-password auth-method)) (= keychain/auth-method-password auth-method))
(if (= auth-method keychain/auth-method-biometric-prepare) (if (= auth-method keychain/auth-method-biometric-prepare)
keychain/auth-method-biometric keychain/auth-method-biometric
keychain/auth-method-password)) keychain/auth-method-password))))
(when (and auth-method
(not= auth-method keychain/auth-method-none))
keychain/auth-method-none)))
(fx/defn login-only-events (fx/defn login-only-events
[{:keys [db] :as cofx} key-uid password save-password?] [{:keys [db] :as cofx} key-uid password save-password?]
@ -393,7 +390,8 @@
(fx/defn biometric-auth-done (fx/defn biometric-auth-done
{:events [:biometric-auth-done]} {:events [:biometric-auth-done]}
[{:keys [db] :as cofx} {:keys [bioauth-success bioauth-message bioauth-code]}] [{:keys [db] :as cofx} {:keys [bioauth-success bioauth-message bioauth-code]}]
(let [key-uid (get-in db [:multiaccounts/login :key-uid])] (let [key-uid (get-in db [:multiaccounts/login :key-uid])
auth-method (get db :auth-method)]
(log/debug "[biometric] biometric-auth-done" (log/debug "[biometric] biometric-auth-done"
"bioauth-success" bioauth-success "bioauth-success" bioauth-success
"bioauth-message" bioauth-message "bioauth-message" bioauth-message
@ -401,9 +399,12 @@
(if bioauth-success (if bioauth-success
(get-credentials cofx key-uid) (get-credentials cofx key-uid)
(fx/merge cofx (fx/merge cofx
{:db (assoc-in db [:multiaccounts/login :save-password?] false)} {:db (assoc-in db
[:multiaccounts/login :save-password?]
(= auth-method keychain/auth-method-biometric))}
(when-not (= auth-method keychain/auth-method-biometric)
(keychain/save-auth-method key-uid keychain/auth-method-none))
(biometric/show-message bioauth-message bioauth-code) (biometric/show-message bioauth-message bioauth-code)
(keychain/save-auth-method key-uid keychain/auth-method-none)
(open-login-callback nil))))) (open-login-callback nil)))))
(fx/defn save-password (fx/defn save-password

15
src/status_im/ui/screens/multiaccounts/login/views.cljs
View File

@ -54,7 +54,8 @@
supported-biometric-auth [:supported-biometric-auth]] supported-biometric-auth [:supported-biometric-auth]]
[react/keyboard-avoiding-view {:style ast/multiaccounts-view} [react/keyboard-avoiding-view {:style ast/multiaccounts-view}
[login-toolbar can-navigate-back?] [login-toolbar can-navigate-back?]
[react/scroll-view styles/login-view [react/scroll-view {:keyboardShouldPersistTaps :always
:style styles/login-view}
[react/view styles/login-badge-container [react/view styles/login-badge-container
[multiaccount-login-badge multiaccount] [multiaccount-login-badge multiaccount]
[react/view {:style styles/password-container [react/view {:style styles/password-container
@ -72,7 +73,7 @@
(re-frame/dispatch [:set-in [:multiaccounts/login :password] (re-frame/dispatch [:set-in [:multiaccounts/login :password]
(security/mask-data %)]) (security/mask-data %)])
(re-frame/dispatch [:set-in [:multiaccounts/login :error] ""])) (re-frame/dispatch [:set-in [:multiaccounts/login :error] ""]))
:secure-text-entry true :secure-text-entry true
:error (when (not-empty error) error)}]] :error (when (not-empty error) error)}]]
(when (and supported-biometric-auth (= auth-method "biometric")) (when (and supported-biometric-auth (= auth-method "biometric"))
[react/touchable-highlight {:on-press #(re-frame/dispatch [:biometric-authenticate])} [react/touchable-highlight {:on-press #(re-frame/dispatch [:biometric-authenticate])}
@ -106,9 +107,9 @@
(react/dismiss-keyboard!) (react/dismiss-keyboard!)
(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]))}] (re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]))}]
[components.common/button [components.common/button
{:label (i18n/label :t/submit) {:label (i18n/label :t/submit)
:button-style styles/bottom-button :button-style styles/bottom-button
:label-style {:color (if (or (not sign-in-enabled?) processing) colors/gray colors/blue)} :label-style {:color (if (or (not sign-in-enabled?) processing) colors/gray colors/blue)}
:background? true :background? true
:disabled? (or (not sign-in-enabled?) processing) :disabled? (or (not sign-in-enabled?) processing)
:on-press #(login-multiaccount @password-text-input)}]]])) :on-press #(login-multiaccount @password-text-input)}]]]))