status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-28 16:20:43 +00:00
Code Issues Projects Releases Wiki Activity

always start PIN/PUK/Pairing change with PIN prompt

Browse Source 
Signed-off-by: Michele Balistreri <michele@bitgamma.com>
This commit is contained in:
Michele Balistreri 2021-08-17 15:58:17 +03:00
parent f031d2b32d
commit 2a6cb978ba
No known key found for this signature in database
GPG Key ID: E9567DA33A4F791A
4 changed files with 62 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/status_im/keycard/change_pin.cljs
View File

@ -5,32 +5,27 @@
[status-im.utils.fx :as fx]
[taoensso.timbre :as log]
[status-im.keycard.common :as common]
[status-im.utils.security :as security]
[status-im.keycard.login :as keycard.login]))
[status-im.utils.security :as security]))
(fx/defn change-credentials-pressed
{:events [:keycard-settings.ui/change-credentials-pressed]}
[{:keys [db] :as cofx} changing]
(let [pin-retry-counter (get-in db [:keycard :application-info :pin-retry-counter])
enter-step (if (zero? pin-retry-counter) :puk :current)]
(if (= enter-step :puk)
(keycard.login/reset-pin cofx)
(fx/merge cofx
{:db
(assoc-in db [:keycard :pin] {:enter-step enter-step
:current []
:puk []
:original []
:confirmation []
:puk-original []
:puk-confirmation []
:status nil
:error-label nil
:on-verified (case changing
:pin :keycard/proceed-to-change-pin
:puk :keycard/proceed-to-change-puk
:pairing :keycard/proceed-to-change-pairing)})}
(common/navigate-to-enter-pin-screen)))))
(fx/merge cofx
{:db
(assoc-in db [:keycard :pin] {:enter-step :current
:current []
:puk []
:original []
:confirmation []
:puk-original []
:puk-confirmation []
:status nil
:error-label nil
:on-verified (case changing
:pin :keycard/proceed-to-change-pin
:puk :keycard/proceed-to-change-puk
:pairing :keycard/proceed-to-change-pairing)})}
(common/navigate-to-enter-pin-screen)))
(fx/defn proceed-to-change-pin
{:events [:keycard/proceed-to-change-pin]}

24
src/status_im/keycard/delete_key.cljs
View File

@ -31,16 +31,14 @@
(fx/defn proceed-to-reset-card
{:events [:keycard/proceed-to-reset-card]}
[{:keys [db] :as cofx} keep-keys-on-keycard?]
(let [pin-retry-counter (get-in db [:keycard :application-info :pin-retry-counter])
enter-step (if (zero? pin-retry-counter) :puk :current)]
(fx/merge cofx
{:db (assoc-in db [:keycard :pin] {:enter-step enter-step
:current []
:puk []
:status nil
:error-label nil
:on-verified (if keep-keys-on-keycard?
:keycard/unpair-and-delete
:keycard/remove-key-with-unpair)})}
(common/set-on-card-connected :keycard/navigate-to-enter-pin-screen)
(common/navigate-to-enter-pin-screen))))
(fx/merge cofx
{:db (assoc-in db [:keycard :pin] {:enter-step :current
:current []
:puk []
:status nil
:error-label nil
:on-verified (if keep-keys-on-keycard?
:keycard/unpair-and-delete
:keycard/remove-key-with-unpair)})}
(common/set-on-card-connected :keycard/navigate-to-enter-pin-screen)
(common/navigate-to-enter-pin-screen)))

18
src/status_im/keycard/unpair.cljs
View File

@ -21,16 +21,14 @@
(fx/defn unpair-card-confirmed
{:events [:keycard-settings.ui/unpair-card-confirmed]}
[{:keys [db] :as cofx}]
(let [pin-retry-counter (get-in db [:keycard :application-info :pin-retry-counter])
enter-step (if (zero? pin-retry-counter) :puk :current)]
(fx/merge cofx
{:db (assoc-in db [:keycard :pin] {:enter-step enter-step
:current []
:puk []
:status nil
:error-label nil
:on-verified :keycard/unpair})}
(common/navigate-to-enter-pin-screen))))
(fx/merge cofx
{:db (assoc-in db [:keycard :pin] {:enter-step :current
:current []
:puk []
:status nil
:error-label nil
:on-verified :keycard/unpair})}
(common/navigate-to-enter-pin-screen)))
(fx/defn unpair
{:events [:keycard/unpair]}

56
src/status_im/ui/screens/keycard/pin/views.cljs
View File

@ -242,33 +242,29 @@
;; properly rewritten so that different instances of pin-view do not
;; mess with state unrelated to them.
step (or step :current)]
(if (zero? pin-retry-counter)
[pin-view {:pin pin
:retry-counter (when (< puk-retry-counter puk-retries) puk-retry-counter)
:title-label :t/enter-puk-code
:description-label :t/enter-puk-code-description
:step step
:status status
:error-label error-label}]
[pin-view {:pin pin
:retry-counter (when (< pin-retry-counter pin-retries) pin-retry-counter)
:title-label (case step
:current :t/current-pin
:login :t/current-pin
:import-multiaccount :t/current-pin
:original :t/create-a-pin
:confirmation :t/repeat-pin
:puk-original :t/create-a-puk
:puk-confirmation :t/repeat-puk
:t/current-pin)
:description-label (case step
:current :t/current-pin-description
:sign :t/current-pin-description
:import-multiaccount :t/current-pin-description
:login :t/login-pin-description
:puk-original :t/new-puk-description
:puk-confirmation :t/new-puk-description
:t/new-pin-description)
:step step
:status status
:error-label error-label}]))))
[pin-view {:pin pin
:retry-counter (if (= step :puk)
(when (< puk-retry-counter puk-retries) puk-retry-counter)
(when (< pin-retry-counter pin-retries) pin-retry-counter))
:title-label (case step
:current :t/current-pin
:login :t/current-pin
:import-multiaccount :t/current-pin
:original :t/create-a-pin
:confirmation :t/repeat-pin
:puk :t/enter-puk-code
:puk-original :t/create-a-puk
:puk-confirmation :t/repeat-puk
:t/current-pin)
:description-label (case step
:current :t/current-pin-description
:sign :t/current-pin-description
:import-multiaccount :t/current-pin-description
:login :t/login-pin-description
:puk :t/enter-puk-code-description
:puk-original :t/new-puk-description
:puk-confirmation :t/new-puk-description
:t/new-pin-description)
:step step
:status status
:error-label error-label}])))