authenticate enable biometrics

Author: jo-mut

src/status_im2/contexts/onboarding/enable_biometrics/view.cljs

@@ -30,9 +30,10 @@
                             :theme                 theme
                             :blur?                 true
                             :on-enter-password     (fn [entered-password]
-                                                     (rf/dispatch [:onboarding-2/enable-biometrics-auth
-                                                                   (security/safe-unmask-data
-                                                                    entered-password)])
+                                                     (rf/dispatch
+                                                      [:onboarding-2/authenticate-enable-biometrics
+                                                       (security/safe-unmask-data
+                                                        entered-password)])
                                                      (rf/dispatch [:hide-bottom-sheet]))
                             :auth-button-label     (i18n/label :t/reveal-sync-code)}))
 
@@ -45,7 +46,9 @@
     [rn/view {:style (style/buttons insets)}
      [quo/button
       {:accessibility-label :enable-biometrics-button
-       :on-press            #(authenticate-enable-biometric theme)
+       :on-press            #(rf/dispatch (if (= :syncing-results @state/root-id)
+                                            (authenticate-enable-biometric theme)
+                                            [:onboarding-2/enable-biometrics]))
        :icon-left           :i/face-id
        :customization-color profile-color}
       (i18n/label :t/biometric-enable-button {:bio-type-label bio-type-label})]

src/status_im2/contexts/onboarding/events.cljs

@@ -6,7 +6,6 @@
     [status-im2.constants :as constants]
     [status-im2.contexts.profile.create.events :as profile.create]
     [status-im2.contexts.profile.recover.events :as profile.recover]
-    [status-im2.navigation.state :as state]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
@@ -36,26 +35,30 @@
   {:biometric/authenticate {:on-success #(rf/dispatch [:onboarding-2/biometrics-done])
                             :on-fail    #(rf/dispatch [:onboarding-2/biometrics-fail %])}})
 
-(rf/defn enable-biometrics-auth
-  {:events [:onboarding-2/enable-biometrics-auth]}
+(rf/defn authenticate-enable-biometrics
+  {:events [:onboarding-2/authenticate-enable-biometrics]}
   [{:keys [db]} password]
-  {:db                     (assoc-in db [:onboarding-2/profile :password] password)
+  {:db                     (-> db
+                               (assoc-in [:onboarding-2/profile :password] password)
+                               (assoc-in [:onboarding-2/profile :syncing?] true))
    :biometric/authenticate {:on-success #(rf/dispatch [:onboarding-2/biometrics-done])
                             :on-fail    #(rf/dispatch [:onboarding-2/biometrics-fail %])}})
 
 (rf/defn navigate-to-enable-notifications
   {:events [:onboarding-2/navigate-to-enable-notifications]}
   [{:keys [db]}]
   (let [key-uid (get-in db [:profile/profile :key-uid])]
-    {:dispatch [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]}))
+    {:db       (dissoc db :onboarding-2/profile)
+     :dispatch [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]}))
 
 (rf/defn biometrics-done
   {:events [:onboarding-2/biometrics-done]}
   [{:keys [db]}]
-  {:db       (assoc-in db [:onboarding-2/profile :auth-method] constants/auth-method-biometric)
-   :dispatch (if (= :syncing-results @state/root-id)
-               [:onboarding-2/finalize-setup]
-               [:onboarding-2/create-account-and-login])})
+  (let [syncing? (get-in db [:onboarding-2/profile :syncing?])]
+    {:db       (assoc-in db [:onboarding-2/profile :auth-method] constants/auth-method-biometric)
+     :dispatch (if syncing?
+                 [:onboarding-2/finalize-setup]
+                 [:onboarding-2/create-account-and-login])}))
 
 (rf/defn biometrics-fail
   {:events [:onboarding-2/biometrics-fail]}
@@ -144,16 +147,18 @@
   [{:keys [db]}]
   (let [masked-password    (get-in db [:onboarding-2/profile :password])
         key-uid            (get-in db [:profile/profile :key-uid])
+        syncing?           (get-in db [:onboarding-2/profile :syncing?])
         biometric-enabled? (= (get-in db [:onboarding-2/profile :auth-method])
                               constants/auth-method-biometric)]
-    (js/console.log (str "masked password" masked-password))
     (cond-> {:db (assoc db :onboarding-2/generated-keys? true)}
       biometric-enabled?
       (assoc :keychain/save-password-and-auth-method
              {:key-uid         key-uid
               :masked-password masked-password
-              :on-success      #(rf/dispatch [:navigate-to-within-stack
-                                              [:enable-notifications :enable-biometrics]])
+              :on-success      (fn []
+                                 (if syncing?
+                                   (rf/dispatch [:onboarding-2/navigate-to-enable-notifications])
+                                   (log/error "successfully saved biometrics")))
               :on-error        #(log/error "failed to save biometrics"
                                            {:key-uid key-uid
                                             :error   %})}))))